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

36
maps/Route6.asm
View File

@@ -6,23 +6,7 @@ Route6_MapScriptHeader:
db 0
TrainerPokefanmRex:
; bit/flag number
dw EVENT_BEAT_POKEFANM_REX
; trainer group && trainer id
db POKEFANM, REX
; text when seen
dw PokefanmRexSeenText
; text when trainer beaten
dw PokefanmRexBeatenText
; script when lost
dw $0000
; script when talk again
dw PokefanmRexScript
trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, $0000, PokefanmRexScript
PokefanmRexScript:
talkaftercancel
@@ -33,23 +17,7 @@ PokefanmRexScript:
end
TrainerPokefanmAllan:
; bit/flag number
dw EVENT_BEAT_POKEFANM_ALLAN
; trainer group && trainer id
db POKEFANM, ALLAN
; text when seen
dw PokefanmAllanSeenText
; text when trainer beaten
dw PokefanmAllanBeatenText
; script when lost
dw $0000
; script when talk again
dw PokefanmAllanScript
trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, $0000, PokefanmAllanScript
PokefanmAllanScript:
talkaftercancel