diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2016-01-16 20:35:02 +0100 | 
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2016-01-16 20:35:02 +0100 | 
| commit | 09061007eae8e3f6de803876cc0ea64ec0f83598 (patch) | |
| tree | c1903707fe867a344fbb6cef56fecbace7dea604 | |
| parent | 05854afc28b89e586fe24f86e0d657033d9fd20c (diff) | |
organize move effect commands
| -rwxr-xr-x | src/data/cards.asm | 12 | ||||
| -rw-r--r-- | src/data/move_effects.asm | 1292 | ||||
| -rwxr-xr-x | src/macros.asm | 5 | 
3 files changed, 973 insertions, 336 deletions
| diff --git a/src/data/cards.asm b/src/data/cards.asm index 7771d45..3654b33 100755 --- a/src/data/cards.asm +++ b/src/data/cards.asm @@ -778,8 +778,7 @@ EkansCard: ; 310b2 (c:50b2)  	dw NONE ; description (cont)  	db 0 ; damage  	db DAMAGE_NORMAL ; category -	db 247 -	db 70 +	dw EkansSpitPoisonEffectCommands ; effect commands  	db INFLICT_POISON ; status  	db 0  	db 0 @@ -793,8 +792,7 @@ EkansCard: ; 310b2 (c:50b2)  	dw NONE ; description (cont)  	db 20 ; damage  	db DAMAGE_NORMAL ; category -	db 254 -	db 70 +	dw EkansWrapEffectCommands ; effect commands  	db INFLICT_PARALYSIS ; status  	db 0  	db 0 @@ -831,8 +829,7 @@ ArbokCard: ; 310f3 (c:50f3)  	dw NONE ; description (cont)  	db 10 ; damage  	db DAMAGE_NORMAL ; category -	db 2 -	db 71 +	dw ArbokTerrorStrikeEffectCommands ; effect commands  	db NONE ; status  	db 1  	db 0 @@ -846,8 +843,7 @@ ArbokCard: ; 310f3 (c:50f3)  	dw NONE ; description (cont)  	db 20 ; damage  	db DAMAGE_NORMAL ; category -	db 12 -	db 71 +	dw ArbokPoisonFangEffectCommands ; effect commands  	db INFLICT_POISON ; status  	db 0  	db 0 diff --git a/src/data/move_effects.asm b/src/data/move_effects.asm index 5ef34a8..9efa901 100644 --- a/src/data/move_effects.asm +++ b/src/data/move_effects.asm @@ -1,329 +1,965 @@ -MoveEffectCommands: -; Each move has a two-byte effect pointer (move's 7th param) that points to one of these structures: -; 	db CommandId ($01 - $09) -; 	dw Function -; 	... -; 	db $00 - -; Apparently every command has a "time", and a function is called multiple times during a turn -; with an argument identifying the command Id. If said command Id is found in the -; current move effect's array, its assigned function is immediately executed. - -	db $03, $F8, $46, $09, $F0, $46, $00 -	db $03, $11, $40, $00 -	db $04, $26, $47, $05, $0A, $47, $0A, $0A, $47, $00 -	db $03, $07, $40, $09, $30, $47, $00 -	db $03, $00, $40, $09, $38, $47, $00 -	db $01, $40, $47, $04, $6A, $47, $05, $4B, $47, $08, $64, $47, $00 -	db $03, $7E, $47, $00 -	db $03, $11, $40, $00 -	db $03, $11, $40, $00 -	db $03, $07, $40, $09, $8B, $47, $00 -	db $03, $93, $47, $00 -	db $03, $A0, $47, $00 -	db $03, $00, $40, $09, $B4, $47, $00 -	db $04, $BC, $47, $00 -	db $03, $11, $40, $00 -	db $04, $C6, $47, $00 -	db $03, $D0, $47, $00 -	db $03, $DC, $47, $00 -	db $04, $E3, $47, $00 -	db $03, $F5, $47, $09, $ED, $47, $00 -	db $03, $00, $40, $09, $0D, $48, $00 -	db $03, $30, $40, $00 -	db $04, $15, $48, $00 -	db $03, $2A, $48, $09, $22, $48, $00 -	db $03, $36, $48, $00 -	db $03, $11, $40, $00 -	db $03, $11, $40, $00 -	db $01, $4A, $48, $04, $CC, $48, $05, $5A, $48, $08, $B7, $48, $00 -	db $01, $EC, $48, $04, $1A, $49, $05, $F7, $48, $08, $0F, $49, $00 -	db $03, $44, $49, $09, $25, $49, $00 -	db $03, $73, $49, $04, $82, $49, $09, $6B, $49, $00 -	db $03, $94, $49, $09, $8C, $49, $00 -	db $03, $98, $49, $00 -	db $03, $C6, $49, $09, $BE, $49, $00 -	db $01, $DB, $49, $04, $6E, $4A, $05, $EB, $49, $08, $55, $4A, $00 -	db $03, $96, $4A, $09, $8E, $4A, $00 -	db $03, $AC, $4A, $00 -	db $03, $BB, $4A, $09, $B3, $4A, $00 -	db $03, $DB, $4A, $09, $D3, $4A, $00 -	db $04, $09, $4B, $05, $F3, $4A, $0A, $F3, $4A, $00 -	db $04, $0F, $4B, $00 -	db $03, $30, $40, $00 -	db $03, $30, $40, $00 -	db $03, $00, $40, $09, $27, $4B, $00 -	db $03, $07, $40, $09, $2F, $4B, $00 -	db $04, $37, $4B, $00 -	db $02, $44, $4B, $03, $77, $4B, $04, $FB, $4B, $05, $6F, $4B, $00 -	db $03, $11, $40, $00 -	db $03, $30, $4C, $00 -	db $01, $36, $4C, $00 -	db $03, $00, $40, $09, $38, $4C, $00 -	db $01, $40, $4C, $04, $C2, $4C, $05, $50, $4C, $08, $AD, $4C, $00 -	db $03, $00, $40, $09, $E2, $4C, $00 -	db $04, $EA, $4C, $00 -	db $02, $09, $4D, $03, $5D, $4D, $05, $21, $4D, $00 -	db $03, $8C, $4D, $09, $84, $4D, $00 -	db $03, $11, $40, $00 -	db $03, $07, $40, $09, $A0, $4D, $00 -	db $02, $A8, $4D, $03, $C7, $4D, $00 -	db $03, $2B, $4E, $09, $23, $4E, $00 -	db $03, $11, $40, $00 -	db $03, $07, $40, $09, $4B, $4E, $00 -	db $02, $53, $4E, $03, $82, $4E, $00 -	db $04, $B0, $4E, $00 -	db $03, $05, $4F, $09, $05, $4F, $00 -	db $03, $12, $4F, $09, $0A, $4F, $00 -	db $01, $2A, $4F, $00 -	db $03, $2C, $4F, $09, $2C, $4F, $00 -	db $03, $32, $4F, $00 -	db $01, $46, $4F, $00 -	db $03, $48, $4F, $09, $48, $4F, $00 -	db $03, $11, $40, $00 -	db $03, $54, $4F, $09, $4E, $4F, $00 -	db $01, $5D, $4F, $04, $DF, $4F, $05, $6D, $4F, $08, $CA, $4F, $00 -	db $03, $05, $50, $09, $FF, $4F, $00 -	db $03, $0E, $50, $00 -	db $03, $1E, $50, $09, $16, $50, $00 -	db $03, $11, $40, $00 -	db $04, $6B, $50, $05, $33, $50, $08, $65, $50, $00 -	db $03, $85, $50, $09, $85, $50, $00 -	db $03, $8B, $50, $00 -	db $03, $9D, $50, $00 -	db $03, $A4, $50, $00 -	db $03, $C0, $50, $09, $B8, $50, $00 -	db $03, $D3, $50, $09, $D3, $50, $00 -	db $03, $11, $40, $00 -	db $01, $D9, $50, $02, $F0, $50, $04, $14, $51, $06, $0E, $51, $08, $03, $51, $00 -	db $03, $11, $40, $00 -	db $03, $11, $40, $00 -	db $03, $20, $51, $00 -	db $03, $34, $51, $00 -	db $03, $3A, $51, $00 -	db $03, $07, $40, $09, $41, $51, $00 -	db $01, $49, $51, $02, $6F, $51, $03, $79, $51, $08, $73, $51, $00 -	db $03, $C8, $51, $09, $C0, $51, $00 -	db $03, $E0, $51, $09, $E0, $51, $00 -	db $04, $14, $52, $05, $E6, $51, $08, $0E, $52, $00 -	db $03, $27, $52, $09, $27, $52, $00 -	db $03, $2D, $52, $00 -	db $03, $4E, $52, $09, $46, $52, $00 -	db $03, $11, $40, $00 -	db $03, $66, $52, $04, $6F, $52, $00 -	db $02, $8B, $52, $03, $C3, $52, $05, $AE, $52, $00 -	db $03, $EB, $52, $09, $EB, $52, $00 -	db $03, $1D, $40, $00 -	db $01, $F1, $52, $07, $F3, $52, $00 -	db $03, $29, $53, $04, $2E, $53, $00 -	db $03, $3F, $53, $00 -	db $01, $63, $53, $02, $71, $53, $06, $79, $53, $08, $75, $53, $00 -	db $04, $7F, $53, $00 -	db $03, $8D, $53, $09, $85, $53, $00 -	db $01, $A0, $53, $02, $AE, $53, $03, $EF, $53, $06, $DE, $53, $08, $D5, $53, $09, $E9, $53, $00 -	db $03, $00, $54, $09, $F8, $53, $00 -	db $03, $13, $54, $00 -	db $01, $25, $54, $04, $4F, $54, $05, $30, $54, $08, $49, $54, $00 -	db $01, $63, $54, $02, $71, $54, $06, $79, $54, $08, $75, $54, $00 -	db $01, $7F, $54, $02, $8D, $54, $06, $95, $54, $08, $91, $54, $00 -	db $01, $9B, $54, $02, $A9, $54, $04, $F4, $54, $06, $E1, $54, $08, $DD, $54, $00 -	db $03, $2B, $55, $09, $23, $55, $00 -	db $03, $49, $55, $09, $41, $55, $00 -	db $01, $5C, $55, $02, $6A, $55, $06, $72, $55, $08, $6E, $55, $00 -	db $01, $78, $55, $02, $86, $55, $06, $8E, $55, $08, $8A, $55, $00 -	db $03, $94, $55, $00 -	db $03, $00, $40, $09, $9A, $55, $00 -	db $01, $A2, $55, $02, $B0, $55, $06, $B8, $55, $08, $B4, $55, $00 -	db $01, $BE, $55, $00 -	db $01, $C0, $55, $02, $CD, $55, $06, $14, $56, $08, $06, $56, $00 -	db $03, $1D, $40, $00 -	db $03, $3E, $56, $09, $38, $56, $00 -	db $04, $47, $56, $00 -	db $03, $AB, $56, $09, $A3, $56, $00 -	db $01, $C0, $56, $07, $C2, $56, $00 -	db $03, $76, $57, $09, $6E, $57, $00 -	db $03, $11, $40, $00 -	db $02, $FC, $57, $03, $BB, $58, $05, $34, $58, $00 -	db $04, $3C, $59, $05, $03, $59, $08, $2A, $59, $00 -	db $03, $4F, $59, $00 -	db $01, $56, $59, $02, $64, $59, $03, $87, $59, $06, $81, $59, $08, $76, $59, $00 -	db $03, $11, $40, $00 -	db $01, $8D, $59, $04, $B4, $59, $05, $94, $59, $08, $9B, $59, $00 -	db $03, $30, $40, $00 -	db $01, $D6, $59, $00 -	db $01, $E5, $59, $00 -	db $03, $30, $40, $00 -	db $01, $E7, $59, $04, $41, $5A, $05, $00, $5A, $08, $3C, $5A, $00 -	db $04, $64, $5B, $05, $2B, $5B, $08, $52, $5B, $00 -	db $03, $1D, $40, $00 -	db $01, $77, $5B, $00 -	db $03, $7F, $5B, $09, $79, $5B, $00 -	db $02, $8E, $5B, $03, $A2, $5B, $04, $27, $5C, $00 -	db $03, $1D, $40, $00 -	db $03, $49, $5C, $00 -	db $01, $53, $5C, $02, $64, $5C, $03, $B6, $5C, $04, $BB, $5C, $08, $9E, $5C, $00 -	db $01, $79, $5D, $00 -	db $03, $11, $40, $00 -	db $03, $81, $5D, $09, $7B, $5D, $00 -	db $01, $8E, $5D, $02, $9C, $5D, $03, $BF, $5D, $06, $B9, $5D, $08, $AE, $5D, $00 -	db $01, $C5, $5D, $04, $EC, $5D, $05, $CC, $5D, $08, $D3, $5D, $00 -	db $01, $FF, $5D, $04, $26, $5E, $05, $06, $5E, $08, $0D, $5E, $00 -	db $02, $39, $5E, $03, $5B, $5E, $04, $B3, $5E, $00 -	db $03, $11, $40, $00 -	db $01, $D5, $5E, $03, $E0, $5E, $04, $F1, $5E, $00 -	db $01, $05, $5F, $02, $1A, $5F, $04, $5F, $5F, $05, $46, $5F, $06, $40, $5F, $08, $2D, $5F, $00 -	db $01, $74, $5F, $02, $7B, $5F, $03, $85, $5F, $08, $7F, $5F, $00 -	db $01, $89, $5F, $02, $A0, $5F, $04, $C3, $5F, $06, $BD, $5F, $08, $B2, $5F, $00 -	db $03, $D7, $5F, $09, $CF, $5F, $00 -	db $03, $F2, $5F, $09, $EC, $5F, $00 -	db $03, $09, $60, $04, $3E, $60, $09, $01, $60, $00 -	db $03, $52, $60, $09, $4A, $60, $00 -	db $03, $75, $60, $00 -	db $03, $83, $60, $09, $7B, $60, $00 -	db $03, $99, $60, $00 -	db $01, $AF, $60, $00 -	db $01, $B1, $60, $00 -	db $04, $B3, $60, $00 -	db $03, $CB, $60, $00 -	db $03, $D7, $60, $09, $D1, $60, $00 -	db $03, $E8, $60, $09, $E0, $60, $00 -	db $01, $00, $61, $04, $94, $61, $05, $10, $61, $08, $77, $61, $00 -	db $03, $BA, $61, $09, $B4, $61, $00 -	db $04, $D1, $61, $00 -	db $04, $D7, $61, $00 -	db $03, $F6, $61, $00 -	db $04, $12, $62, $05, $FC, $61, $0A, $FC, $61, $00 -	db $03, $1D, $62, $00 -	db $01, $31, $62, $04, $5B, $62, $05, $3C, $62, $08, $55, $62, $00 -	db $03, $6B, $62, $00 -	db $03, $79, $62, $09, $71, $62, $00 -	db $04, $8F, $62, $00 -	db $01, $9A, $62, $00 -	db $02, $9C, $62, $03, $B4, $62, $00 -	db $03, $0F, $63, $00 -	db $01, $1C, $63, $04, $35, $63, $00 -	db $03, $11, $40, $00 -	db $03, $A1, $63, $04, $B0, $63, $09, $99, $63, $00 -	db $03, $BA, $63, $00 -	db $03, $C8, $63, $09, $C0, $63, $00 -	db $03, $11, $40, $00 -	db $04, $db, $63, $00 -	db $03, $FA, $63, $04, $09, $64, $00 -	db $03, $19, $64, $00 -	db $04, $29, $64, $00 -	db $03, $C3, $64, $09, $BB, $64, $00 -	db $03, $DE, $64, $09, $D6, $64, $00 -	db $03, $11, $40, $00 -	db $03, $FC, $64, $09, $F4, $64, $00 -	db $03, $1A, $65, $04, $29, $65, $00 -	db $04, $74, $65, $05, $39, $65, $08, $62, $65, $00 -	db $03, $89, $65, $00 -	db $03, $11, $40, $00 -	db $03, $8F, $65, $00 -	db $03, $11, $40, $00 -	db $04, $95, $65, $00 -	db $03, $DC, $65, $00 -	db $03, $EE, $65, $04, $FD, $65, $00 -	db $04, $1F, $67, $05, $0D, $66, $08, $C3, $66, $00 -	db $03, $11, $40, $00 -	db $04, $39, $67, $00 -	db $03, $58, $67, $04, $5E, $67, $09, $58, $67, $00 -	db $04, $5F, $67, $00 -	db $01, $7E, $67, $07, $80, $67, $00 -	db $04, $CB, $67, $00 -	db $04, $D5, $67, $00 -	db $03, $70, $68, $04, $76, $68, $09, $70, $68, $00 -	db $01, $77, $68, $04, $F6, $68, $05, $7B, $68, $08, $F1, $68, $00 -	db $03, $38, $69, $09, $30, $69, $00 -	db $03, $11, $40, $00 -	db $03, $4E, $69, $00 -	db $03, $6A, $69, $09, $62, $69, $00 -	db $01, $7F, $69, $02, $81, $69, $03, $87, $69, $04, $89, $69, $05, $83, $69, $08, $85, $69, $09, $7D, $69, $00 -	db $03, $B8, $6A, $00 -	db $02, $CA, $6A, $03, $E8, $6A, $00 -	db $03, $FE, $6A, $09, $F6, $6A, $00 -	db $01, $15, $6B, $00 -	db $03, $11, $40, $00 -	db $01, $1F, $6B, $03, $34, $6B, $06, $2C, $6B, $09, $17, $6B, $00 -	db $04, $40, $6B, $00 -	db $03, $65, $6B, $09, $5D, $6B, $00 -	db $03, $83, $6B, $09, $7B, $6B, $00 -	db $03, $A1, $6B, $09, $96, $6B, $00 -	db $03, $C2, $6B, $09, $BA, $6B, $00 -	db $01, $D7, $6B, $00 -	db $03, $DF, $6B, $09, $D9, $6B, $00 -	db $04, $E8, $6B, $00 -	db $03, $14, $6C, $09, $0C, $6C, $00 -	db $04, $35, $6C, $05, $2C, $6C, $08, $2F, $6C, $00 -	db $01, $77, $6C, $02, $82, $6C, $08, $7E, $6C, $00 -	db $03, $88, $6C, $00 -	db $04, $8E, $6C, $00 -	db $04, $E9, $6C, $05, $D3, $6C, $0A, $D3, $6C, $00 -	db $01, $F2, $6C, $02, $F5, $6C, $03, $FE, $6C, $04, $01, $6D, $05, $F8, $6C, $08, $FB, $6C, $09, $EF, $6C, $00 -	db $03, $04, $6D, $00 -	db $01, $0B, $6D, $02, $16, $6D, $08, $12, $6D, $00 -	db $03, $30, $40, $00 -	db $03, $87, $6D, $09, $87, $6D, $00 -	db $03, $30, $40, $00 -	db $01, $94, $6D, $04, $9F, $6D, $00 -	db $04, $A6, $6D, $00 -	db $03, $AC, $6D, $00 -	db $03, $11, $40, $00 -	db $03, $B2, $6D, $00 -	db $04, $CF, $6D, $05, $B9, $6D, $0A, $B9, $6D, $00 -	db $01, $D5, $6D, $02, $ED, $6D, $04, $FB, $6D, $08, $F7, $6D, $00 -	db $01, $1F, $6E, $02, $31, $6E, $04, $5E, $6E, $08, $3C, $6E, $00 -	db $03, $E7, $6E, $00 -	db $04, $FB, $6E, $00 -	db $03, $07, $6F, $09, $01, $6F, $00 -	db $02, $18, $6F, $03, $3C, $6F, $05, $27, $6F, $00 -	db $01, $51, $6F, $07, $53, $6F, $00 -	db $03, $A4, $6F, $09, $9C, $6F, $00 -	db $04, $E0, $6F, $00 -	db $04, $F6, $6F, $00 -	db $04, $BF, $70, $00 -	db $03, $D0, $70, $04, $D6, $70, $00 -	db $01, $0D, $71, $04, $19, $71, $00 -	db $04, $53, $71, $00 -	db $00 -	db $00 -	db $00 -	db $00 -	db $00 -	db $00 -	db $00 -	db $01, $59, $71, $02, $67, $71, $03, $B5, $71, $00 -	db $03, $16, $72, $00 -	db $01, $52, $72, $02, $5F, $72, $03, $73, $72, $08, $6F, $72, $00 -	db $01, $8E, $72, $02, $A0, $72, $03, $F8, $72, $05, $B9, $72, $00 -	db $01, $1C, $73, $03, $72, $73, $05, $28, $73, $00 -	db $03, $A1, $73, $00 -	db $01, $CA, $73, $02, $D1, $73, $03, $EF, $73, $00 -	db $03, $F9, $73, $00 -	db $01, $3B, $74, $02, $4A, $74, $03, $63, $74, $00 -	db $02, $88, $74, $03, $99, $74, $00 -	db $01, $B3, $74, $03, $BF, $74, $00 -	db $01, $C5, $74, $03, $D1, $74, $00 -	db $03, $E1, $74, $00 -	db $01, $13, $75, $02, $2A, $75, $03, $45, $75, $05, $2E, $75, $00 -	db $01, $61, $75, $03, $6D, $75, $00 -	db $01, $73, $75, $02, $7E, $75, $03, $8F, $75, $00 -	db $03, $E0, $75, $00 -	db $01, $EE, $75, $02, $F9, $75, $03, $0A, $76, $00 -	db $01, $11, $76, $03, $18, $76, $00 -	db $01, $59, $76, $02, $72, $76, $03, $8F, $76, $00 -	db $01, $B3, $76, $02, $C1, $76, $03, $F4, $76, $00 -	db $01, $95, $77, $02, $A0, $77, $03, $C3, $77, $00 -	db $01, $26, $78, $02, $38, $78, $03, $8D, $78, $05, $53, $78, $00 -	db $01, $E1, $78, $03, $AA, $79, $05, $ED, $78, $00 -	db $03, $C4, $79, $00 -	db $03, $E3, $79, $00 -	db $01, $70, $7A, $02, $7B, $7A, $03, $85, $7A, $00 -	db $01, $AD, $7A, $03, $15, $7B, $05, $B9, $7A, $00 -	db $01, $36, $7B, $03, $68, $7B, $05, $41, $7B, $00 -	db $01, $80, $7B, $02, $93, $7B, $03, $B0, $7B, $00 -	db $01, $0B, $7C, $02, $24, $7C, $03, $99, $7C, $00 -	db $01, $D0, $7C, $02, $E4, $7C, $03, $73, $7D, $00 -	db $01, $A4, $7D, $02, $B6, $7D, $03, $FA, $7D, $05, $BA, $7D, $00 -	db $01, $6E, $7E, $02, $79, $7E, $03, $90, $7E, $00 +MoveEffectCommands: ; 186f7 (6:46f7)
 +; Each move has a two-byte effect pointer (move's 7th param) that points to one of these structures:
 +; 	db  CommandId ($01 - $09)
 +; 	dw Function
 +; 	...
 +; 	db	db  $00
 +
 +; Apparently every command has a "time", and a function is called multiple times during a turn
 +; with an argument identifying the command Id. If said command Id is found in the
 +; current move effect's array, its assigned function is immediately executed.
 +
 +EkansSpitPoisonEffectCommands:
 +	dbw $03, $46F8
 + 	dbw $09, $46F0
 +	db  $00
 +EkansWrapEffectCommands:
 +	dbw $03, $4011
 +	db  $00
 +ArbokTerrorStrikeEffectCommands:	
 +	dbw $04, $4726
 + 	dbw $05, $470A
 + 	dbw $0A, $470A
 +	db  $00
 +ArbokPoisonFangEffectCommands:	
 +	dbw $03, $4007
 + 	dbw $09, $4730
 +	db  $00
;NextEffectCommands: +	dbw $03, $4000
 + 	dbw $09, $4738
 +	db  $00
;NextEffectCommands: +	dbw $01, $4740
 + 	dbw $04, $476A
 + 	dbw $05, $474B
 + 	dbw $08, $4764
 +	db  $00
;NextEffectCommands: +	dbw $03, $477E
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $4007
 + 	dbw $09, $478B
 +	db  $00
;NextEffectCommands: +	dbw $03, $4793
 +	db  $00
;NextEffectCommands: +	dbw $03, $47A0
 +	db  $00
;NextEffectCommands: +	dbw $03, $4000
 + 	dbw $09, $47B4
 +	db  $00
;NextEffectCommands: +	dbw $04, $47BC
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $04, $47C6
 +	db  $00
;NextEffectCommands: +	dbw $03, $47D0
 +	db  $00
;NextEffectCommands: +	dbw $03, $47DC
 +	db  $00
;NextEffectCommands: +	dbw $04, $47E3
 +	db  $00
;NextEffectCommands: +	dbw $03, $47F5
 + 	dbw $09, $47ED
 +	db  $00
;NextEffectCommands: +	dbw $03, $4000
 + 	dbw $09, $480D
 +	db  $00
;NextEffectCommands: +	dbw $03, $4030
 +	db  $00
;NextEffectCommands: +	dbw $04, $4815
 +	db  $00
;NextEffectCommands: +	dbw $03, $482A
 + 	dbw $09, $4822
 +	db  $00
;NextEffectCommands: +	dbw $03, $4836
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $01, $484A
 + 	dbw $04, $48CC
 + 	dbw $05, $485A
 + 	dbw $08, $48B7
 +	db  $00
;NextEffectCommands: +	dbw $01, $48EC
 + 	dbw $04, $491A
 + 	dbw $05, $48F7
 + 	dbw $08, $490F
 +	db  $00
;NextEffectCommands: +	dbw $03, $4944
 + 	dbw $09, $4925
 +	db  $00
;NextEffectCommands: +	dbw $03, $4973
 + 	dbw $04, $4982
 + 	dbw $09, $496B
 +	db  $00
;NextEffectCommands: +	dbw $03, $4994
 + 	dbw $09, $498C
 +	db  $00
;NextEffectCommands: +	dbw $03, $4998
 +	db  $00
;NextEffectCommands: +	dbw $03, $49C6
 + 	dbw $09, $49BE
 +	db  $00
;NextEffectCommands: +	dbw $01, $49DB
 + 	dbw $04, $4A6E
 + 	dbw $05, $49EB
 + 	dbw $08, $4A55
 +	db  $00
;NextEffectCommands: +	dbw $03, $4A96
 + 	dbw $09, $4A8E
 +	db  $00
;NextEffectCommands: +	dbw $03, $4AAC
 +	db  $00
;NextEffectCommands: +	dbw $03, $4ABB
 + 	dbw $09, $4AB3
 +	db  $00
;NextEffectCommands: +	dbw $03, $4ADB
 + 	dbw $09, $4AD3
 +	db  $00
;NextEffectCommands: +	dbw $04, $4B09
 + 	dbw $05, $4AF3
 + 	dbw $0A, $4AF3
 +	db  $00
;NextEffectCommands: +	dbw $04, $4B0F
 +	db  $00
;NextEffectCommands: +	dbw $03, $4030
 +	db  $00
;NextEffectCommands: +	dbw $03, $4030
 +	db  $00
;NextEffectCommands: +	dbw $03, $4000
 + 	dbw $09, $4B27
 +	db  $00
;NextEffectCommands: +	dbw $03, $4007
 + 	dbw $09, $4B2F
 +	db  $00
;NextEffectCommands: +	dbw $04, $4B37
 +	db  $00
;NextEffectCommands: +	dbw $02, $4B44
 + 	dbw $03, $4B77
 + 	dbw $04, $4BFB
 + 	dbw $05, $4B6F
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $4C30
 +	db  $00
;NextEffectCommands: +	dbw $01, $4C36
 +	db  $00
;NextEffectCommands: +	dbw $03, $4000
 + 	dbw $09, $4C38
 +	db  $00
;NextEffectCommands: +	dbw $01, $4C40
 + 	dbw $04, $4CC2
 + 	dbw $05, $4C50
 + 	dbw $08, $4CAD
 +	db  $00
;NextEffectCommands: +	dbw $03, $4000
 + 	dbw $09, $4CE2
 +	db  $00
;NextEffectCommands: +	dbw $04, $4CEA
 +	db  $00
;NextEffectCommands: +	dbw $02, $4D09
 + 	dbw $03, $4D5D
 + 	dbw $05, $4D21
 +	db  $00
;NextEffectCommands: +	dbw $03, $4D8C
 + 	dbw $09, $4D84
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $4007
 + 	dbw $09, $4DA0
 +	db  $00
;NextEffectCommands: +	dbw $02, $4DA8
 + 	dbw $03, $4DC7
 +	db  $00
;NextEffectCommands: +	dbw $03, $4E2B
 + 	dbw $09, $4E23
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $4007
 + 	dbw $09, $4E4B
 +	db  $00
;NextEffectCommands: +	dbw $02, $4E53
 + 	dbw $03, $4E82
 +	db  $00
;NextEffectCommands: +	dbw $04, $4EB0
 +	db  $00
;NextEffectCommands: +	dbw $03, $4F05
 + 	dbw $09, $4F05
 +	db  $00
;NextEffectCommands: +	dbw $03, $4F12
 + 	dbw $09, $4F0A
 +	db  $00
;NextEffectCommands: +	dbw $01, $4F2A
 +	db  $00
;NextEffectCommands: +	dbw $03, $4F2C
 + 	dbw $09, $4F2C
 +	db  $00
;NextEffectCommands: +	dbw $03, $4F32
 +	db  $00
;NextEffectCommands: +	dbw $01, $4F46
 +	db  $00
;NextEffectCommands: +	dbw $03, $4F48
 + 	dbw $09, $4F48
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $4F54
 + 	dbw $09, $4F4E
 +	db  $00
;NextEffectCommands: +	dbw $01, $4F5D
 + 	dbw $04, $4FDF
 + 	dbw $05, $4F6D
 + 	dbw $08, $4FCA
 +	db  $00
;NextEffectCommands: +	dbw $03, $5005
 + 	dbw $09, $4FFF
 +	db  $00
;NextEffectCommands: +	dbw $03, $500E
 +	db  $00
;NextEffectCommands: +	dbw $03, $501E
 + 	dbw $09, $5016
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $04, $506B
 + 	dbw $05, $5033
 + 	dbw $08, $5065
 +	db  $00
;NextEffectCommands: +	dbw $03, $5085
 + 	dbw $09, $5085
 +	db  $00
;NextEffectCommands: +	dbw $03, $508B
 +	db  $00
;NextEffectCommands: +	dbw $03, $509D
 +	db  $00
;NextEffectCommands: +	dbw $03, $50A4
 +	db  $00
;NextEffectCommands: +	dbw $03, $50C0
 + 	dbw $09, $50B8
 +	db  $00
;NextEffectCommands: +	dbw $03, $50D3
 + 	dbw $09, $50D3
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $01, $50D9
 + 	dbw $02, $50F0
 + 	dbw $04, $5114
 + 	dbw $06, $510E
 + 	dbw $08, $5103
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $5120
 +	db  $00
;NextEffectCommands: +	dbw $03, $5134
 +	db  $00
;NextEffectCommands: +	dbw $03, $513A
 +	db  $00
;NextEffectCommands: +	dbw $03, $4007
 + 	dbw $09, $5141
 +	db  $00
;NextEffectCommands: +	dbw $01, $5149
 + 	dbw $02, $516F
 + 	dbw $03, $5179
 + 	dbw $08, $5173
 +	db  $00
;NextEffectCommands: +	dbw $03, $51C8
 + 	dbw $09, $51C0
 +	db  $00
;NextEffectCommands: +	dbw $03, $51E0
 + 	dbw $09, $51E0
 +	db  $00
;NextEffectCommands: +	dbw $04, $5214
 + 	dbw $05, $51E6
 + 	dbw $08, $520E
 +	db  $00
;NextEffectCommands: +	dbw $03, $5227
 + 	dbw $09, $5227
 +	db  $00
;NextEffectCommands: +	dbw $03, $522D
 +	db  $00
;NextEffectCommands: +	dbw $03, $524E
 + 	dbw $09, $5246
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $5266
 + 	dbw $04, $526F
 +	db  $00
;NextEffectCommands: +	dbw $02, $528B
 + 	dbw $03, $52C3
 + 	dbw $05, $52AE
 +	db  $00
;NextEffectCommands: +	dbw $03, $52EB
 + 	dbw $09, $52EB
 +	db  $00
;NextEffectCommands: +	dbw $03, $401D
 +	db  $00
;NextEffectCommands: +	dbw $01, $52F1
 + 	dbw $07, $52F3
 +	db  $00
;NextEffectCommands: +	dbw $03, $5329
 + 	dbw $04, $532E
 +	db  $00
;NextEffectCommands: +	dbw $03, $533F
 +	db  $00
;NextEffectCommands: +	dbw $01, $5363
 + 	dbw $02, $5371
 + 	dbw $06, $5379
 + 	dbw $08, $5375
 +	db  $00
;NextEffectCommands: +	dbw $04, $537F
 +	db  $00
;NextEffectCommands: +	dbw $03, $538D
 + 	dbw $09, $5385
 +	db  $00
;NextEffectCommands: +	dbw $01, $53A0
 + 	dbw $02, $53AE
 + 	dbw $03, $53EF
 + 	dbw $06, $53DE
 + 	dbw $08, $53D5
 + 	dbw $09, $53E9
 +	db  $00
;NextEffectCommands: +	dbw $03, $5400
 + 	dbw $09, $53F8
 +	db  $00
;NextEffectCommands: +	dbw $03, $5413
 +	db  $00
;NextEffectCommands: +	dbw $01, $5425
 + 	dbw $04, $544F
 + 	dbw $05, $5430
 + 	dbw $08, $5449
 +	db  $00
;NextEffectCommands: +	dbw $01, $5463
 + 	dbw $02, $5471
 + 	dbw $06, $5479
 + 	dbw $08, $5475
 +	db  $00
;NextEffectCommands: +	dbw $01, $547F
 + 	dbw $02, $548D
 + 	dbw $06, $5495
 + 	dbw $08, $5491
 +	db  $00
;NextEffectCommands: +	dbw $01, $549B
 + 	dbw $02, $54A9
 + 	dbw $04, $54F4
 + 	dbw $06, $54E1
 + 	dbw $08, $54DD
 +	db  $00
;NextEffectCommands: +	dbw $03, $552B
 + 	dbw $09, $5523
 +	db  $00
;NextEffectCommands: +	dbw $03, $5549
 + 	dbw $09, $5541
 +	db  $00
;NextEffectCommands: +	dbw $01, $555C
 + 	dbw $02, $556A
 + 	dbw $06, $5572
 + 	dbw $08, $556E
 +	db  $00
;NextEffectCommands: +	dbw $01, $5578
 + 	dbw $02, $5586
 + 	dbw $06, $558E
 + 	dbw $08, $558A
 +	db  $00
;NextEffectCommands: +	dbw $03, $5594
 +	db  $00
;NextEffectCommands: +	dbw $03, $4000
 + 	dbw $09, $559A
 +	db  $00
;NextEffectCommands: +	dbw $01, $55A2
 + 	dbw $02, $55B0
 + 	dbw $06, $55B8
 + 	dbw $08, $55B4
 +	db  $00
;NextEffectCommands: +	dbw $01, $55BE
 +	db  $00
;NextEffectCommands: +	dbw $01, $55C0
 + 	dbw $02, $55CD
 + 	dbw $06, $5614
 + 	dbw $08, $5606
 +	db  $00
;NextEffectCommands: +	dbw $03, $401D
 +	db  $00
;NextEffectCommands: +	dbw $03, $563E
 + 	dbw $09, $5638
 +	db  $00
;NextEffectCommands: +	dbw $04, $5647
 +	db  $00
;NextEffectCommands: +	dbw $03, $56AB
 + 	dbw $09, $56A3
 +	db  $00
;NextEffectCommands: +	dbw $01, $56C0
 + 	dbw $07, $56C2
 +	db  $00
;NextEffectCommands: +	dbw $03, $5776
 + 	dbw $09, $576E
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $02, $57FC
 + 	dbw $03, $58BB
 + 	dbw $05, $5834
 +	db  $00
;NextEffectCommands: +	dbw $04, $593C
 + 	dbw $05, $5903
 + 	dbw $08, $592A
 +	db  $00
;NextEffectCommands: +	dbw $03, $594F
 +	db  $00
;NextEffectCommands: +	dbw $01, $5956
 + 	dbw $02, $5964
 + 	dbw $03, $5987
 + 	dbw $06, $5981
 + 	dbw $08, $5976
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $01, $598D
 + 	dbw $04, $59B4
 + 	dbw $05, $5994
 + 	dbw $08, $599B
 +	db  $00
;NextEffectCommands: +	dbw $03, $4030
 +	db  $00
;NextEffectCommands: +	dbw $01, $59D6
 +	db  $00
;NextEffectCommands: +	dbw $01, $59E5
 +	db  $00
;NextEffectCommands: +	dbw $03, $4030
 +	db  $00
;NextEffectCommands: +	dbw $01, $59E7
 + 	dbw $04, $5A41
 + 	dbw $05, $5A00
 + 	dbw $08, $5A3C
 +	db  $00
;NextEffectCommands: +	dbw $04, $5B64
 + 	dbw $05, $5B2B
 + 	dbw $08, $5B52
 +	db  $00
;NextEffectCommands: +	dbw $03, $401D
 +	db  $00
;NextEffectCommands: +	dbw $01, $5B77
 +	db  $00
;NextEffectCommands: +	dbw $03, $5B7F
 + 	dbw $09, $5B79
 +	db  $00
;NextEffectCommands: +	dbw $02, $5B8E
 + 	dbw $03, $5BA2
 + 	dbw $04, $5C27
 +	db  $00
;NextEffectCommands: +	dbw $03, $401D
 +	db  $00
;NextEffectCommands: +	dbw $03, $5C49
 +	db  $00
;NextEffectCommands: +	dbw $01, $5C53
 + 	dbw $02, $5C64
 + 	dbw $03, $5CB6
 + 	dbw $04, $5CBB
 + 	dbw $08, $5C9E
 +	db  $00
;NextEffectCommands: +	dbw $01, $5D79
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $5D81
 + 	dbw $09, $5D7B
 +	db  $00
;NextEffectCommands: +	dbw $01, $5D8E
 + 	dbw $02, $5D9C
 + 	dbw $03, $5DBF
 + 	dbw $06, $5DB9
 + 	dbw $08, $5DAE
 +	db  $00
;NextEffectCommands: +	dbw $01, $5DC5
 + 	dbw $04, $5DEC
 + 	dbw $05, $5DCC
 + 	dbw $08, $5DD3
 +	db  $00
;NextEffectCommands: +	dbw $01, $5DFF
 + 	dbw $04, $5E26
 + 	dbw $05, $5E06
 + 	dbw $08, $5E0D
 +	db  $00
;NextEffectCommands: +	dbw $02, $5E39
 + 	dbw $03, $5E5B
 + 	dbw $04, $5EB3
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $01, $5ED5
 + 	dbw $03, $5EE0
 + 	dbw $04, $5EF1
 +	db  $00
;NextEffectCommands: +	dbw $01, $5F05
 + 	dbw $02, $5F1A
 + 	dbw $04, $5F5F
 + 	dbw $05, $5F46
 + 	dbw $06, $5F40
 + 	dbw $08, $5F2D
 +	db  $00
;NextEffectCommands: +	dbw $01, $5F74
 + 	dbw $02, $5F7B
 + 	dbw $03, $5F85
 + 	dbw $08, $5F7F
 +	db  $00
;NextEffectCommands: +	dbw $01, $5F89
 + 	dbw $02, $5FA0
 + 	dbw $04, $5FC3
 + 	dbw $06, $5FBD
 + 	dbw $08, $5FB2
 +	db  $00
;NextEffectCommands: +	dbw $03, $5FD7
 + 	dbw $09, $5FCF
 +	db  $00
;NextEffectCommands: +	dbw $03, $5FF2
 + 	dbw $09, $5FEC
 +	db  $00
;NextEffectCommands: +	dbw $03, $6009
 + 	dbw $04, $603E
 + 	dbw $09, $6001
 +	db  $00
;NextEffectCommands: +	dbw $03, $6052
 + 	dbw $09, $604A
 +	db  $00
;NextEffectCommands: +	dbw $03, $6075
 +	db  $00
;NextEffectCommands: +	dbw $03, $6083
 + 	dbw $09, $607B
 +	db  $00
;NextEffectCommands: +	dbw $03, $6099
 +	db  $00
;NextEffectCommands: +	dbw $01, $60AF
 +	db  $00
;NextEffectCommands: +	dbw $01, $60B1
 +	db  $00
;NextEffectCommands: +	dbw $04, $60B3
 +	db  $00
;NextEffectCommands: +	dbw $03, $60CB
 +	db  $00
;NextEffectCommands: +	dbw $03, $60D7
 + 	dbw $09, $60D1
 +	db  $00
;NextEffectCommands: +	dbw $03, $60E8
 + 	dbw $09, $60E0
 +	db  $00
;NextEffectCommands: +	dbw $01, $6100
 + 	dbw $04, $6194
 + 	dbw $05, $6110
 + 	dbw $08, $6177
 +	db  $00
;NextEffectCommands: +	dbw $03, $61BA
 + 	dbw $09, $61B4
 +	db  $00
;NextEffectCommands: +	dbw $04, $61D1
 +	db  $00
;NextEffectCommands: +	dbw $04, $61D7
 +	db  $00
;NextEffectCommands: +	dbw $03, $61F6
 +	db  $00
;NextEffectCommands: +	dbw $04, $6212
 + 	dbw $05, $61FC
 + 	dbw $0A, $61FC
 +	db  $00
;NextEffectCommands: +	dbw $03, $621D
 +	db  $00
;NextEffectCommands: +	dbw $01, $6231
 + 	dbw $04, $625B
 + 	dbw $05, $623C
 + 	dbw $08, $6255
 +	db  $00
;NextEffectCommands: +	dbw $03, $626B
 +	db  $00
;NextEffectCommands: +	dbw $03, $6279
 + 	dbw $09, $6271
 +	db  $00
;NextEffectCommands: +	dbw $04, $628F
 +	db  $00
;NextEffectCommands: +	dbw $01, $629A
 +	db  $00
;NextEffectCommands: +	dbw $02, $629C
 + 	dbw $03, $62B4
 +	db  $00
;NextEffectCommands: +	dbw $03, $630F
 +	db  $00
;NextEffectCommands: +	dbw $01, $631C
 + 	dbw $04, $6335
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $63A1
 + 	dbw $04, $63B0
 + 	dbw $09, $6399
 +	db  $00
;NextEffectCommands: +	dbw $03, $63BA
 +	db  $00
;NextEffectCommands: +	dbw $03, $63C8
 + 	dbw $09, $63C0
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $04, $63db
 +	db  $00
;NextEffectCommands: +	dbw $03, $63FA
 + 	dbw $04, $6409
 +	db  $00
;NextEffectCommands: +	dbw $03, $6419
 +	db  $00
;NextEffectCommands: +	dbw $04, $6429
 +	db  $00
;NextEffectCommands: +	dbw $03, $64C3
 + 	dbw $09, $64BB
 +	db  $00
;NextEffectCommands: +	dbw $03, $64DE
 + 	dbw $09, $64D6
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $64FC
 + 	dbw $09, $64F4
 +	db  $00
;NextEffectCommands: +	dbw $03, $651A
 + 	dbw $04, $6529
 +	db  $00
;NextEffectCommands: +	dbw $04, $6574
 + 	dbw $05, $6539
 + 	dbw $08, $6562
 +	db  $00
;NextEffectCommands: +	dbw $03, $6589
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $658F
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $04, $6595
 +	db  $00
;NextEffectCommands: +	dbw $03, $65DC
 +	db  $00
;NextEffectCommands: +	dbw $03, $65EE
 + 	dbw $04, $65FD
 +	db  $00
;NextEffectCommands: +	dbw $04, $671F
 + 	dbw $05, $660D
 + 	dbw $08, $66C3
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $04, $6739
 +	db  $00
;NextEffectCommands: +	dbw $03, $6758
 + 	dbw $04, $675E
 + 	dbw $09, $6758
 +	db  $00
;NextEffectCommands: +	dbw $04, $675F
 +	db  $00
;NextEffectCommands: +	dbw $01, $677E
 + 	dbw $07, $6780
 +	db  $00
;NextEffectCommands: +	dbw $04, $67CB
 +	db  $00
;NextEffectCommands: +	dbw $04, $67D5
 +	db  $00
;NextEffectCommands: +	dbw $03, $6870
 + 	dbw $04, $6876
 + 	dbw $09, $6870
 +	db  $00
;NextEffectCommands: +	dbw $01, $6877
 + 	dbw $04, $68F6
 + 	dbw $05, $687B
 + 	dbw $08, $68F1
 +	db  $00
;NextEffectCommands: +	dbw $03, $6938
 + 	dbw $09, $6930
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $694E
 +	db  $00
;NextEffectCommands: +	dbw $03, $696A
 + 	dbw $09, $6962
 +	db  $00
;NextEffectCommands: +	dbw $01, $697F
 + 	dbw $02, $6981
 + 	dbw $03, $6987
 + 	dbw $04, $6989
 + 	dbw $05, $6983
 + 	dbw $08, $6985
 + 	dbw $09, $697D
 +	db  $00
;NextEffectCommands: +	dbw $03, $6AB8
 +	db  $00
;NextEffectCommands: +	dbw $02, $6ACA
 + 	dbw $03, $6AE8
 +	db  $00
;NextEffectCommands: +	dbw $03, $6AFE
 + 	dbw $09, $6AF6
 +	db  $00
;NextEffectCommands: +	dbw $01, $6B15
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $01, $6B1F
 + 	dbw $03, $6B34
 + 	dbw $06, $6B2C
 + 	dbw $09, $6B17
 +	db  $00
;NextEffectCommands: +	dbw $04, $6B40
 +	db  $00
;NextEffectCommands: +	dbw $03, $6B65
 + 	dbw $09, $6B5D
 +	db  $00
;NextEffectCommands: +	dbw $03, $6B83
 + 	dbw $09, $6B7B
 +	db  $00
;NextEffectCommands: +	dbw $03, $6BA1
 + 	dbw $09, $6B96
 +	db  $00
;NextEffectCommands: +	dbw $03, $6BC2
 + 	dbw $09, $6BBA
 +	db  $00
;NextEffectCommands: +	dbw $01, $6BD7
 +	db  $00
;NextEffectCommands: +	dbw $03, $6BDF
 + 	dbw $09, $6BD9
 +	db  $00
;NextEffectCommands: +	dbw $04, $6BE8
 +	db  $00
;NextEffectCommands: +	dbw $03, $6C14
 + 	dbw $09, $6C0C
 +	db  $00
;NextEffectCommands: +	dbw $04, $6C35
 + 	dbw $05, $6C2C
 + 	dbw $08, $6C2F
 +	db  $00
;NextEffectCommands: +	dbw $01, $6C77
 + 	dbw $02, $6C82
 + 	dbw $08, $6C7E
 +	db  $00
;NextEffectCommands: +	dbw $03, $6C88
 +	db  $00
;NextEffectCommands: +	dbw $04, $6C8E
 +	db  $00
;NextEffectCommands: +	dbw $04, $6CE9
 + 	dbw $05, $6CD3
 + 	dbw $0A, $6CD3
 +	db  $00
;NextEffectCommands: +	dbw $01, $6CF2
 + 	dbw $02, $6CF5
 + 	dbw $03, $6CFE
 + 	dbw $04, $6D01
 + 	dbw $05, $6CF8
 + 	dbw $08, $6CFB
 + 	dbw $09, $6CEF
 +	db  $00
;NextEffectCommands: +	dbw $03, $6D04
 +	db  $00
;NextEffectCommands: +	dbw $01, $6D0B
 + 	dbw $02, $6D16
 + 	dbw $08, $6D12
 +	db  $00
;NextEffectCommands: +	dbw $03, $4030
 +	db  $00
;NextEffectCommands: +	dbw $03, $6D87
 + 	dbw $09, $6D87
 +	db  $00
;NextEffectCommands: +	dbw $03, $4030
 +	db  $00
;NextEffectCommands: +	dbw $01, $6D94
 + 	dbw $04, $6D9F
 +	db  $00
;NextEffectCommands: +	dbw $04, $6DA6
 +	db  $00
;NextEffectCommands: +	dbw $03, $6DAC
 +	db  $00
;NextEffectCommands: +	dbw $03, $4011
 +	db  $00
;NextEffectCommands: +	dbw $03, $6DB2
 +	db  $00
;NextEffectCommands: +	dbw $04, $6DCF
 + 	dbw $05, $6DB9
 + 	dbw $0A, $6DB9
 +	db  $00
;NextEffectCommands: +	dbw $01, $6DD5
 + 	dbw $02, $6DED
 + 	dbw $04, $6DFB
 + 	dbw $08, $6DF7
 +	db  $00
;NextEffectCommands: +	dbw $01, $6E1F
 + 	dbw $02, $6E31
 + 	dbw $04, $6E5E
 + 	dbw $08, $6E3C
 +	db  $00
;NextEffectCommands: +	dbw $03, $6EE7
 +	db  $00
;NextEffectCommands: +	dbw $04, $6EFB
 +	db  $00
;NextEffectCommands: +	dbw $03, $6F07
 + 	dbw $09, $6F01
 +	db  $00
;NextEffectCommands: +	dbw $02, $6F18
 + 	dbw $03, $6F3C
 + 	dbw $05, $6F27
 +	db  $00
;NextEffectCommands: +	dbw $01, $6F51
 + 	dbw $07, $6F53
 +	db  $00
;NextEffectCommands: +	dbw $03, $6FA4
 + 	dbw $09, $6F9C
 +	db  $00
;NextEffectCommands: +	dbw $04, $6FE0
 +	db  $00
;NextEffectCommands: +	dbw $04, $6FF6
 +	db  $00
;NextEffectCommands: +	dbw $04, $70BF
 +	db  $00
;NextEffectCommands: +	dbw $03, $70D0
 + 	dbw $04, $70D6
 +	db  $00
;NextEffectCommands: +	dbw $01, $710D
 + 	dbw $04, $7119
 +	db  $00
;NextEffectCommands: +	dbw $04, $7153
 +	db  $00
;NextEffectCommands: +	db  $00
;NextEffectCommands: +	db  $00
;NextEffectCommands: +	db  $00
;NextEffectCommands: +	db  $00
;NextEffectCommands: +	db  $00
;NextEffectCommands: +	db  $00
;NextEffectCommands: +	db  $00
;NextEffectCommands: +	dbw $01, $7159
 + 	dbw $02, $7167
 + 	dbw $03, $71B5
 +	db  $00
;NextEffectCommands: +	dbw $03, $7216
 +	db  $00
;NextEffectCommands: +	dbw $01, $7252
 + 	dbw $02, $725F
 + 	dbw $03, $7273
 + 	dbw $08, $726F
 +	db  $00
;NextEffectCommands: +	dbw $01, $728E
 + 	dbw $02, $72A0
 + 	dbw $03, $72F8
 + 	dbw $05, $72B9
 +	db  $00
;NextEffectCommands: +	dbw $01, $731C
 + 	dbw $03, $7372
 + 	dbw $05, $7328
 +	db  $00
;NextEffectCommands: +	dbw $03, $73A1
 +	db  $00
;NextEffectCommands: +	dbw $01, $73CA
 + 	dbw $02, $73D1
 + 	dbw $03, $73EF
 +	db  $00
;NextEffectCommands: +	dbw $03, $73F9
 +	db  $00
;NextEffectCommands: +	dbw $01, $743B
 + 	dbw $02, $744A
 + 	dbw $03, $7463
 +	db  $00
;NextEffectCommands: +	dbw $02, $7488
 + 	dbw $03, $7499
 +	db  $00
;NextEffectCommands: +	dbw $01, $74B3
 + 	dbw $03, $74BF
 +	db  $00
;NextEffectCommands: +	dbw $01, $74C5
 + 	dbw $03, $74D1
 +	db  $00
;NextEffectCommands: +	dbw $03, $74E1
 +	db  $00
;NextEffectCommands: +	dbw $01, $7513
 + 	dbw $02, $752A
 + 	dbw $03, $7545
 + 	dbw $05, $752E
 +	db  $00
;NextEffectCommands: +	dbw $01, $7561
 + 	dbw $03, $756D
 +	db  $00
;NextEffectCommands: +	dbw $01, $7573
 + 	dbw $02, $757E
 + 	dbw $03, $758F
 +	db  $00
;NextEffectCommands: +	dbw $03, $75E0
 +	db  $00
;NextEffectCommands: +	dbw $01, $75EE
 + 	dbw $02, $75F9
 + 	dbw $03, $760A
 +	db  $00
;NextEffectCommands: +	dbw $01, $7611
 + 	dbw $03, $7618
 +	db  $00
;NextEffectCommands: +	dbw $01, $7659
 + 	dbw $02, $7672
 + 	dbw $03, $768F
 +	db  $00
;NextEffectCommands: +	dbw $01, $76B3
 + 	dbw $02, $76C1
 + 	dbw $03, $76F4
 +	db  $00
;NextEffectCommands: +	dbw $01, $7795
 + 	dbw $02, $77A0
 + 	dbw $03, $77C3
 +	db  $00
;NextEffectCommands: +	dbw $01, $7826
 + 	dbw $02, $7838
 + 	dbw $03, $788D
 + 	dbw $05, $7853
 +	db  $00
;NextEffectCommands: +	dbw $01, $78E1
 + 	dbw $03, $79AA
 + 	dbw $05, $78ED
 +	db  $00
;NextEffectCommands: +	dbw $03, $79C4
 +	db  $00
;NextEffectCommands: +	dbw $03, $79E3
 +	db  $00
;NextEffectCommands: +	dbw $01, $7A70
 + 	dbw $02, $7A7B
 + 	dbw $03, $7A85
 +	db  $00
;NextEffectCommands: +	dbw $01, $7AAD
 + 	dbw $03, $7B15
 + 	dbw $05, $7AB9
 +	db  $00
;NextEffectCommands: +	dbw $01, $7B36
 + 	dbw $03, $7B68
 + 	dbw $05, $7B41
 +	db  $00
;NextEffectCommands: +	dbw $01, $7B80
 + 	dbw $02, $7B93
 + 	dbw $03, $7BB0
 +	db  $00
;NextEffectCommands: +	dbw $01, $7C0B
 + 	dbw $02, $7C24
 + 	dbw $03, $7C99
 +	db  $00
;NextEffectCommands: +	dbw $01, $7CD0
 + 	dbw $02, $7CE4
 + 	dbw $03, $7D73
 +	db  $00
;NextEffectCommands: +	dbw $01, $7DA4
 + 	dbw $02, $7DB6
 + 	dbw $03, $7DFA
 + 	dbw $05, $7DBA
 +	db  $00
;NextEffectCommands: +	dbw $01, $7E6E
 + 	dbw $02, $7E79
 + 	dbw $03, $7E90
 +	db  $00
  	
\ No newline at end of file diff --git a/src/macros.asm b/src/macros.asm index b628670..7dc833c 100755 --- a/src/macros.asm +++ b/src/macros.asm @@ -1,5 +1,10 @@  ;;; engine macros +dbw: MACRO +	db \1 +	dw \2 +ENDM	 +  bank1call: MACRO  	rst $18  	dw \1 | 
