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/Route40.asm
View File

@@ -21,23 +21,7 @@ MonicaCallback:
return
TrainerSwimmerfElaine:
; bit/flag number
dw EVENT_BEAT_SWIMMERF_ELAINE
; trainer group && trainer id
db SWIMMERF, ELAINE
; text when seen
dw SwimmerfElaineSeenText
; text when trainer beaten
dw SwimmerfElaineBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmerfElaineScript
trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, $0000, SwimmerfElaineScript
SwimmerfElaineScript:
talkaftercancel
@@ -48,23 +32,7 @@ SwimmerfElaineScript:
end
TrainerSwimmerfPaula:
; bit/flag number
dw EVENT_BEAT_SWIMMERF_PAULA
; trainer group && trainer id
db SWIMMERF, PAULA
; text when seen
dw SwimmerfPaulaSeenText
; text when trainer beaten
dw SwimmerfPaulaBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmerfPaulaScript
trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, $0000, SwimmerfPaulaScript
SwimmerfPaulaScript:
talkaftercancel
@@ -75,23 +43,7 @@ SwimmerfPaulaScript:
end
TrainerSwimmermSimon:
; bit/flag number
dw EVENT_BEAT_SWIMMERM_SIMON
; trainer group && trainer id
db SWIMMERM, SIMON
; text when seen
dw SwimmermSimonSeenText
; text when trainer beaten
dw SwimmermSimonBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmermSimonScript
trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, $0000, SwimmermSimonScript
SwimmermSimonScript:
talkaftercancel
@@ -102,23 +54,7 @@ SwimmermSimonScript:
end
TrainerSwimmermRandall:
; bit/flag number
dw EVENT_BEAT_SWIMMERM_RANDALL
; trainer group && trainer id
db SWIMMERM, RANDALL
; text when seen
dw SwimmermRandallSeenText
; text when trainer beaten
dw SwimmermRandallBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmermRandallScript
trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, $0000, SwimmermRandallScript
SwimmermRandallScript:
talkaftercancel