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

@@ -61,23 +61,7 @@ VioletGymTriggerRockets:
jumpstd radiotowerrockets
TrainerBird_keeperRod:
; bit/flag number
dw EVENT_BEAT_BIRD_KEEPER_ROD
; trainer group && trainer id
db BIRD_KEEPER, ROD
; text when seen
dw Bird_keeperRodSeenText
; text when trainer beaten
dw Bird_keeperRodBeatenText
; script when lost
dw $0000
; script when talk again
dw Bird_keeperRodScript
trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, $0000, Bird_keeperRodScript
Bird_keeperRodScript:
talkaftercancel
@@ -88,23 +72,7 @@ Bird_keeperRodScript:
end
TrainerBird_keeperAbe:
; bit/flag number
dw EVENT_BEAT_BIRD_KEEPER_ABE
; trainer group && trainer id
db BIRD_KEEPER, ABE
; text when seen
dw Bird_keeperAbeSeenText
; text when trainer beaten
dw Bird_keeperAbeBeatenText
; script when lost
dw $0000
; script when talk again
dw Bird_keeperAbeScript
trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, $0000, Bird_keeperAbeScript
Bird_keeperAbeScript:
talkaftercancel