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

90
maps/UnionCave1F.asm
View File

@@ -6,23 +6,7 @@ UnionCave1F_MapScriptHeader:
db 0
TrainerPokemaniacLarry:
; bit/flag number
dw EVENT_BEAT_POKEMANIAC_LARRY
; trainer group && trainer id
db POKEMANIAC, LARRY
; text when seen
dw PokemaniacLarrySeenText
; text when trainer beaten
dw PokemaniacLarryBeatenText
; script when lost
dw $0000
; script when talk again
dw PokemaniacLarryScript
trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, $0000, PokemaniacLarryScript
PokemaniacLarryScript:
talkaftercancel
@@ -33,23 +17,7 @@ PokemaniacLarryScript:
end
TrainerHikerRussell:
; bit/flag number
dw EVENT_BEAT_HIKER_RUSSELL
; trainer group && trainer id
db HIKER, RUSSELL
; text when seen
dw HikerRussellSeenText
; text when trainer beaten
dw HikerRussellBeatenText
; script when lost
dw $0000
; script when talk again
dw HikerRussellScript
trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, $0000, HikerRussellScript
HikerRussellScript:
talkaftercancel
@@ -60,23 +28,7 @@ HikerRussellScript:
end
TrainerHikerDaniel:
; bit/flag number
dw EVENT_BEAT_HIKER_DANIEL
; trainer group && trainer id
db HIKER, DANIEL
; text when seen
dw HikerDanielSeenText
; text when trainer beaten
dw HikerDanielBeatenText
; script when lost
dw $0000
; script when talk again
dw HikerDanielScript
trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, $0000, HikerDanielScript
HikerDanielScript:
talkaftercancel
@@ -87,23 +39,7 @@ HikerDanielScript:
end
TrainerFirebreatherBill:
; bit/flag number
dw EVENT_BEAT_FIREBREATHER_BILL
; trainer group && trainer id
db FIREBREATHER, BILL
; text when seen
dw FirebreatherBillSeenText
; text when trainer beaten
dw FirebreatherBillBeatenText
; script when lost
dw $0000
; script when talk again
dw FirebreatherBillScript
trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, $0000, FirebreatherBillScript
FirebreatherBillScript:
talkaftercancel
@@ -114,23 +50,7 @@ FirebreatherBillScript:
end
TrainerFirebreatherRay:
; bit/flag number
dw EVENT_BEAT_FIREBREATHER_RAY
; trainer group && trainer id
db FIREBREATHER, RAY
; text when seen
dw FirebreatherRaySeenText
; text when trainer beaten
dw FirebreatherRayBeatenText
; script when lost
dw $0000
; script when talk again
dw FirebreatherRayScript
trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, $0000, FirebreatherRayScript
FirebreatherRayScript:
talkaftercancel