commit 844243f842f4379fa166f96e42b6821c4b2a55b5 Author: yenatch Date: Wed Dec 7 22:41:45 2016 -0500 Add an attack test. diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 8492c24..3dbb52e 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -287,6 +287,8 @@ const_value SET const_value + -1 const ANIM_SHAKE ; $114 const ANIM_HIT_CONFUSION ; $115 +NUM_ANIMS = const_value + -1 + ; wNumHits uses offsets from ANIM_MISS const_def const BATTLEANIM_NONE diff --git a/engine/color.asm b/engine/color.asm index 3bc431d..187c6c6 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -570,10 +570,10 @@ LoadPalette_White_Col1_Col2_Black: ld a, $5 ld [rSVBK], a - ld a, $7fff % $100 + ld a, $3e0 % $100 ld [de], a inc de - ld a, $7fff / $100 + ld a, $3e0 / $100 ld [de], a inc de @@ -585,9 +585,10 @@ LoadPalette_White_Col1_Col2_Black: dec c jr nz, .loop - xor a + ld a, $7c1f % $100 ld [de], a inc de + ld a, $7c1f / $100 ld [de], a inc de @@ -2021,7 +2022,7 @@ Palette_b309: ; b309 mobile RGB 00, 00, 00 Palette_b311: ; b311 not mobile - RGB 31, 31, 31 + RGB 00, 31, 00 RGB 17, 19, 31 RGB 14, 16, 31 RGB 00, 00, 00 diff --git a/engine/main_menu.asm b/engine/main_menu.asm index c3b30d2..7ee1f3d 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -52,6 +52,7 @@ MainMenu: ; 49cdc db "MYSTERY GIFT@" db "MOBILE@" db "MOBILE STUDIUM@" + db "ATTACK TEST@" .Jumptable: ; 0x49d60 @@ -61,6 +62,7 @@ MainMenu: ; 49cdc dw MainMenu_MysteryGift dw MainMenu_Mobile dw MainMenu_MobileStudium + dw MainMenu_AttackTest ; 0x49d6c CONTINUE EQU 0 @@ -69,17 +71,20 @@ OPTION EQU 2 MYSTERY_GIFT EQU 3 MOBILE EQU 4 MOBILE_STUDIUM EQU 5 +ATTACK_TEST EQU 6 MainMenuItems: NewGameMenu: ; 0x49d6c - db 2 + db 3 + db ATTACK_TEST db NEW_GAME db OPTION db -1 ContinueMenu: ; 0x49d70 - db 3 + db 4 + db ATTACK_TEST db CONTINUE db NEW_GAME db OPTION @@ -122,7 +127,8 @@ MysteryMobileStudiumMenu: ; 0x49d89 db -1 MysteryMenu: ; 0x49d91 - db 4 + db 5 + db ATTACK_TEST db CONTINUE db NEW_GAME db OPTION @@ -359,3 +365,48 @@ MainMenu_MysteryGift: ; 49ef5 callba MysteryGift ret ; 49efc + +MainMenu_AttackTest: + ld de, MUSIC_NONE + call PlayMusic + + ld de, EmptyVSection + ld hl, VTiles2 tile 0 + lb bc, BANK(EmptyVSection), $80 + call Get1bpp + + ld de, EmptyVSection + ld hl, VTiles1 tile 0 + lb bc, BANK(EmptyVSection), $80 + call Get1bpp + + ld de, EmptyVSection + ld hl, VTiles0 tile 0 + lb bc, BANK(EmptyVSection), $80 + call Get1bpp + + callba ClearBattleRAM + + ld de, 0 +.loop + ld a, e + ld [FXAnimID], a + ld a, d + ld [FXAnimID + 1], a + xor a + ld [wNumHits], a + push de + callba PlayBattleAnim + pop de + inc de + ld a, d + cp NUM_ANIMS / $100 + jr c, .loop + ld a, e + cp NUM_ANIMS % $100 + jr c, .loop + ret + +SECTION "EmptyVSection", ROMX +EmptyVSection: + ds ($80 tiles) / 2 diff --git a/gfx/battle/minimize.2bpp b/gfx/battle/minimize.2bpp deleted file mode 100644 index 66b554d..0000000 --- a/gfx/battle/minimize.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -00000000 00 00 00 00 18 18 3c 3c 7e 7e 3c 3c 24 24 00 00 |......<<~~<<$$..| -00000010 diff --git a/gfx/battle/minimize.png b/gfx/battle/minimize.png new file mode 100755 index 0000000..c7fec6c --- /dev/null +++ b/gfx/battle/minimize.png @@ -0,0 +1,10 @@ +00000000 89 50 4e 47 0d 0a 1a 0a 00 00 00 0d 49 48 44 52 |.PNG........IHDR| +00000010 00 00 00 08 00 00 00 08 08 06 00 00 00 c4 0f be |................| +00000020 8b 00 00 00 01 73 52 47 42 00 ae ce 1c e9 00 00 |.....sRGB.......| +00000030 00 04 67 41 4d 41 00 00 b1 8f 0b fc 61 05 00 00 |..gAMA......a...| +00000040 00 09 70 48 59 73 00 00 0e c4 00 00 0e c4 01 95 |..pHYs..........| +00000050 2b 0e 1b 00 00 00 17 49 44 41 54 28 53 63 fc 0f |+......IDAT(Sc..| +00000060 04 0c 78 00 13 94 c6 09 86 83 02 06 06 00 1b 6e |..x............n| +00000070 04 0c 73 4c 0f a6 00 00 00 00 49 45 4e 44 ae 42 |..sL......IEND.B| +00000080 60 82 |`.| +00000082 diff --git a/gfx/overworld/075.2bpp b/gfx/overworld/075.2bpp deleted file mode 100644 index 542d6ef..0000000 --- a/gfx/overworld/075.2bpp +++ /dev/null @@ -1,25 +0,0 @@ -00000000 01 01 7f 7e 7b 4e 30 2f 14 1f 27 3e 20 3f 1d 1e |...~{N0/..'> ?..| -00000010 80 80 fe 7e de 72 0c f4 28 f8 e4 7c 04 fc b8 78 |...~.r..(..|...x| -00000020 2f 3b 57 7c 93 ff 77 78 1f 18 2f 3c 37 2b 1c 1c |/;W|..wx../<7+..| -00000030 f4 dc ea 3e c9 ff ee 1e f8 18 f4 3c ec d4 38 38 |...>.......<..88| -00000040 01 01 7f 7e 7b 4e 30 2f 11 1e 20 3f 21 3e 1c 1f |...~{N0/.. ?!>..| -00000050 80 80 fe 7e de 72 0c f4 88 78 04 fc 84 7c 38 f8 |...~.r...x...|8.| -00000060 2b 3f 50 7f 91 ff 72 7f 18 1f 2c 3f 23 3f 1c 1c |+?P...r...,?#?..| -00000070 d4 fc 0a fe 89 ff 4e fe 18 f8 34 fc c4 fc 38 38 |......N...4...88| -00000080 0c 0c 1f 13 1c 13 10 1f 20 3f 62 7f ce bf 80 ff |........ ?b.....| -00000090 00 00 80 80 78 f8 7c c4 7c 84 38 c8 10 f0 20 e0 |....x.|.|.8... .| -000000a0 7c 77 3e 29 1f 1f 03 02 03 02 01 01 03 02 01 01 ||w>)............| -000000b0 30 f0 48 f8 86 fe c5 7f a9 7f 9e f2 1c fc e0 e0 |0.H.............| -000000c0 00 00 01 01 7f 7e 7b 4e 30 2f 14 1f 27 3e e0 ff |.....~{N0/..'>..| -000000d0 00 00 80 80 fe 7e de 72 0c f4 28 f8 e4 7c 07 ff |.....~.r..(..|..| -000000e0 9d fe 8f fb 57 7c 33 3f 37 38 2f 3c 37 2b 1c 1c |....W|3?78/<7+..| -000000f0 b9 7f f1 df ea 3e cc fc e8 18 f8 38 f0 f0 00 00 |.....>.....8....| -00000100 00 00 01 01 7f 7e 7b 4e 30 2f 11 1e 20 3f e1 fe |.....~{N0/.. ?..| -00000110 00 00 80 80 fe 7e de 72 0c f4 88 78 04 fc 87 7f |.....~.r...x....| -00000120 9c ff 8b ff 51 7f 32 3f 30 3f 2c 3f 23 3f 1c 1c |....Q.2?0?,?#?..| -00000130 39 ff d1 ff 8a fe 4c fc 08 f8 38 f8 f0 f0 00 00 |9.....L...8.....| -00000140 00 00 0c 0c 1f 13 1c 13 10 1f 20 3f 62 7f ce bf |.......... ?b...| -00000150 00 00 00 00 80 80 78 f8 7c c4 7c 84 38 d8 28 f8 |......x.|.|.8.(.| -00000160 80 ff 7c 77 3e 29 1f 1f 1f 1c 33 2e 13 1f 0e 0e |..|w>)....3.....| -00000170 48 f8 44 fc 8c fc 82 7e 89 7f 15 ff f6 ee 18 18 |H.D....~........| -00000180 diff --git a/gfx/overworld/075.png b/gfx/overworld/075.png new file mode 100755 index 0000000..6b3eeba --- /dev/null +++ b/gfx/overworld/075.png @@ -0,0 +1,12 @@ +00000000 89 50 4e 47 0d 0a 1a 0a 00 00 00 0d 49 48 44 52 |.PNG........IHDR| +00000010 00 00 00 20 00 00 00 30 08 06 00 00 00 70 ac 78 |... ...0.....p.x| +00000020 6f 00 00 00 01 73 52 47 42 00 ae ce 1c e9 00 00 |o....sRGB.......| +00000030 00 04 67 41 4d 41 00 00 b1 8f 0b fc 61 05 00 00 |..gAMA......a...| +00000040 00 09 70 48 59 73 00 00 0e c4 00 00 0e c4 01 95 |..pHYs..........| +00000050 2b 0e 1b 00 00 00 3a 49 44 41 54 58 47 ed ce b1 |+.....:IDATXG...| +00000060 01 00 20 08 c4 c0 c7 fd 77 06 0b 77 a0 f0 d2 a4 |.. .....w..w....| +00000070 bd ea 5b 16 3b ef 6b 01 00 00 00 00 00 00 00 00 |..[.;.k.........| +00000080 00 00 00 00 00 00 00 00 00 00 00 00 00 fc 0e 48 |...............H| +00000090 06 fc 56 04 5c f9 42 17 89 00 00 00 00 49 45 4e |..V.\.B......IEN| +000000a0 44 ae 42 60 82 |D.B`.| +000000a5 diff --git a/home/text.asm b/home/text.asm index a5ddf43..d166534 100644 --- a/home/text.asm +++ b/home/text.asm @@ -201,8 +201,11 @@ PlaceString:: ; 1078 PlaceNextChar:: ; 1079 ld a, [de] + cp 0 + jr z, .ok cp "@" jr nz, CheckDict +.ok ld b, h ld c, l pop hl