From e2c68b04e76c6d7938f44f06f1a490daebab748d Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 9 Jul 2018 12:05:24 -0400 Subject: [PATCH] tfv: minor fixes to summon --- gr-sim/tfv/tfv_battle.c | 104 ++++++++++++++++++++++++++ gr-sim/tfv/tfv_sprites.c | 2 +- tfv/tfv_backgrounds.inc | 155 ++++++++++++++++++++------------------- 3 files changed, 184 insertions(+), 77 deletions(-) diff --git a/gr-sim/tfv/tfv_battle.c b/gr-sim/tfv/tfv_battle.c index 537aedf8..055c8e1c 100644 --- a/gr-sim/tfv/tfv_battle.c +++ b/gr-sim/tfv/tfv_battle.c @@ -867,6 +867,110 @@ static void limit_break(int which) { static void summon(int which) { + int tx=34,ty=20; + int damage=100; + int i; + int ax=28,ay=2; + + i=0; + while(i<30) { + + gr_copy_to_current(0xc00); + + grsim_put_sprite(tfv_stand_left,tx,ty); + grsim_put_sprite(tfv_led_sword,tx-5,ty); + + grsim_put_sprite(enemies[enemy_type].sprite,enemy_x,20); + + grsim_put_sprite(metrocat,ax,ay); + + draw_battle_bottom(enemy_type); + + page_flip(); + + i++; + + usleep(20000); + } + + while(ax>15) { + + gr_copy_to_current(0xc00); + + grsim_put_sprite(tfv_stand_left,tx,ty); + grsim_put_sprite(tfv_led_sword,tx-5,ty); + + grsim_put_sprite(enemies[enemy_type].sprite,enemy_x,20); + + grsim_put_sprite(metrocat,ax,ay); + + draw_battle_bottom(enemy_type); + + page_flip(); + + ax-=1; + + usleep(20000); + } + + while(ax>5) { + + gr_copy_to_current(0xc00); + + grsim_put_sprite(tfv_stand_left,tx,ty); + grsim_put_sprite(tfv_led_sword,tx-5,ty); + + grsim_put_sprite(enemies[enemy_type].sprite,enemy_x,20); + + grsim_put_sprite(metrocat,ax,ay); + + draw_battle_bottom(enemy_type); + + page_flip(); + + ay+=1; + ax-=1; + + usleep(20000); + } + + i=0; + while(i<30) { + + gr_copy_to_current(0xc00); + + grsim_put_sprite(tfv_stand_left,tx,ty); + grsim_put_sprite(tfv_led_sword,tx-5,ty); + + grsim_put_sprite(enemies[enemy_type].sprite,enemy_x,20); + + grsim_put_sprite(metrocat,ax,ay); + + draw_battle_bottom(enemy_type); + + page_flip(); + + i++; + + usleep(20000); + } + + gr_copy_to_current(0xc00); + + grsim_put_sprite(enemies[enemy_type].sprite,enemy_x,20); + + grsim_put_sprite(tfv_stand_left,tx,ty); + grsim_put_sprite(tfv_led_sword,tx-5,ty); + draw_battle_bottom(enemy_type); + + damage_enemy(damage); + gr_put_num(2,10,damage); + page_flip(); + + for(i=0;i<20;i++) { + usleep(100000); + } + limit=0; } diff --git a/gr-sim/tfv/tfv_sprites.c b/gr-sim/tfv/tfv_sprites.c index d0c503be..b5048374 100644 --- a/gr-sim/tfv/tfv_sprites.c +++ b/gr-sim/tfv/tfv_sprites.c @@ -318,7 +318,7 @@ unsigned char metrocat[]={ 0x88,0x58,0x55,0x88,0x55,0x55,0x55,0x88,0x55,0x58,0x88, 0x58,0x55,0x55,0x55,0x88,0x55,0x88,0x55,0x55,0x55,0x58, 0x58,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x58, - 0x88,0xcc,0x88,0xcc,0x55,0x75,0x55,0xcc,0x88,0xcc,0x88, + 0x88,0xdd,0x88,0xdd,0x55,0x75,0x55,0xdd,0x88,0xdd,0x88, 0x85,0x55,0x55,0x55,0x55,0x77,0x55,0x55,0x55,0x55,0x85, 0x88,0x55,0x85,0x55,0xb5,0xb7,0xb5,0x55,0x85,0x55,0x88, 0x00,0x55,0x55,0xf5,0xff,0x8b,0xff,0xf5,0x55,0x55,0x00, diff --git a/tfv/tfv_backgrounds.inc b/tfv/tfv_backgrounds.inc index 989a90fc..1ec99919 100644 --- a/tfv/tfv_backgrounds.inc +++ b/tfv/tfv_backgrounds.inc @@ -153,27 +153,26 @@ math_office_rle: .byte $28 ; ysize=40 .byte $44, $4F, $44, $FF, $44, $4F, $44 .byte $FF, $44, $4F, $FF, $A0,$19,$00, $44, $4F,$4F .byte $A4,$44, $4F, $A3,$44, $4F, $44,$44, $4F, $A0,$19,$00 - .byte $AF,$44, $00,$00, $88, $B8, $A7,$00, $80,$80, $A7,$00 - .byte $B8, $88, $00,$00, $0A, $AF,$07, $00,$00, $88 - .byte $BB, $0B, $A6,$00, $88, $BB, $B0, $A5,$00 + .byte $AF,$44, $AB,$00, $80,$80, $A7,$00, $B8, $88, $00,$00 + .byte $0A, $AF,$07, $AB,$00, $88, $BB, $B0, $A5,$00 .byte $0B, $BB, $88, $A4,$00, $B8, $88, $AE,$00 - .byte $88, $A8,$00, $88, $FB, $A7,$00, $2B, $A4,$00 - .byte $0B, $BB, $88, $AE,$00, $77, $FF, $A7,$00 - .byte $F8, $FF, $F0, $A5,$00, $44, $22, $A5,$00 - .byte $FF, $08, $80, $AD,$00, $F7,$F7, $0B, $A6,$00 - .byte $7F, $11, $7F, $A4,$70, $11, $74, $72 - .byte $A3,$70, $11, $7F,$7F, $A6,$70, $A9,$00, $4F,$4F, $A5,$00 - .byte $70, $77,$77, $71, $A5,$77, $71, $A5,$77, $71 - .byte $A6,$77, $57, $55, $A9,$00, $44,$44, $A4,$00, $A0,$16,$57 - .byte $55, $05, $55, $A8,$00, $04,$04, $B4, $04 - .byte $A3,$00, $55, $05,$05, $55, $05, $B5, $A4,$05 - .byte $D5, $A5,$05, $B5, $A4,$05, $55, $00,$00, $55 - .byte $AA,$00, $BB, $A4,$00, $55, $00,$00, $55, $00 - .byte $08,$08, $00,$00, $08,$08, $A4,$00, $08,$08, $A4,$00, $55 - .byte $00,$00, $55, $AA,$00, $8B, $80, $A3,$00, $55 - .byte $00,$00, $55, $A0,$11,$00, $55, $00,$00, $55, $AA,$00 - .byte $08,$08, $A3,$00, $55, $00,$00, $05, $A0,$11,$00, $55 - .byte $00,$00, $05, $AF,$00, $55, $A0,$14,$00, $55, $A0,$82,$00 + .byte $88, $B8, $A7,$00, $88, $FB, $A7,$00, $2B + .byte $A4,$00, $0B, $BB, $88, $AE,$00, $88, $BB + .byte $0B, $A6,$00, $F8, $FF, $F0, $A5,$00, $44 + .byte $22, $A5,$00, $FF, $08, $80, $AD,$00, $88 + .byte $F0, $A7,$00, $7F, $11, $7F, $A4,$70, $11 + .byte $74, $72, $A3,$70, $11, $7F,$7F, $A6,$70, $A9,$00 + .byte $77, $7F, $B0, $A4,$00, $70, $77,$77, $71 + .byte $A5,$77, $71, $A5,$77, $71, $A6,$77, $57, $55 + .byte $A9,$00, $4F,$4F, $A4,$00, $A0,$16,$57, $55, $05, $55 + .byte $A8,$00, $04, $B4, $04,$04, $A3,$00, $55, $05,$05 + .byte $55, $05, $B5, $A4,$05, $D5, $A5,$05, $B5 + .byte $A4,$05, $55, $00,$00, $55, $A9,$00, $8F, $80 + .byte $A4,$00, $55, $00,$00, $55, $00, $08,$08, $00,$00 + .byte $08,$08, $A4,$00, $08,$08, $A4,$00, $55, $00,$00, $55 + .byte $AF,$00, $55, $00,$00, $55, $A0,$11,$00, $55, $00,$00 + .byte $55, $AF,$00, $55, $A0,$14,$00, $55, $A0,$12,$00, $05 + .byte $A0,$14,$00, $05, $A0,$82,$00 .byte $A1 video_hr_rle: .byte $28 ; ysize=40 .byte $A0,$20,$00, $77, $A6,$57, $77, $A0,$20,$00, $77, $55,$55 @@ -197,15 +196,20 @@ video_hr_rle: .byte $28 ; ysize=40 .byte $EE, $88, $A4,$07, $88, $A6,$07, $55,$55, $A4,$07 .byte $44, $AD,$07, $77,$77, $87, $00, $30, $3D .byte $DD, $8E, $08, $A3,$00, $08, $B8, $08 - .byte $A5,$00, $55,$55, $A4,$00, $44, $AD,$00, $77, $08 - .byte $00, $22,$22, $33, $8D, $08, $A5,$00, $BB - .byte $A6,$00, $55,$55, $A4,$00, $44, $AD,$00, $08, $00 + .byte $A5,$00, $55,$55, $A4,$00, $44, $A9,$00, $B6,$B6, $E0 + .byte $00, $77, $08, $00, $22,$22, $33, $8D + .byte $08, $A5,$00, $BB, $A6,$00, $55,$55, $A4,$00, $44 + .byte $A8,$00, $0B, $BB,$BB, $EE, $00, $08, $00 .byte $10, $12, $22, $83, $08, $A6,$00, $08,$08 - .byte $A4,$00, $A3,$08, $A3,$00, $08,$08, $AE,$00, $40, $41 - .byte $11, $82, $08, $A0,$22,$00, $19, $99, $44 - .byte $11, $88, $A0,$23,$00, $11, $99, $44, $88 - .byte $A0,$24,$00, $11, $99, $88, $A0,$25,$00, $11, $88 - .byte $A0,$26,$00, $88, $A0,$27,$00 + .byte $A4,$00, $A3,$08, $A3,$00, $08,$08, $A9,$00, $60, $6B + .byte $0E, $00,$00, $40, $41, $11, $82, $08 + .byte $A0,$19,$00, $78, $A3,$88, $80, $A3,$66, $00, $19 + .byte $99, $44, $11, $88, $A0,$1A,$00, $88, $87 + .byte $78, $A3,$88, $86, $66, $00, $11, $99 + .byte $44, $88, $A0,$1B,$00, $A3,$88, $87, $78, $8B + .byte $86, $88, $80, $11, $99, $88, $A0,$1C,$00 + .byte $A5,$88, $77, $A3,$87, $11, $88, $A0,$1D,$00, $A5,$88 + .byte $77, $A4,$88, $A0,$1F,$00, $08, $A3,$88, $77, $A3,$88 .byte $A1 collegep_rle: .byte $28 ; ysize=40 .byte $A0,$21,$66, $F6,$F6, $A8,$66, $F6,$F6, $A3,$FF, $F6, $A0,$15,$66 @@ -331,40 +335,41 @@ dining_rle: .byte $28 ; ysize=40 .byte $07, $A0,$79,$00 .byte $A1 metro_rle: .byte $28 ; ysize=40 - .byte $A0,$1F,$66, $A9,$77, $A3,$66, $A4,$F6, $AA,$66, $11, $66 - .byte $16,$16, $66, $76, $A8,$66, $77, $22,$22, $27,$27 - .byte $A4,$77, $66,$66, $6F, $A4,$7F, $77, $A9,$66, $69,$69 - .byte $19,$19, $69, $77, $A8,$66, $77, $A5,$22, $27 - .byte $77,$77, $66,$66, $46, $A0,$1C,$66, $77, $A7,$22, $77 - .byte $66, $46, $44, $46, $A0,$1B,$66, $77, $A7,$22 - .byte $77, $C6, $C4, $84, $C4, $A3,$C6, $76 - .byte $86,$86, $76, $A9,$C6, $AB,$56, $97, $DD, $A6,$22 - .byte $77, $CC,$CC, $C8, $A3,$CC, $77, $80,$80, $77 - .byte $FF, $A0,$14,$CC, $77, $DD, $A6,$22, $77, $A4,$CC - .byte $7C, $77, $80,$80, $77, $FF,$FF, $A0,$14,$0C, $77 - .byte $DD, $A4,$D2, $22,$22, $77, $A3,$CC, $7C, $77 - .byte $08,$08, $78, $F7, $FF, $0F, $A0,$14,$00, $77 - .byte $0D, $DD,$DD, $0D, $A3,$02, $77, $CC,$CC, $7C - .byte $87, $A3,$80, $77, $FF, $0F, $00, $55 - .byte $85, $A0,$14,$00, $F9, $30,$30, $F0, $80,$80, $77 - .byte $CC, $7C, $07, $A3,$08, $77, $FF,$FF, $00,$00 - .byte $55, $88, $08, $A0,$11,$00, $30, $FF, $F0 - .byte $F3,$F3, $FF,$FF, $88, $77, $7C, $87, $A3,$80 - .byte $70, $F7, $1F, $FF, $00,$00, $FF,$FF, $00 - .byte $80, $A0,$10,$00, $0F, $A6,$FF, $88, $77, $07 + .byte $A0,$1F,$66, $A9,$55, $A3,$66, $A4,$F6, $AA,$66, $11, $66 + .byte $16,$16, $66, $76, $A8,$66, $55, $22,$22, $25,$25 + .byte $A4,$55, $66,$66, $6F, $A4,$7F, $77, $A9,$66, $69,$69 + .byte $19,$19, $69, $77, $A8,$66, $55, $A5,$22, $25 + .byte $55,$55, $66,$66, $46, $A0,$1C,$66, $55, $A7,$22, $55 + .byte $66, $46, $44, $46, $A8,$66, $A7,$86, $AC,$66 + .byte $55, $A7,$22, $55, $C6, $C4, $84, $C4 + .byte $A3,$C6, $76, $86,$86, $76, $C6, $55, $15 + .byte $A3,$55, $15, $55, $C6, $AA,$56, $C6, $95 + .byte $DD, $A6,$22, $55, $CC,$CC, $C8, $A3,$CC, $77 + .byte $80,$80, $77, $CC,$CC, $55, $11, $51, $15 + .byte $51, $11, $55, $AC,$CC, $55, $DD, $A6,$22 + .byte $55, $A4,$CC, $7C, $77, $80,$80, $77, $FF,$FF + .byte $0C, $55, $51, $A3,$55, $51, $55, $AC,$0C + .byte $55, $DD, $A4,$D2, $22,$22, $55, $A3,$CC, $7C + .byte $77, $08,$08, $78, $F7, $FF, $0F, $A0,$14,$00 + .byte $55, $0D, $DD,$DD, $0D, $A3,$02, $55, $CC,$CC + .byte $7C, $87, $A3,$80, $77, $FF, $0F, $00 + .byte $55, $85, $A0,$14,$00, $99, $A5,$00, $55, $CC + .byte $7C, $07, $A3,$08, $77, $FF,$FF, $00,$00, $55 + .byte $88, $08, $A0,$13,$00, $F9, $30,$30, $F0, $80,$80 + .byte $55, $7C, $87, $A3,$80, $70, $F7, $1F + .byte $FF, $00,$00, $FF,$FF, $00, $80, $A0,$10,$00, $30 + .byte $FF, $F0, $F3,$F3, $FF,$FF, $88, $55, $07 .byte $A3,$08, $78, $77, $FF, $F1, $FF, $00,$00 - .byte $FF,$FF, $0F, $08, $A4,$00, $DD, $BD, $AC,$00 - .byte $3F,$3F, $0F,$0F, $3F, $38, $77, $A4,$80, $77 - .byte $FF, $1F, $FF, $A3,$00, $1F,$1F, $A6,$00, $DD - .byte $DB, $0B, $A0,$11,$00, $77, $A3,$08, $77, $F7 - .byte $FF, $F1, $0F, $A3,$00, $11,$11, $A6,$00, $22 - .byte $A0,$13,$00, $77, $00,$00, $70, $77, $A3,$FF, $A4,$00 - .byte $11,$11, $A6,$00, $22, $02, $03, $AE,$00, $50 - .byte $55,$55, $77, $88,$88, $77, $FF, $11, $FF - .byte $A5,$00, $A3,$88, $A5,$00, $22, $A0,$11,$00, $05,$05, $77 - .byte $00, $77, $F7, $FF,$FF, $0F, $AD,$00, $82 - .byte $80, $A0,$12,$00, $77, $70, $77, $A3,$FF, $A0,$22,$00 - .byte $77,$77, $A3,$FF, $A0,$23,$00, $77 + .byte $FF,$FF, $0F, $08, $A0,$10,$00, $0F, $A6,$FF, $88 + .byte $55, $A4,$80, $77, $FF, $1F, $FF, $A3,$00 + .byte $1F,$1F, $A0,$14,$00, $3F,$3F, $0F,$0F, $3F, $38, $55 + .byte $A3,$08, $77, $F7, $FF, $F1, $0F, $A3,$00 + .byte $11,$11, $A0,$1A,$00, $55, $00,$00, $70, $77, $A3,$FF + .byte $A4,$00, $11,$11, $A0,$17,$00, $80, $08, $89, $55 + .byte $88,$88, $77, $FF, $11, $FF, $A5,$00, $A3,$88 + .byte $A0,$16,$00, $08, $88,$88, $55, $00, $77, $F7 + .byte $FF,$FF, $0F, $A0,$21,$00, $55, $70, $77, $A3,$FF + .byte $A0,$22,$00, $55, $77, $A3,$FF, $A0,$23,$00, $55 .byte $A1 talbot_rle: .byte $28 ; ysize=40 .byte $22, $66,$66, $77,$77, $FF, $AC,$77, $55, $00 @@ -398,19 +403,17 @@ talbot_rle: .byte $28 ; ysize=40 .byte $FF, $A5,$77, $44, $4C, $C4, $CC, $4C .byte $04, $00, $44, $A0,$18,$00, $88, $00, $FF .byte $F7, $A4,$77, $84,$84, $8C,$8C, $44, $00,$00, $55 - .byte $A7,$00, $D0, $A6,$8D, $D0, $A8,$00, $50, $58 - .byte $00,$00, $FF, $A4,$77, $88, $44,$44, $88, $00 - .byte $80,$80, $05,$05, $A5,$00, $0D,$0D, $A6,$D8, $0D,$0D, $A9,$00 - .byte $5D, $DD, $FF, $A4,$77, $88, $00,$00, $88 - .byte $00, $88, $BB, $B0, $AA,$00, $88,$88, $AC,$00 - .byte $0B, $BB, $0D, $FF, $A3,$77, $FF, $88 - .byte $80,$80, $88, $00, $88, $4B, $A9,$00, $D0,$D0 - .byte $88,$88, $D0,$D0, $AB,$00, $6B, $00, $0F, $FF - .byte $77,$77, $FF, $A5,$00, $88, $44, $04, $0B - .byte $A5,$00, $D0, $DD, $A6,$88, $DD, $D0, $A7,$00 - .byte $0B, $06, $66, $00,$00, $FF, $77,$77, $FF - .byte $A6,$00, $22, $A9,$00, $A6,$0D, $AB,$00, $22, $00,$00 - .byte $FF, $77, $FF,$FF, $A6,$00, $82, $80, $A0,$18,$00 - .byte $50, $52, $00,$00, $0F, $F7, $FF, $0F - .byte $A0,$25,$00, $FF,$FF, $A0,$26,$00, $FF + .byte $A0,$17,$00, $50, $58, $00,$00, $FF, $A4,$77, $88 + .byte $44,$44, $88, $00, $80,$80, $05,$05, $A0,$18,$00, $5D + .byte $DD, $FF, $A4,$77, $88, $00,$00, $88, $00 + .byte $88, $BB, $B0, $A0,$18,$00, $0B, $BB, $0D + .byte $FF, $A3,$77, $FF, $88, $80,$80, $88, $00 + .byte $88, $4B, $A9,$00, $D0,$D0, $80,$80, $D0,$D0, $AB,$00 + .byte $6B, $00, $0F, $FF, $77,$77, $FF, $A5,$00 + .byte $88, $44, $04, $0B, $A5,$00, $D0, $DD + .byte $A6,$88, $DD, $D0, $A7,$00, $0B, $06, $66 + .byte $00,$00, $FF, $77,$77, $FF, $A6,$00, $22, $A9,$00 + .byte $A6,$0D, $AB,$00, $22, $00,$00, $FF, $77, $FF,$FF + .byte $A6,$00, $82, $80, $A0,$18,$00, $50, $52, $00,$00 + .byte $0F, $F7, $FF, $0F, $A0,$25,$00, $FF,$FF, $A0,$26,$00, $FF .byte $A1