diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/move_effects.asm | 329 | ||||
| -rwxr-xr-x | src/engine/bank6.asm | 6 |
2 files changed, 334 insertions, 1 deletions
diff --git a/src/data/move_effects.asm b/src/data/move_effects.asm new file mode 100644 index 0000000..5ef34a8 --- /dev/null +++ b/src/data/move_effects.asm @@ -0,0 +1,329 @@ +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 +
\ No newline at end of file diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm index 7535b3f..409b69a 100755 --- a/src/engine/bank6.asm +++ b/src/engine/bank6.asm @@ -1,4 +1,8 @@ -INCBIN "baserom.gbc",$18000,$1996e - $18000 +INCBIN "baserom.gbc",$18000,$186f7 - $18000 + +INCLUDE "data/move_effects.asm" + +INCBIN "baserom.gbc",$18f9c,$1996e - $18f9c Func_1996e: ; 1996e (6:596e) call EnableExtRAM |