diff options
| -rw-r--r-- | engine/bank3c.asm | 23 | ||||
| -rwxr-xr-x | engine/pikachu_pic_animation.asm | 316 | ||||
| -rw-r--r-- | macros.asm | 8 | ||||
| -rwxr-xr-x | main.asm | 121 |
4 files changed, 298 insertions, 170 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm index d61fd8ed..2d10b45c 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -321,7 +321,28 @@ Func_f0a82: ; f0a82 callab Func_fcba1 ret - dr $f0abf, $f220e +Pic_f0abf: ; f0abf (3c:4abf) + dr $f0abf, $f0b64 +GFX_f0b64: ; f0b64 (3c:4b64) + dr $f0b64, $f0cf4 +Pic_f0cf4: ; f0cf4 (3c:4cf4) + dr $f0cf4, $f0d82 +GFX_f0d82: ; f0d82 (3c:4d82) + dr $f0d82, $f0f12 + +Func_f0f12: + ld hl, NurseChanseyText + call PrintText + ld a, CHANSEY + call PlayCry + call WaitForSoundToFinish + ret + +NurseChanseyText: + TX_FAR _NurseChanseyText + db "@" + + dr $f0f26, $f220e INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" diff --git a/engine/pikachu_pic_animation.asm b/engine/pikachu_pic_animation.asm index e5099a04..d95eb538 100755 --- a/engine/pikachu_pic_animation.asm +++ b/engine/pikachu_pic_animation.asm @@ -2688,7 +2688,7 @@ Jumptable_fe071: dw PikaPicAnimCommand_nop7 ; 07, 0 params dw PikaPicAnimCommand_nop8 ; 08, 0 params dw PikaPicAnimCommand_jump ; 09, 1 dw param - dw PikaPicAnimCommand_setdelay ; 0a, 1 dw param + dw PikaPicAnimCommand_setduration ; 0a, 1 dw param dw PikaPicAnimCommand_cry ; 0b, 1 param dw PikaPicAnimCommand_thunderbolt ; 0c, 0 params dw PikaPicAnimCommand_waitbgmap ; 0d, 0 params (ret) @@ -2707,7 +2707,7 @@ PikaPicAnimCommand_ret: Func_fe09b: ret -PikaPicAnimCommand_setdelay: +PikaPicAnimCommand_setduration: call GetPikaPicAnimByte ld [wPikaPicAnimTimer], a call GetPikaPicAnimByte @@ -3019,9 +3019,9 @@ Data_fe242: db $ff Data_fe26b: ; fe26b (3f:626b) - pikapic_loadgfx $1 - pikapic_loadgfx $f - pikapic_loadgfx $3e + pikapic_loadgfx Pic_e4000 + pikapic_loadgfx Pic_e49d1 + pikapic_loadgfx PikachuSprite pikapic_object $1, $80, $0, $0 pikapic_object $2, $b2, $5, $5 pikapic_object $3, $b6, $5, $5 @@ -3032,9 +3032,9 @@ Data_fe286: ; fe286 (3f:6286) pikapic_jump Data_fe286 Data_fe28a: ; fe28a (3f:628a) - pikapic_setdelay 40 - pikapic_loadgfx $1 - pikapic_loadgfx $2 + pikapic_setduration 40 + pikapic_loadgfx Pic_e4000 + pikapic_loadgfx GFX_e40cc pikapic_object $4, $80, $0, $0 pikapic_object $6, $99, $0, $0 pikapic_waitbgmap @@ -3044,9 +3044,9 @@ Data_fe2a0: ; fe2a0 (3f:62a0) pikapic_jump Data_fe2a0 Data_fe2a4: ; fe2a4 (3f:62a4) - pikapic_setdelay 44 - pikapic_loadgfx $3 - pikapic_loadgfx $4 + pikapic_setduration 44 + pikapic_loadgfx Pic_e411c + pikapic_loadgfx GFX_e41d2 pikapic_object $4, $80, $0, $0 pikapic_object $7, $99, $0, $0 pikapic_waitbgmap @@ -3056,9 +3056,9 @@ Data_fe2ba: ; fe2ba (3f:62ba) pikapic_jump Data_fe2ba Data_fe2be: ; fe2be (3f:62be) - pikapic_setdelay 80 - pikapic_loadgfx $5 - pikapic_loadgfx $6 + pikapic_setduration 80 + pikapic_loadgfx Pic_e4272 + pikapic_loadgfx GFX_e4323 pikapic_object $4, $80, $0, $0 pikapic_object $8, $99, $0, $0 pikapic_waitbgmap @@ -3068,9 +3068,9 @@ Data_fe2d4: ; fe2d4 (3f:62d4) pikapic_jump Data_fe2d4 Data_fe2d8: ; fe2d8 (3f:62d8) - pikapic_setdelay 70 - pikapic_loadgfx $7 - pikapic_loadgfx $8 + pikapic_setduration 70 + pikapic_loadgfx Pic_e4383 + pikapic_loadgfx GFX_e444b pikapic_object $4, $80, $0, $0 pikapic_object $9, $99, $0, $0 pikapic_waitbgmap @@ -3080,9 +3080,9 @@ Data_fe2ee: ; fe2ee (3f:62ee) pikapic_jump Data_fe2ee Data_fe2f2: ; fe2f2 (3f:62f2) - pikapic_setdelay 32 - pikapic_loadgfx $9 - pikapic_loadgfx $a + pikapic_setduration 32 + pikapic_loadgfx Pic_e458b + pikapic_loadgfx GFX_e463b pikapic_object $4, $80, $0, $0 pikapic_object $a, $99, $0, $0 pikapic_waitbgmap @@ -3092,9 +3092,9 @@ Data_fe308: ; fe308 (3f:6308) pikapic_jump Data_fe308 Data_fe30c: ; fe30c (3f:630c) - pikapic_setdelay 50 - pikapic_loadgfx $b - pikapic_loadgfx $c + pikapic_setduration 50 + pikapic_loadgfx Pic_e467b + pikapic_loadgfx GFX_e472e pikapic_object $4, $80, $0, $0 pikapic_object $b, $99, $0, $0 pikapic_waitbgmap @@ -3104,9 +3104,9 @@ Data_fe322: ; fe322 (3f:6322) pikapic_jump Data_fe322 Data_fe326: ; fe326 (3f:6326) - pikapic_setdelay 58 - pikapic_loadgfx $d - pikapic_loadgfx $e + pikapic_setduration 58 + pikapic_loadgfx Pic_e476e + pikapic_loadgfx GFX_e4841 pikapic_object $4, $80, $0, $0 pikapic_object $c, $99, $0, $0 pikapic_waitbgmap @@ -3116,9 +3116,9 @@ Data_fe33c: ; fe33c (3f:633c) pikapic_jump Data_fe33c Data_fe340: ; fe340 (3f:6340) - pikapic_setdelay 44 - pikapic_loadgfx $f - pikapic_loadgfx $10 + pikapic_setduration 44 + pikapic_loadgfx Pic_e49d1 + pikapic_loadgfx GFX_e4a99 pikapic_object $4, $80, $0, $0 pikapic_object $d, $99, $0, $0 pikapic_waitbgmap @@ -3128,9 +3128,9 @@ Data_fe356: ; fe356 (3f:6356) pikapic_jump Data_fe356 Data_fe35a: ; fe35a (3f:635a) - pikapic_setdelay 56 - pikapic_loadgfx $11 - pikapic_loadgfx $12 + pikapic_setduration 56 + pikapic_loadgfx Pic_e4b39 + pikapic_loadgfx GFX_e4bde pikapic_object $4, $80, $0, $0 pikapic_object $e, $99, $0, $0 pikapic_waitbgmap @@ -3140,10 +3140,10 @@ Data_fe370: ; fe370 (3f:6370) pikapic_jump Data_fe370 Data_fe374: ; fe374 (3f:6374) - pikapic_setdelay 56 - pikapic_loadgfx $13 - pikapic_loadgfx $14 - pikapic_loadgfx $15 + pikapic_setduration 56 + pikapic_loadgfx Pic_e4c3e + pikapic_loadgfx GFX_e4ce0 + pikapic_loadgfx GFX_e4e70 pikapic_object $4, $80, $0, $0 pikapic_object $10, $99, $0, $0 pikapic_waitbgmap @@ -3153,9 +3153,9 @@ Data_fe38c: ; fe38c (3f:638c) pikapic_jump Data_fe38c Data_fe390: ; fe390 (3f:6390) - pikapic_setdelay 100 - pikapic_loadgfx $16 - pikapic_loadgfx $17 + pikapic_setduration 100 + pikapic_loadgfx Pic_e5000 + pikapic_loadgfx GFX_e50af pikapic_object $4, $80, $0, $0 pikapic_object $11, $99, $0, $0 pikapic_waitbgmap @@ -3165,9 +3165,9 @@ Data_fe3a6: ; fe3a6 (3f:63a6) pikapic_jump Data_fe3a6 Data_fe3aa: ; fe3aa (3f:63aa) - pikapic_setdelay 50 - pikapic_loadgfx $18 - pikapic_loadgfx $19 + pikapic_setduration 50 + pikapic_loadgfx Pic_e523f + pikapic_loadgfx GFX_e52fe pikapic_object $4, $80, $0, $0 pikapic_object $12, $99, $0, $0 pikapic_waitbgmap @@ -3177,9 +3177,9 @@ Data_fe3c0: ; fe3c0 (3f:63c0) pikapic_jump Data_fe3c0 Data_fe3c4: ; fe3c4 (3f:63c4) - pikapic_setdelay 50 - pikapic_loadgfx $1a - pikapic_loadgfx $1b + pikapic_setduration 50 + pikapic_loadgfx Pic_e548e + pikapic_loadgfx GFX_e5541 pikapic_object $4, $80, $0, $0 pikapic_object $13, $99, $0, $0 pikapic_waitbgmap @@ -3189,9 +3189,9 @@ Data_fe3da: ; fe3da (3f:63da) pikapic_jump Data_fe3da Data_fe3de: ; fe3de (3f:63de) - pikapic_setdelay 40 - pikapic_loadgfx $1c - pikapic_loadgfx $1d + pikapic_setduration 40 + pikapic_loadgfx Pic_e56d1 + pikapic_loadgfx GFX_e5794 pikapic_object $4, $80, $0, $0 pikapic_object $14, $99, $0, $0 pikapic_waitbgmap @@ -3201,9 +3201,9 @@ Data_fe3f4: ; fe3f4 (3f:63f4) pikapic_jump Data_fe3f4 Data_fe3f8: ; fe3f8 (3f:63f8) - pikapic_setdelay 50 - pikapic_loadgfx $1e - pikapic_loadgfx $1f + pikapic_setduration 50 + pikapic_loadgfx Pic_e5924 + pikapic_loadgfx GFX_e59ed pikapic_object $4, $80, $0, $0 pikapic_object $15, $99, $0, $0 pikapic_waitbgmap @@ -3213,9 +3213,9 @@ Data_fe40e: ; fe40e (3f:640e) pikapic_jump Data_fe40e Data_fe412: ; fe412 (3f:6412) - pikapic_setdelay 32 - pikapic_loadgfx $20 - pikapic_loadgfx $21 + pikapic_setduration 32 + pikapic_loadgfx Pic_e5b7d + pikapic_loadgfx GFX_e5c4d pikapic_object $4, $80, $0, $0 pikapic_object $16, $99, $0, $0 pikapic_waitbgmap @@ -3225,9 +3225,9 @@ Data_fe428: ; fe428 (3f:6428) pikapic_jump Data_fe428 Data_fe42c: ; fe42c (3f:642c) - pikapic_setdelay 100 - pikapic_loadgfx $22 - pikapic_loadgfx $23 + pikapic_setduration 100 + pikapic_loadgfx Pic_e5ddd + pikapic_loadgfx GFX_e5e90 pikapic_object $4, $80, $0, $0 pikapic_object $17, $99, $0, $0 pikapic_waitbgmap @@ -3237,9 +3237,9 @@ Data_fe442: ; fe442 (3f:6442) pikapic_jump Data_fe442 Data_fe446: ; fe446 (3f:6446) - pikapic_setdelay 32 - pikapic_loadgfx $24 - pikapic_loadgfx $25 + pikapic_setduration 32 + pikapic_loadgfx GFX_e6020 + pikapic_loadgfx GFX_e61b0 pikapic_object $5, $80, $0, $0 pikapic_object $18, $99, $0, $0 pikapic_waitbgmap @@ -3249,9 +3249,9 @@ Data_fe45c: ; fe45c (3f:645c) pikapic_jump Data_fe45c Data_fe460: ; fe460 (3f:6460) - pikapic_setdelay 44 - pikapic_loadgfx $26 - pikapic_loadgfx $27 + pikapic_setduration 44 + pikapic_loadgfx Pic_e6340 + pikapic_loadgfx GFX_e63f7 pikapic_object $4, $80, $0, $0 pikapic_object $19, $99, $0, $0 pikapic_waitbgmap @@ -3261,9 +3261,9 @@ Data_fe476: ; fe476 (3f:6476) pikapic_jump Data_fe476 Data_fe47a: ; fe47a (3f:647a) - pikapic_setdelay 50 - pikapic_loadgfx $28 - pikapic_loadgfx $29 + pikapic_setduration 50 + pikapic_loadgfx Pic_e6587 + pikapic_loadgfx GFX_e6646 pikapic_object $4, $80, $0, $0 pikapic_object $1a, $99, $0, $0 pikapic_waitbgmap @@ -3273,12 +3273,12 @@ Data_fe490: ; fe490 (3f:6490) pikapic_jump Data_fe490 Data_fe494: ; fe494 (3f:6494) - pikapic_setdelay 40 - pikapic_loadgfx $2a - pikapic_loadgfx $2b - pikapic_loadgfx $2c - pikapic_loadgfx $2d - pikapic_loadgfx $2e + pikapic_setduration 40 + pikapic_loadgfx Pic_e67d6 + pikapic_loadgfx GFX_e682f + pikapic_loadgfx GFX_e69bf + pikapic_loadgfx GFX_e6b4f + pikapic_loadgfx GFX_e6cdf pikapic_object $4, $80, $0, $0 pikapic_object $1b, $99, $0, $0 pikapic_waitbgmap @@ -3288,9 +3288,9 @@ Data_fe4b0: ; fe4b0 (3f:64b0) pikapic_jump Data_fe4b0 Data_fe4b4: ; fe4b4 (3f:64b4) - pikapic_setdelay 40 - pikapic_loadgfx $2f - pikapic_loadgfx $30 + pikapic_setduration 40 + pikapic_loadgfx GFX_e6e6f + pikapic_loadgfx GFX_e6fff pikapic_object $5, $80, $0, $0 pikapic_object $1c, $99, $0, $0 pikapic_waitbgmap @@ -3300,9 +3300,9 @@ Data_fe4ca: ; fe4ca (3f:64ca) pikapic_jump Data_fe4ca Data_fe4ce: ; fe4ce (3f:64ce) - pikapic_setdelay 70 - pikapic_loadgfx $31 - pikapic_loadgfx $32 + pikapic_setduration 70 + pikapic_loadgfx GFX_e718f + pikapic_loadgfx GFX_e731f pikapic_object $5, $80, $0, $0 pikapic_object $1d, $99, $0, $0 pikapic_waitbgmap @@ -3312,9 +3312,9 @@ Data_fe4e4: ; fe4e4 (3f:64e4) pikapic_jump Data_fe4e4 Data_fe4e8: ; fe4e8 (3f:64e8) - pikapic_setdelay 60 - pikapic_loadgfx $33 - pikapic_loadgfx $34 + pikapic_setduration 60 + pikapic_loadgfx GFX_e74af + pikapic_loadgfx GFX_e763f pikapic_object $5, $80, $0, $0 pikapic_object $1e, $99, $0, $0 pikapic_waitbgmap @@ -3324,10 +3324,10 @@ Data_fe4fe: ; fe4fe (3f:64fe) pikapic_jump Data_fe4fe Data_fe502: ; fe502 (3f:6502) - pikapic_setdelay 50 - pikapic_loadgfx $35 - pikapic_loadgfx $36 - pikapic_loadgfx $37 + pikapic_setduration 50 + pikapic_loadgfx Pic_e77cf + pikapic_loadgfx GFX_e7863 + pikapic_loadgfx GFX_e79f3 pikapic_object $4, $80, $0, $0 pikapic_object $1f, $99, $0, $0 pikapic_waitbgmap @@ -3340,11 +3340,11 @@ Data_fe502: ; fe502 (3f:6502) Data_fe51f: ; fe51f (3f:651f) pikapic_waitbgmap Data_fe520: ; fe520 (3f:6520) - pikapic_setdelay 100 - pikapic_loadgfx $16 - pikapic_loadgfx $17 - pikapic_loadgfx $38 - pikapic_loadgfx $39 + pikapic_setduration 100 + pikapic_loadgfx Pic_e5000 + pikapic_loadgfx GFX_e50af + pikapic_loadgfx GFX_e7b83 + pikapic_loadgfx GFX_e7d13 pikapic_object $4, $80, $0, $0 pikapic_object $20, $99, $0, $0 pikapic_waitbgmap @@ -3354,9 +3354,9 @@ Data_fe53a: ; fe53a (3f:653a) pikapic_jump Data_fe53a Data_fe53e: ; fe53e (3f:653e) - pikapic_setdelay 30 - pikapic_loadgfx $3a - pikapic_loadgfx $3b + pikapic_setduration 30 + pikapic_loadgfx Pic_f0abf + pikapic_loadgfx GFX_f0b64 pikapic_object $4, $80, $0, $0 pikapic_object $21, $99, $0, $0 pikapic_waitbgmap @@ -3366,9 +3366,9 @@ Data_fe554: ; fe554 (3f:6554) pikapic_jump Data_fe554 Data_fe558: ; fe558 (3f:6558) - pikapic_setdelay 64 - pikapic_loadgfx $3c - pikapic_loadgfx $3d + pikapic_setduration 64 + pikapic_loadgfx Pic_f0cf4 + pikapic_loadgfx GFX_f0d82 pikapic_object $4, $80, $0, $0 pikapic_object $22, $99, $0, $0 pikapic_waitbgmap @@ -3385,65 +3385,65 @@ pikapicanimgfx: MACRO endm dbbw $01, $39, $0000 - pikapicanimgfx $ff, Pic_e4000 - pikapicanimgfx 5, GFX_e40cc - dbbw $ff, $39, $411c - dbbw $0a, $39, $41d2 - dbbw $ff, $39, $4272 - dbbw $06, $39, $4323 - dbbw $ff, $39, $4383 - dbbw $14, $39, $444b - dbbw $ff, $39, $458b - dbbw $04, $39, $463b - dbbw $ff, $39, $467b - dbbw $04, $39, $472e - dbbw $ff, $39, $476e - dbbw $19, $39, $4841 - dbbw $ff, $39, $49d1 - dbbw $0a, $39, $4a99 - dbbw $ff, $39, $4b39 - dbbw $06, $39, $4bde - dbbw $ff, $39, $4c3e - dbbw $19, $39, $4ce0 - dbbw $19, $39, $4e70 - dbbw $ff, $39, $5000 - dbbw $19, $39, $50af - dbbw $ff, $39, $523f - dbbw $19, $39, $52fe - dbbw $ff, $39, $548e - dbbw $19, $39, $5541 - dbbw $ff, $39, $56d1 - dbbw $19, $39, $5794 - dbbw $ff, $39, $5924 - dbbw $19, $39, $59ed - dbbw $ff, $39, $5b7d - dbbw $19, $39, $5c4d - dbbw $ff, $39, $5ddd - dbbw $19, $39, $5e90 - dbbw $19, $39, $6020 - dbbw $19, $39, $61b0 - dbbw $ff, $39, $6340 - dbbw $19, $39, $63f7 - dbbw $ff, $39, $6587 - dbbw $19, $39, $6646 - dbbw $ff, $39, $67d6 - dbbw $19, $39, $682f - dbbw $19, $39, $69bf - dbbw $19, $39, $6b4f - dbbw $19, $39, $6cdf - dbbw $19, $39, $6e6f - dbbw $19, $39, $6fff - dbbw $19, $39, $718f - dbbw $19, $39, $731f - dbbw $19, $39, $74af - dbbw $19, $39, $763f - dbbw $ff, $39, $77cf - dbbw $19, $39, $7863 - dbbw $19, $39, $79f3 - dbbw $19, $39, $7b83 - dbbw $19, $39, $7d13 - dbbw $ff, $3c, $4abf - dbbw $19, $3c, $4b64 - dbbw $ff, $3c, $4cf4 - dbbw $19, $3c, $4d82 - dbbw $18, BANK(PikachuSprite), PikachuSprite + pikapicanimgfx -1, Pic_e4000 ; 01 + pikapicanimgfx 5, GFX_e40cc ; 02 + pikapicanimgfx -1, Pic_e411c ; 03 + pikapicanimgfx 10, GFX_e41d2 ; 04 + pikapicanimgfx -1, Pic_e4272 ; 05 + pikapicanimgfx 6, GFX_e4323 ; 06 + pikapicanimgfx -1, Pic_e4383 ; 07 + pikapicanimgfx 20, GFX_e444b ; 08 + pikapicanimgfx -1, Pic_e458b ; 09 + pikapicanimgfx 4, GFX_e463b ; 0a + pikapicanimgfx -1, Pic_e467b ; 0b + pikapicanimgfx 4, GFX_e472e ; 0c + pikapicanimgfx -1, Pic_e476e ; 0d + pikapicanimgfx 25, GFX_e4841 ; 0e + pikapicanimgfx -1, Pic_e49d1 ; 0f + pikapicanimgfx 10, GFX_e4a99 ; 00 + pikapicanimgfx -1, Pic_e4b39 ; 11 + pikapicanimgfx 6, GFX_e4bde ; 12 + pikapicanimgfx -1, Pic_e4c3e ; 13 + pikapicanimgfx 25, GFX_e4ce0 ; 14 + pikapicanimgfx 25, GFX_e4e70 ; 15 + pikapicanimgfx -1, Pic_e5000 ; 16 + pikapicanimgfx 25, GFX_e50af ; 17 + pikapicanimgfx -1, Pic_e523f ; 18 + pikapicanimgfx 25, GFX_e52fe ; 19 + pikapicanimgfx -1, Pic_e548e ; 1a + pikapicanimgfx 25, GFX_e5541 ; 1b + pikapicanimgfx -1, Pic_e56d1 ; 1c + pikapicanimgfx 25, GFX_e5794 ; 1d + pikapicanimgfx -1, Pic_e5924 ; 1e + pikapicanimgfx 25, GFX_e59ed ; 1f + pikapicanimgfx -1, Pic_e5b7d ; 20 + pikapicanimgfx 25, GFX_e5c4d ; 21 + pikapicanimgfx -1, Pic_e5ddd ; 22 + pikapicanimgfx 25, GFX_e5e90 ; 23 + pikapicanimgfx 25, GFX_e6020 ; 24 + pikapicanimgfx 25, GFX_e61b0 ; 25 + pikapicanimgfx -1, Pic_e6340 ; 26 + pikapicanimgfx 25, GFX_e63f7 ; 27 + pikapicanimgfx -1, Pic_e6587 ; 28 + pikapicanimgfx 25, GFX_e6646 ; 29 + pikapicanimgfx -1, Pic_e67d6 ; 2a + pikapicanimgfx 25, GFX_e682f ; 2b + pikapicanimgfx 25, GFX_e69bf ; 2c + pikapicanimgfx 25, GFX_e6b4f ; 2d + pikapicanimgfx 25, GFX_e6cdf ; 2e + pikapicanimgfx 25, GFX_e6e6f ; 2f + pikapicanimgfx 25, GFX_e6fff ; 30 + pikapicanimgfx 25, GFX_e718f ; 31 + pikapicanimgfx 25, GFX_e731f ; 32 + pikapicanimgfx 25, GFX_e74af ; 33 + pikapicanimgfx 25, GFX_e763f ; 34 + pikapicanimgfx -1, Pic_e77cf ; 35 + pikapicanimgfx 25, GFX_e7863 ; 36 + pikapicanimgfx 25, GFX_e79f3 ; 37 + pikapicanimgfx 25, GFX_e7b83 ; 38 + pikapicanimgfx 25, GFX_e7d13 ; 39 + pikapicanimgfx -1, Pic_f0abf ; 3a + pikapicanimgfx 25, GFX_f0b64 ; 3b + pikapicanimgfx -1, Pic_f0cf4 ; 3c + pikapicanimgfx 25, GFX_f0d82 ; 3d + pikapicanimgfx 24, PikachuSprite ; 3e @@ -823,7 +823,7 @@ pikapic_writebyte: macro enum pikapic_loadgfx_command pikapic_loadgfx: macro - db pikapic_loadgfx_command, \1 ; _id - PikaPicAnimGFXHeaders) / 4 + db pikapic_loadgfx_command, (\1_id - PikaPicAnimGFXHeaders) / 4 endm enum pikapic_object_command @@ -863,9 +863,9 @@ pikapic_jump: macro ; 9 dbw pikapic_jump_command, \1 endm - enum pikapic_setdelay_command -pikapic_setdelay: macro ; a - dbw pikapic_setdelay_command, \1 + enum pikapic_setduration_command +pikapic_setduration: macro ; a + dbw pikapic_setduration_command, \1 endm enum pikapic_cry_command @@ -879,13 +879,120 @@ SECTION "bank30",ROMX,BANK[$30] dr $c0000,$c4000 SECTION "bank39",ROMX,BANK[$39] -Pic_e4000: - dr $e4000,$e40cc -GFX_e40cc: - dr $e40cc,$e411c -Pic_e411c: - dr $e411c,$e7ea3 - +Pic_e4000: ; e4000 + dr $e4000, $e40cc +GFX_e40cc: ; e40cc + dr $e40cc, $e411c +Pic_e411c: ; e411c + dr $e411c, $e41d2 +GFX_e41d2: ; e41d2 + dr $e41d2, $e4272 +Pic_e4272: ; e4272 + dr $e4272, $e4323 +GFX_e4323: ; e4323 + dr $e4323, $e4383 +Pic_e4383: ; e4383 + dr $e4383, $e444b +GFX_e444b: ; e444b + dr $e444b, $e458b +Pic_e458b: ; e458b + dr $e458b, $e463b +GFX_e463b: ; e463b + dr $e463b, $e467b +Pic_e467b: ; e467b + dr $e467b, $e472e +GFX_e472e: ; e472e + dr $e472e, $e476e +Pic_e476e: ; e476e + dr $e476e, $e4841 +GFX_e4841: ; e4841 + dr $e4841, $e49d1 +Pic_e49d1: ; e49d1 + dr $e49d1, $e4a99 +GFX_e4a99: ; e4a99 + dr $e4a99, $e4b39 +Pic_e4b39: ; e4b39 + dr $e4b39, $e4bde +GFX_e4bde: ; e4bde + dr $e4bde, $e4c3e +Pic_e4c3e: ; e4c3e + dr $e4c3e, $e4ce0 +GFX_e4ce0: ; e4ce0 + dr $e4ce0, $e4e70 +GFX_e4e70: ; e4e70 + dr $e4e70, $e5000 +Pic_e5000: ; e5000 + dr $e5000, $e50af +GFX_e50af: ; e50af + dr $e50af, $e523f +Pic_e523f: ; e523f + dr $e523f, $e52fe +GFX_e52fe: ; e52fe + dr $e52fe, $e548e +Pic_e548e: ; e548e + dr $e548e, $e5541 +GFX_e5541: ; e5541 + dr $e5541, $e56d1 +Pic_e56d1: ; e56d1 + dr $e56d1, $e5794 +GFX_e5794: ; e5794 + dr $e5794, $e5924 +Pic_e5924: ; e5924 + dr $e5924, $e59ed +GFX_e59ed: ; e59ed + dr $e59ed, $e5b7d +Pic_e5b7d: ; e5b7d + dr $e5b7d, $e5c4d +GFX_e5c4d: ; e5c4d + dr $e5c4d, $e5ddd +Pic_e5ddd: ; e5ddd + dr $e5ddd, $e5e90 +GFX_e5e90: ; e5e90 + dr $e5e90, $e6020 +GFX_e6020: ; e6020 + dr $e6020, $e61b0 +GFX_e61b0: ; e61b0 + dr $e61b0, $e6340 +Pic_e6340: ; e6340 + dr $e6340, $e63f7 +GFX_e63f7: ; e63f7 + dr $e63f7, $e6587 +Pic_e6587: ; e6587 + dr $e6587, $e6646 +GFX_e6646: ; e6646 + dr $e6646, $e67d6 +Pic_e67d6: ; e67d6 + dr $e67d6, $e682f +GFX_e682f: ; e682f + dr $e682f, $e69bf +GFX_e69bf: ; e69bf + dr $e69bf, $e6b4f +GFX_e6b4f: ; e6b4f + dr $e6b4f, $e6cdf +GFX_e6cdf: ; e6cdf + dr $e6cdf, $e6e6f +GFX_e6e6f: ; e6e6f + dr $e6e6f, $e6fff +GFX_e6fff: ; e6fff + dr $e6fff, $e718f +GFX_e718f: ; e718f + dr $e718f, $e731f +GFX_e731f: ; e731f + dr $e731f, $e74af +GFX_e74af: ; e74af + dr $e74af, $e763f +GFX_e763f: ; e763f + dr $e763f, $e77cf +Pic_e77cf: ; e77cf + dr $e77cf, $e7863 +GFX_e7863: ; e7863 + dr $e7863, $e79f3 +GFX_e79f3: ; e79f3 + dr $e79f3, $e7b83 +GFX_e7b83: ; e7b83 + dr $e7b83, $e7d13 +GFX_e7d13: ; e7d13 + dr $e7d13, $e7ea3 SECTION "bank3A",ROMX,BANK[$3A] INCLUDE "text/monster_names.asm" |