Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trainer data structure and field move functions

Browse Source 
Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
This commit is contained in:
PikalaxALT
2015-07-18 23:45:39 -04:00
parent e674869018
commit 60cd04b023
116 changed files with 2148 additions and 8705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
maps/SaffronGym.asm
View File

@@ -39,23 +39,7 @@ SabrinaScript_0x189c2e:
end
TrainerMediumRebecca:
; bit/flag number
dw EVENT_BEAT_MEDIUM_REBECCA
; trainer group && trainer id
db MEDIUM, REBECCA
; text when seen
dw MediumRebeccaSeenText
; text when trainer beaten
dw MediumRebeccaBeatenText
; script when lost
dw $0000
; script when talk again
dw MediumRebeccaScript
trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, $0000, MediumRebeccaScript
MediumRebeccaScript:
talkaftercancel
@@ -66,23 +50,7 @@ MediumRebeccaScript:
end
TrainerPsychicFranklin:
; bit/flag number
dw EVENT_BEAT_PSYCHIC_FRANKLIN
; trainer group && trainer id
db PSYCHIC_T, FRANKLIN
; text when seen
dw PsychicFranklinSeenText
; text when trainer beaten
dw PsychicFranklinBeatenText
; script when lost
dw $0000
; script when talk again
dw PsychicFranklinScript
trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, $0000, PsychicFranklinScript
PsychicFranklinScript:
talkaftercancel
@@ -93,23 +61,7 @@ PsychicFranklinScript:
end
TrainerMediumDoris:
; bit/flag number
dw EVENT_BEAT_MEDIUM_DORIS
; trainer group && trainer id
db MEDIUM, DORIS
; text when seen
dw MediumDorisSeenText
; text when trainer beaten
dw MediumDorisBeatenText
; script when lost
dw $0000
; script when talk again
dw MediumDorisScript
trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, $0000, MediumDorisScript
MediumDorisScript:
talkaftercancel
@@ -120,23 +72,7 @@ MediumDorisScript:
end
TrainerPsychicJared:
; bit/flag number
dw EVENT_BEAT_PSYCHIC_JARED
; trainer group && trainer id
db PSYCHIC_T, JARED
; text when seen
dw PsychicJaredSeenText
; text when trainer beaten
dw PsychicJaredBeatenText
; script when lost
dw $0000
; script when talk again
dw PsychicJaredScript
trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, $0000, PsychicJaredScript
PsychicJaredScript:
talkaftercancel