|
|
(39 intermediate revisions by the same user not shown) |
Line 173: |
Line 173: |
| | input = 2MP | | | input = 2MP |
| | images = | | | images = |
| {{MoveDataCargoImage|marisa_2mp|caption=}} | | {{MoveDataCargoImage|imageHeight=140px|marisa_2mp|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|marisa_2mp|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=150px|marisa_2mp|caption=}} |
| | info = | | | info = |
| {{AttackDataCargo-SF6/Query|marisa_2mp}} | | {{AttackDataCargo-SF6/Query|marisa_2mp}} |
Line 194: |
Line 194: |
| {{MoveDataCargoImage|imageHeight=180px|marisa_2hp|caption=}} | | {{MoveDataCargoImage|imageHeight=180px|marisa_2hp|caption=}} |
| ---- | | ---- |
| {{MoveDataCargoImage|imageHeight=180px|marisa_2hp_hold|caption=}} | | {{MoveDataCargoImage|imageHeight=200px|marisa_2hp_hold|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=140px|marisa_2hp|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=140px|marisa_2hp|caption=}} |
Line 377: |
Line 377: |
| | input = j.HK | | | input = j.HK |
| | images = | | | images = |
| {{MoveDataCargoImage|marisa_jhk|caption=}} | | {{MoveDataCargoImage|imageHeight=120px|marisa_jhk|caption=}} |
| ---- | | ---- |
| {{MoveDataCargoImage|marisa_jhk_hold|caption=}} | | {{MoveDataCargoImage|imageHeight=160px|marisa_jhk_hold|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=150px|marisa_jhk|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=150px|marisa_jhk|caption=}} |
Line 418: |
Line 418: |
| | input = 4HP | | | input = 4HP |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=160px|marisa_4hp|caption=}} | | {{MoveDataCargoImage|imageHeight=190px|marisa_4hp|caption=}} |
| ---- | | ---- |
| {{MoveDataCargoImage|imageHeight=160px|marisa_4hp_hold|caption=}} | | {{MoveDataCargoImage|imageHeight=200px|marisa_4hp_hold|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_4hp|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_4hp|caption=}} |
Line 450: |
Line 450: |
| | input = 3HP | | | input = 3HP |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=140px|marisa_3hp|caption=}} | | {{MoveDataCargoImage|imageHeight=160px|marisa_3hp|caption=}} |
| ---- | | ---- |
| {{MoveDataCargoImage|imageHeight=140px|marisa_3hp_hold|caption=}} | | {{MoveDataCargoImage|imageHeight=190px|marisa_3hp_hold|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_3hp|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_3hp|caption=}} |
Line 478: |
Line 478: |
| | input = 6HK | | | input = 6HK |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=180px|marisa_6hk|caption=}} | | {{MoveDataCargoImage|imageHeight=200px|marisa_6hk|caption=}} |
| ---- | | ---- |
| {{MoveDataCargoImage|imageHeight=180px|marisa_6hk_hold|caption=}} | | {{MoveDataCargoImage|imageHeight=210px|marisa_6hk_hold|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_6hk|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_6hk|caption=}} |
Line 535: |
Line 535: |
| | input = 5LP~LP | | | input = 5LP~LP |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=180px|marisa_5lp_lp|caption=Clef Cannon}} | | {{MoveDataCargoImage|imageHeight=170px|marisa_5lp_lp|caption=Clef Cannon}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_5lp_lp|caption=Clef Cannon}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_5lp_lp|caption=Clef Cannon}} |
Line 557: |
Line 557: |
| | input = 5MP~MP | | | input = 5MP~MP |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=180px|marisa_5mp_mp|caption=}} | | {{MoveDataCargoImage|imageHeight=190px|marisa_5mp_mp|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_5mp_mp|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_5mp_mp|caption=}} |
Line 656: |
Line 656: |
| | input = 6HK~6HK | | | input = 6HK~6HK |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=180px|marisa_6hk_6hk|caption=}} | | {{MoveDataCargoImage|imageHeight=200px|marisa_6hk_6hk|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_6hk_6hk|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_6hk_6hk|caption=}} |
Line 714: |
Line 714: |
| | input = 4LPLK | | | input = 4LPLK |
| | images = | | | images = |
| {{MoveDataCargoImage|marisa_4lplk|caption=}} | | {{MoveDataCargoImage|marisa_4lplk|imageHeight=200px|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_4lplk|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_4lplk|caption=}} |
Line 736: |
Line 736: |
| | input = {{Classic_sf6}} HPHK<br>{{Modern_sf6}} DI | | | input = {{Classic_sf6}} HPHK<br>{{Modern_sf6}} DI |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=160px|marisa_hphk|caption=}} | | {{MoveDataCargoImage|imageHeight=180px|marisa_hphk|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=160px|marisa_hphk|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=160px|marisa_hphk|caption=}} |
Line 775: |
Line 775: |
| | input = 6HPHK | | | input = 6HPHK |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=160px|marisa_6hphk|caption=}} | | {{MoveDataCargoImage|imageHeight=200px|marisa_6hphk|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=160px|marisa_6hphk|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=160px|marisa_6hphk|caption=}} |
Line 847: |
Line 847: |
| | input = 236P (HOLD OK) | | | input = 236P (HOLD OK) |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=140px|marisa_236lp|caption=}} | | {{MoveDataCargoImage|imageHeight=160px|marisa_236lp|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=120px|marisa_236lp|caption=Armored Startup}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=120px|marisa_236lp|caption=Armored Startup}} |
Line 895: |
Line 895: |
| | input = 236P (HOLD OK) | | | input = 236P (HOLD OK) |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=140px|marisa_236lp|caption=}} | | {{MoveDataCargoImage|imageHeight=140px|marisa_236lp_hold|caption=}} |
| ----
| | {{MoveDataCargoImage|imageHeight=140px|marisa_236lp_hold|2|caption=}} |
| {{MoveDataCargoImage|imageHeight=140px|marisa_236pp|caption=}} | |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=120px|marisa_236lp|caption=Armored Startup}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=120px|marisa_236lp|caption=Armored Startup}} |
Line 933: |
Line 932: |
| | input = 214P | | | input = 214P |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=180px|marisa_214lp|caption=}} | | {{MoveDataCargoImage|imageHeight=190px|marisa_214lp|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_214lp|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_214lp|caption=}} |
Line 963: |
Line 962: |
| | input = 214P~6P | | | input = 214P~6P |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=180px|marisa_214lp_6p|caption=}} | | {{MoveDataCargoImage|imageHeight=210px|marisa_214lp_6p|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_214lp_6p|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_214lp_6p|caption=}} |
Line 990: |
Line 989: |
| | input = 623P | | | input = 623P |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=140px|marisa_623lp|caption=}} | | {{MoveDataCargoImage|imageHeight=160px|marisa_623lp|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_623lp|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_623lp|caption=}} |
Line 1,057: |
Line 1,056: |
| | input = 214K | | | input = 214K |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=200px|marisa_214k|caption=Mind the Achilles' Heel}} | | {{MoveDataCargoImage|imageHeight=220px|marisa_214k|caption=Mind the Achilles' Heel}} |
| | {{MoveDataCargoImage|imageHeight=200px|marisa_214k|2|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=160px|marisa_214k|caption=Mind the Achilles' Heel}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=160px|marisa_214k|caption=Mind the Achilles' Heel}} |
Line 1,099: |
Line 1,099: |
| | input = 214K~P~P | | | input = 214K~P~P |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=180px|marisa_214k_p|caption=}} | | {{MoveDataCargoImage|imageHeight=200px|marisa_214k_p|caption=}} |
| ---- | | ---- |
| {{MoveDataCargoImage|imageHeight=180px|marisa_214k_p_p|caption=}} | | {{MoveDataCargoImage|imageHeight=190px|marisa_214k_p_p|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=140px|marisa_214k_p|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=140px|marisa_214k_p|caption=}} |
Line 1,126: |
Line 1,126: |
| | input = 214K~K | | | input = 214K~K |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=200px|marisa_214k_k|caption=}} | | {{MoveDataCargoImage|imageHeight=210px|marisa_214k_k|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=200px|marisa_214k_k|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=200px|marisa_214k_k|caption=}} |
Line 1,167: |
Line 1,167: |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=200px|marisa_236236p|caption=}} | | {{MoveDataCargoImage|imageHeight=200px|marisa_236236p|caption=}} |
| | ---- |
| | {{MoveDataCargoImage|imageHeight=180px|marisa_236236p_hold|caption=Fully Charged}} |
| | ---- |
| | {{MoveDataCargoImage|imageHeight=180px|marisa_236236p_counter|caption=Counter Strike}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=120px|marisa_236236p|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=120px|marisa_236236p|caption=}} |
Line 1,201: |
Line 1,205: |
| | input = 214214P | | | input = 214214P |
| | images = | | | images = |
| {{MoveDataCargoImage|imageHeight=180px|marisa_214214p|1|caption=}} | | {{MoveDataCargoImage|imageHeight=200px|marisa_214214p|1|caption=}} |
| ---- | | ---- |
| {{MoveDataCargoImage|imageHeight=180px|marisa_214214p|2|caption=}} | | {{MoveDataCargoImage|imageHeight=240px|marisa_214214p|2|caption=}} |
| | hitboxes = | | | hitboxes = |
| {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_214214p|1|caption=}} | | {{MoveDataCargoImage|hitbox=yes|imageHeight=180px|marisa_214214p|1|caption=}} |