create a new macro to make byte–word pairs more readable

hg-commit-id: 24c0b06fa1c3
This commit is contained in:
IIMarckus 2010-11-19 23:00:56 -07:00
parent eb98b000cd
commit 9b5a97afc2
2 changed files with 152 additions and 339 deletions

View file

@ -1,3 +1,9 @@
; macro for putting a byte then a word
dbw: MACRO
db \1
dw \2
ENDM
; data format macros ; data format macros
RGB: MACRO RGB: MACRO
dw (\3 << 10 | \2 << 5 | \1) dw (\3 << 10 | \2 << 5 | \1)

View file

@ -2728,146 +2728,53 @@ TrainerAIPointers: ; 655C
; one entry per trainer class ; one entry per trainer class
; XXX first byte, ??? ; XXX first byte, ???
; next two bytes, pointer to AI subroutine for trainer class ; next two bytes, pointer to AI subroutine for trainer class
db 3 dbw 3,GenericAI
dw GenericAI dbw 3,GenericAI
dbw 3,GenericAI
db 3 dbw 3,GenericAI
dw GenericAI dbw 3,GenericAI
dbw 3,GenericAI
db 3 dbw 3,GenericAI
dw GenericAI dbw 3,GenericAI
dbw 3,GenericAI
db 3 dbw 3,GenericAI
dw GenericAI dbw 3,GenericAI
dbw 3,GenericAI
db 3 dbw 3,JugglerAI ; juggler_x
dw GenericAI dbw 3,GenericAI
dbw 3,GenericAI
db 3 dbw 3,GenericAI
dw GenericAI dbw 3,GenericAI
dbw 3,GenericAI
db 3 dbw 3,GenericAI
dw GenericAI dbw 3,GenericAI
dbw 3,JugglerAI ; juggler
db 3 dbw 3,GenericAI
dw GenericAI dbw 3,GenericAI
dbw 2,BlackbeltAI ; blackbelt
db 3 dbw 3,GenericAI
dw GenericAI dbw 3,GenericAI
dbw 1,GenericAI ; chief
db 3 dbw 3,GenericAI
dw GenericAI dbw 1,GiovanniAI ; giovanni
dbw 3,GenericAI
db 3 dbw 2,CooltrainerMAI ; cooltrainerm
dw GenericAI dbw 1,CooltrainerFAI ; cooltrainerf
dbw 2,BrunoAI ; bruno
db 3 dbw 5,BrockAI ; brock
dw GenericAI dbw 1,MistyAI ; misty
dbw 1,LtSurgeAI ; surge
db 3 ; juggler_x dbw 1,ErikaAI ; erika
dw JugglerAI dbw 2,KogaAI ; koga
dbw 2,BlaineAI ; blaine
db 3 dbw 1,SabrinaAI ; sabrina
dw GenericAI dbw 3,GenericAI
dbw 1,Sony2AI ; sony2
db 3 dbw 1,Sony3AI ; sony3
dw GenericAI dbw 2,LoreleiAI ; lorelei
dbw 3,GenericAI
db 3 dbw 2,AgathaAI ; agatha
dw GenericAI dbw 1,LanceAI ; lance
db 3
dw GenericAI
db 3
dw GenericAI
db 3
dw GenericAI
db 3
dw GenericAI
db 3 ; juggler
dw JugglerAI
db 3
dw GenericAI
db 3
dw GenericAI
db 2 ; blackbelt
dw BlackbeltAI
db 3
dw GenericAI
db 3
dw GenericAI
db 1 ; chief
dw GenericAI
db 3
dw GenericAI
db 1 ; giovanni
dw GiovanniAI
db 3
dw GenericAI
db 2 ; cooltrainerm
dw CooltrainerMAI
db 1 ; cooltrainerf
dw CooltrainerFAI
db 2 ; bruno
dw BrunoAI
db 5 ; brock
dw BrockAI
db 1 ; misty
dw MistyAI
db 1 ; surge
dw LtSurgeAI
db 1 ; erika
dw ErikaAI
db 2 ; koga
dw KogaAI
db 2 ; blaine
dw BlaineAI
db 1 ; sabrina
dw SabrinaAI
db 3
dw GenericAI
db 1 ; sony2
dw Sony2AI
db 1 ; sony3
dw Sony3AI
db 2 ; lorelei
dw LoreleiAI
db 3
dw GenericAI
db 2 ; agatha
dw AgathaAI
db 1 ; lance
dw LanceAI
JugglerAI: JugglerAI:
cp $40 cp $40
@ -3740,205 +3647,105 @@ GetPredefPointer:
PredefPointers: ; 7E79 PredefPointers: ; 7E79
; these are pointers to ASM routines. ; these are pointers to ASM routines.
; they appear to be used in overworld map scripts. ; they appear to be used in overworld map scripts.
db $0F dbw $0F,$4D60
dw $4D60 dbw $0F,$70C6
db $0F dbw $0F,$7073
dw $70C6 dbw $0B,$7E40
db $0F dbw $0F,$7103
dw $7073 dbw $1E,$5ABA
db $0B dbw $03,$7132
dw $7E40 dbw $03,$76A5
db $0F dbw $1E,$4D5E
dw $7103 dbw $03,$771E
db $1E dbw $03,$771E
dw $5ABA dbw $03,$781D
db $03 dbw $03,$7836
dw $7132 dbw $03,$771E
db $03 dbw $03,$771E
dw $76A5 dbw $03,$7850
db $1E dbw $03,$7666
dw $4D5E dbw $03,$71D7
db $03 dbw $03,$71A6
dw $771E dbw $03,$469C
db $03 dbw $0F,$4A83
dw $771E dbw $03,$71C8
db $03 dbw $03,$71C8
dw $781D dbw $03,$6E9E
db $03 dbw $03,$7850
dw $7836 dbw $03,$4754
db $03 dbw $0E,$6F5B
dw $771E dbw $01,$6E43
db $03 dbw $03,$78A5
dw $771E dbw $03,$3EB5
db $03 dbw $03,$3E2E
dw $7850 dbw $12,$40EB
db $03 dbw $03,$78BA
dw $7666 dbw $12,$40FF
db $03 dbw $03,$7929
dw $71D7 dbw $03,$79A0
db $03 dbw $12,$4125
dw $71A6 dbw $03,$7A1D
db $03 dbw $03,$79DC
dw $469C dbw $01,$5AB0
db $0F dbw $0F,$6D02
dw $4A83 dbw $10,$4000
db $03 dbw $0E,$6D1C
dw $71C8 dbw $1C,$778C
db $03 dbw $0F,$6F18
dw $71C8 dbw $01,$5A5F
db $03 dbw $03,$6A03
dw $6E9E dbw $10,$50F3
db $03 dbw $1C,$496D
dw $7850 dbw $1E,$5DDA
db $03 dbw $10,$5682
dw $4754 dbw $1E,$5869
db $0E dbw $1C,$4B5D
dw $6F5B dbw $03,$4586
db $01 dbw $04,$6953
dw $6E43 dbw $04,$6B57
db $03 dbw $10,$50E2
dw $78A5 dbw $15,$690F
db $03 dbw $10,$5010
dw $3EB5 dbw $01,$62A1
db $03 dbw $03,$6F54
dw $3E2E dbw $10,$42D1
db $12 dbw $0E,$6FB8
dw $40EB dbw $1C,$770A
db $03 dbw $1C,$602B
dw $78BA dbw $03,$7113
db $12 dbw $17,$5B5E
dw $40FF dbw $04,$773E
db $03 dbw $04,$7763
dw $7929 dbw $1C,$5DDF
db $03 dbw $17,$40DC; 46 load dex screen
dw $79A0 dbw $03,$72E5
db $12 dbw $03,$7A1D
dw $4125 dbw $0F,$4DEC
db $03 dbw $1C,$4F60
dw $7A1D dbw $09,$7D6B
db $03 dbw $05,$7C47; 4C player exclamation
dw $79DC dbw $01,$5AAF
db $01 dbw $01,$64EB
dw $5AB0 dbw $0D,$7CA1
db $0F dbw $1C,$780F
dw $6D02 dbw $1C,$76BD
db $10 dbw $1C,$75E8
dw $4000 dbw $1C,$77E2
db $0E dbw $1C,$5AD9
dw $6D1C dbw $1D,$405C
db $1C dbw $11,$4169
dw $778C dbw $1E,$45BA
db $0F dbw $1E,$4510
dw $6F18 dbw $03,$45BE
db $01 dbw $03,$460B
dw $5A5F dbw $03,$4D99
db $03 dbw $01,$4DE1
dw $6A03 dbw $09,$7D98
db $10 dbw $03,$7473
dw $50F3 dbw $04,$68EF
db $1C dbw $04,$68F6
dw $496D dbw $07,$49C6
db $1E dbw $16,$5035
dw $5DDA
db $10
dw $5682
db $1E
dw $5869
db $1C
dw $4B5D
db $03
dw $4586
db $04
dw $6953
db $04
dw $6B57
db $10
dw $50E2
db $15
dw $690F
db $10
dw $5010
db $01
dw $62A1
db $03
dw $6F54
db $10
dw $42D1
db $0E
dw $6FB8
db $1C
dw $770A
db $1C
dw $602B
db $03
dw $7113
db $17
dw $5B5E
db $04
dw $773E
db $04
dw $7763
db $1C
dw $5DDF
db $17 ; 46 load dex screen
dw $40DC; 46 load dex screen
db $03
dw $72E5
db $03
dw $7A1D
db $0F
dw $4DEC
db $1C
dw $4F60
db $09
dw $7D6B
db $05 ; 4C player exclamation
dw $7C47; 4C player exclamation
db $01
dw $5AAF
db $01
dw $64EB
db $0D
dw $7CA1
db $1C
dw $780F
db $1C
dw $76BD
db $1C
dw $75E8
db $1C
dw $77E2
db $1C
dw $5AD9
db $1D
dw $405C
db $11
dw $4169
db $1E
dw $45BA
db $1E
dw $4510
db $03
dw $45BE
db $03
dw $460B
db $03
dw $4D99
db $01
dw $4DE1
db $09
dw $7D98
db $03
dw $7473
db $04
dw $68EF
db $04
dw $68F6
db $07
dw $49C6
db $16
dw $5035
SECTION "bank14",DATA,BANK[$14] SECTION "bank14",DATA,BANK[$14]
INCBIN "baserom.gbc",$50000,$4000 INCBIN "baserom.gbc",$50000,$4000