Trainer data structure and field move functions

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

View File

@@ -6,23 +6,7 @@ Route18_MapScriptHeader:
db 0
TrainerBird_keeperBoris:
; bit/flag number
dw EVENT_BEAT_BIRD_KEEPER_BORIS
; trainer group && trainer id
db BIRD_KEEPER, BORIS
; text when seen
dw Bird_keeperBorisSeenText
; text when trainer beaten
dw Bird_keeperBorisBeatenText
; script when lost
dw $0000
; script when talk again
dw Bird_keeperBorisScript
trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, $0000, Bird_keeperBorisScript
Bird_keeperBorisScript:
talkaftercancel
@@ -33,23 +17,7 @@ Bird_keeperBorisScript:
end
TrainerBird_keeperBob:
; bit/flag number
dw EVENT_BEAT_BIRD_KEEPER_BOB
; trainer group && trainer id
db BIRD_KEEPER, BOB
; text when seen
dw Bird_keeperBobSeenText
; text when trainer beaten
dw Bird_keeperBobBeatenText
; script when lost
dw $0000
; script when talk again
dw Bird_keeperBobScript
trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, $0000, Bird_keeperBobScript
Bird_keeperBobScript:
talkaftercancel