pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

[in progress] Harmonize more constant and data files with pokegold

Browse Source
This commit is contained in:
Rangi 2020-06-16 14:11:49 -04:00
parent 2354c41a96
commit 7b2515d1e4
51 changed files with 263 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/credits_constants.asm
View File

@ -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

48
constants/engine_flags.asm
View File

@ -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

6
constants/event_flags.asm
View File

@ -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

24
constants/sprite_anim_constants.asm
View File

@ -47,7 +47,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
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 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
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 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
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 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
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 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
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

2
data/credits_strings.asm
View File

@ -1,4 +1,4 @@
CreditsStrings:
CreditsStringsPointers:
; entries correspond to constants/credits_constants.asm
dw .SatoshiTajiri
dw .JunichiMasuda

16
data/sprite_anims/framesets.asm
View File

@ -36,7 +36,7 @@ SpriteAnimFrameData:
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 @@ SpriteAnimFrameData:
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:

26
data/sprite_anims/oam.asm
View File

@ -9,10 +9,10 @@ SpriteAnimOAMData:
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 @@ SpriteAnimOAMData:
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 @@ SpriteAnimOAMData:
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 @@ SpriteAnimOAMData:
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 @@ SpriteAnimOAMData:
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 @@ SpriteAnimOAMData:
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 @@ SpriteAnimOAMData:
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

4
data/sprite_anims/sequences.asm
View File

@ -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 @@ SpriteAnimSeqData:
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

4
engine/gfx/sprite_anims.asm
View File

@ -38,7 +38,7 @@ DoAnimFrame:
dw .FlyFrom
dw .FlyLeaf
dw .FlyTo
dw .GSIntroHoOh
dw .GSIntroHoOhLugia
dw .EZChatCursor
dw .MobileTradeSentPulse
dw .MobileTradeOTPulse
@ -198,7 +198,7 @@ DoAnimFrame:
call DeinitializeSprite
ret
.GSIntroHoOh
.GSIntroHoOhLugia
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld a, [hl]

2
engine/movie/credits.asm
View File

@ -275,7 +275,7 @@ ParseCredits:
push af
ld e, a
ld d, 0
ld hl, CreditsStrings
ld hl, CreditsStringsPointers
add hl, de
add hl, de
ld a, [hli]

6
engine/phone/scripts/alan.asm
View File

@ -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 @@ AlanPhoneCalleeScript:
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 @@ AlanWednesdayDay:
AlanWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
setflag ENGINE_ALAN
setflag ENGINE_ALAN_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
AlanHasFireStone:

6
engine/phone/scripts/anthony.asm
View File

@ -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 @@ AnthonyPhoneCallerScript:
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 @@ AnthonyFridayNight:
AnthonyWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
setflag ENGINE_ANTHONY
setflag ENGINE_ANTHONY_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
AnthonyTriesDunsparceSwarm:

6
engine/phone/scripts/arnie.asm
View File

@ -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 @@ ArniePhoneCalleeScript:
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 @@ ArnieTuesdayMorning:
ArnieWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
setflag ENGINE_ARNIE
setflag ENGINE_ARNIE_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
ArnieYanmaSwarm: ; start swarm

6
engine/phone/scripts/beth.asm
View File

@ -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 @@ BethPhoneCalleeScript:
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 @@ BethFridayAfternoon:
BethWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
setflag ENGINE_BETH
setflag ENGINE_BETH_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female

6
engine/phone/scripts/brent.asm
View File

@ -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 @@ BrentPhoneCallerScript:
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 @@ BrentMondayMorning:
BrentWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
setflag ENGINE_BRENT
setflag ENGINE_BRENT_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
BrentBillTrivia:

6
engine/phone/scripts/chad.asm
View File

@ -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 @@ ChadPhoneCallerScript:
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 @@ ChadFridayMorning:
ChadWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
setflag ENGINE_CHAD
setflag ENGINE_CHAD_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
ChadFoundRare:

6
engine/phone/scripts/dana.asm
View File

@ -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 @@ DanaPhoneCalleeScript:
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 @@ DanaThursdayNight:
DanaWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
setflag ENGINE_DANA
setflag ENGINE_DANA_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
DanaFoundRare:

6
engine/phone/scripts/erin.asm
View File

@ -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 @@ ErinPhoneCalleeScript:
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 @@ ErinSaturdayNight:
ErinWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_46
setflag ENGINE_ERIN
setflag ENGINE_ERIN_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female

6
engine/phone/scripts/gaven.asm
View File

@ -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 @@ GavenPhoneCalleeScript:
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 @@ GavenThursdayMorningScript:
GavenWantsRematch:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
setflag ENGINE_GAVEN
setflag ENGINE_GAVEN_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
GavenFoundRare:

6
engine/phone/scripts/gina.asm
View File

@ -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 @@ GinaPhoneCallerScript:
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 @@ GinaSundayDay:
GinaWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
setflag ENGINE_GINA
setflag ENGINE_GINA_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
GinaRockets:

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