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

@@ -42,23 +42,7 @@ UnknownScript_0x72aae:
end
TrainerLassMichelle:
; bit/flag number
dw EVENT_BEAT_LASS_MICHELLE
; trainer group && trainer id
db LASS, MICHELLE
; text when seen
dw LassMichelleSeenText
; text when trainer beaten
dw LassMichelleBeatenText
; script when lost
dw $0000
; script when talk again
dw LassMichelleScript
trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, $0000, LassMichelleScript
LassMichelleScript:
talkaftercancel
@@ -69,23 +53,7 @@ LassMichelleScript:
end
TrainerPicnickerTanya:
; bit/flag number
dw EVENT_BEAT_PICNICKER_TANYA
; trainer group && trainer id
db PICNICKER, TANYA
; text when seen
dw PicnickerTanyaSeenText
; text when trainer beaten
dw PicnickerTanyaBeatenText
; script when lost
dw $0000
; script when talk again
dw PicnickerTanyaScript
trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, $0000, PicnickerTanyaScript
PicnickerTanyaScript:
talkaftercancel
@@ -96,23 +64,7 @@ PicnickerTanyaScript:
end
TrainerBeautyJulia:
; bit/flag number
dw EVENT_BEAT_BEAUTY_JULIA
; trainer group && trainer id
db BEAUTY, JULIA
; text when seen
dw BeautyJuliaSeenText
; text when trainer beaten
dw BeautyJuliaBeatenText
; script when lost
dw $0000
; script when talk again
dw BeautyJuliaScript
trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, $0000, BeautyJuliaScript
BeautyJuliaScript:
talkaftercancel
@@ -123,23 +75,7 @@ BeautyJuliaScript:
end
TrainerTwinsJoandzoe1:
; bit/flag number
dw EVENT_BEAT_TWINS_JO_AND_ZOE
; trainer group && trainer id
db TWINS, JOANDZOE1
; text when seen
dw TwinsJoandzoe1SeenText
; text when trainer beaten
dw TwinsJoandzoe1BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsJoandzoe1Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, $0000, TwinsJoandzoe1Script
TwinsJoandzoe1Script:
talkaftercancel
@@ -150,23 +86,7 @@ TwinsJoandzoe1Script:
end
TrainerTwinsJoandzoe2:
; bit/flag number
dw EVENT_BEAT_TWINS_JO_AND_ZOE
; trainer group && trainer id
db TWINS, JOANDZOE2
; text when seen
dw TwinsJoandzoe2SeenText
; text when trainer beaten
dw TwinsJoandzoe2BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsJoandzoe2Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, $0000, TwinsJoandzoe2Script
TwinsJoandzoe2Script:
talkaftercancel