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

54
maps/Route4.asm
View File

@@ -6,23 +6,7 @@ Route4_MapScriptHeader:
db 0
TrainerBird_keeperHank:
; bit/flag number
dw EVENT_BEAT_BIRD_KEEPER_HANK
; trainer group && trainer id
db BIRD_KEEPER, HANK
; text when seen
dw Bird_keeperHankSeenText
; text when trainer beaten
dw Bird_keeperHankBeatenText
; script when lost
dw $0000
; script when talk again
dw Bird_keeperHankScript
trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, $0000, Bird_keeperHankScript
Bird_keeperHankScript:
talkaftercancel
@@ -33,23 +17,7 @@ Bird_keeperHankScript:
end
TrainerPicnickerHope:
; bit/flag number
dw EVENT_BEAT_PICNICKER_HOPE
; trainer group && trainer id
db PICNICKER, HOPE
; text when seen
dw PicnickerHopeSeenText
; text when trainer beaten
dw PicnickerHopeBeatenText
; script when lost
dw $0000
; script when talk again
dw PicnickerHopeScript
trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, $0000, PicnickerHopeScript
PicnickerHopeScript:
talkaftercancel
@@ -60,23 +28,7 @@ PicnickerHopeScript:
end
TrainerPicnickerSharon:
; bit/flag number
dw EVENT_BEAT_PICNICKER_SHARON
; trainer group && trainer id
db PICNICKER, SHARON
; text when seen
dw PicnickerSharonSeenText
; text when trainer beaten
dw PicnickerSharonBeatenText
; script when lost
dw $0000
; script when talk again
dw PicnickerSharonScript
trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, $0000, PicnickerSharonScript
PicnickerSharonScript:
talkaftercancel