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

@@ -6,23 +6,7 @@ Route11_MapScriptHeader:
db 0
TrainerYoungsterOwen:
; bit/flag number
dw EVENT_BEAT_YOUNGSTER_OWEN
; trainer group && trainer id
db YOUNGSTER, OWEN
; text when seen
dw YoungsterOwenSeenText
; text when trainer beaten
dw YoungsterOwenBeatenText
; script when lost
dw $0000
; script when talk again
dw YoungsterOwenScript
trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, $0000, YoungsterOwenScript
YoungsterOwenScript:
talkaftercancel
@@ -33,23 +17,7 @@ YoungsterOwenScript:
end
TrainerYoungsterJason:
; bit/flag number
dw EVENT_BEAT_YOUNGSTER_JASON
; trainer group && trainer id
db YOUNGSTER, JASON
; text when seen
dw YoungsterJasonSeenText
; text when trainer beaten
dw YoungsterJasonBeatenText
; script when lost
dw $0000
; script when talk again
dw YoungsterJasonScript
trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, $0000, YoungsterJasonScript
YoungsterJasonScript:
talkaftercancel
@@ -60,23 +28,7 @@ YoungsterJasonScript:
end
TrainerPsychicHerman:
; bit/flag number
dw EVENT_BEAT_PSYCHIC_HERMAN
; trainer group && trainer id
db PSYCHIC_T, HERMAN
; text when seen
dw PsychicHermanSeenText
; text when trainer beaten
dw PsychicHermanBeatenText
; script when lost
dw $0000
; script when talk again
dw PsychicHermanScript
trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, $0000, PsychicHermanScript
PsychicHermanScript:
talkaftercancel
@@ -87,23 +39,7 @@ PsychicHermanScript:
end
TrainerPsychicFidel:
; bit/flag number
dw EVENT_BEAT_PSYCHIC_FIDEL
; trainer group && trainer id
db PSYCHIC_T, FIDEL
; text when seen
dw PsychicFidelSeenText
; text when trainer beaten
dw PsychicFidelBeatenText
; script when lost
dw $0000
; script when talk again
dw PsychicFidelScript
trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, $0000, PsychicFidelScript
PsychicFidelScript:
talkaftercancel