pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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/Route19.asm
View File

@@ -22,23 +22,7 @@ Route19_MapScriptHeader:
return
TrainerSwimmerfDawn:
; bit/flag number
dw EVENT_BEAT_SWIMMERF_DAWN
; trainer group && trainer id
db SWIMMERF, DAWN
; text when seen
dw SwimmerfDawnSeenText
; text when trainer beaten
dw SwimmerfDawnBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmerfDawnScript
trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, $0000, SwimmerfDawnScript
SwimmerfDawnScript:
talkaftercancel
@@ -49,23 +33,7 @@ SwimmerfDawnScript:
end
TrainerSwimmermHarold:
; bit/flag number
dw EVENT_BEAT_SWIMMERM_HAROLD
; trainer group && trainer id
db SWIMMERM, HAROLD
; text when seen
dw SwimmermHaroldSeenText
; text when trainer beaten
dw SwimmermHaroldBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmermHaroldScript
trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, $0000, SwimmermHaroldScript
SwimmermHaroldScript:
talkaftercancel
@@ -76,23 +44,7 @@ SwimmermHaroldScript:
end
TrainerSwimmermJerome:
; bit/flag number
dw EVENT_BEAT_SWIMMERM_JEROME
; trainer group && trainer id
db SWIMMERM, JEROME
; text when seen
dw SwimmermJeromeSeenText
; text when trainer beaten
dw SwimmermJeromeBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmermJeromeScript
trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, $0000, SwimmermJeromeScript
SwimmermJeromeScript:
talkaftercancel
@@ -103,23 +55,7 @@ SwimmermJeromeScript:
end
TrainerSwimmermTucker:
; bit/flag number
dw EVENT_BEAT_SWIMMERM_TUCKER
; trainer group && trainer id
db SWIMMERM, TUCKER
; text when seen
dw SwimmermTuckerSeenText
; text when trainer beaten
dw SwimmermTuckerBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmermTuckerScript
trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, $0000, SwimmermTuckerScript
SwimmermTuckerScript:
talkaftercancel