Skip to content
Permalink
Browse files

basic support for portrait faces; make charselect menu more fun

  • Loading branch information...
Akaricchi committed Jul 8, 2019
1 parent 0c5e0b3 commit cf1ab225cb1471126dc4f93d7a1dcd6ac851c9ad
Showing with 1,006 additions and 496 deletions.
  1. +4 −2 atlas/overrides/dialog/cirno.spr
  2. +3 −1 atlas/overrides/dialog/elly.spr
  3. +4 −2 atlas/overrides/dialog/hina.spr
  4. +4 −2 atlas/overrides/dialog/iku.spr
  5. +4 −2 atlas/overrides/dialog/kurumi.spr
  6. +4 −2 atlas/overrides/dialog/marisa.spr
  7. +5 −0 atlas/overrides/dialog/marisa_face_normal.spr
  8. +5 −0 atlas/overrides/dialog/marisa_face_smug.spr
  9. +5 −0 atlas/overrides/dialog/marisa_face_surprised.spr
  10. +5 −0 atlas/overrides/dialog/marisa_face_unamused.spr
  11. +4 −2 atlas/overrides/dialog/reimu.spr
  12. +5 −0 atlas/overrides/dialog/reimu_face_normal.spr
  13. +5 −0 atlas/overrides/dialog/reimu_face_smug.spr
  14. +5 −0 atlas/overrides/dialog/reimu_face_surprised.spr
  15. +5 −0 atlas/overrides/dialog/reimu_face_unamused.spr
  16. +3 −2 atlas/overrides/dialog/scuttle.spr
  17. +4 −2 atlas/overrides/dialog/wriggle.spr
  18. +3 −2 atlas/overrides/dialog/youmu.spr
  19. +5 −0 atlas/overrides/dialog/youmu_face_normal.spr
  20. +5 −0 atlas/overrides/dialog/youmu_face_smug.spr
  21. +5 −0 atlas/overrides/dialog/youmu_face_surprised.spr
  22. +5 −0 atlas/overrides/dialog/youmu_face_unamused.spr
  23. BIN atlas/portraits/dialog/cirno.alphamap.webp
  24. BIN atlas/portraits/dialog/cirno.webp
  25. BIN atlas/portraits/dialog/elly.webp
  26. BIN atlas/portraits/dialog/hina.webp
  27. BIN atlas/portraits/dialog/iku.webp
  28. BIN atlas/portraits/dialog/kurumi.webp
  29. BIN atlas/portraits/dialog/marisa.webp
  30. BIN atlas/portraits/dialog/marisa_face_normal.webp
  31. BIN atlas/portraits/dialog/marisa_face_smug.webp
  32. BIN atlas/portraits/dialog/marisa_face_surprised.webp
  33. BIN atlas/portraits/dialog/marisa_face_unamused.webp
  34. BIN atlas/portraits/dialog/reimu.webp
  35. BIN atlas/portraits/dialog/reimu_face_normal.webp
  36. BIN atlas/portraits/dialog/reimu_face_smug.webp
  37. BIN atlas/portraits/dialog/reimu_face_surprised.webp
  38. BIN atlas/portraits/dialog/reimu_face_unamused.webp
  39. BIN atlas/portraits/dialog/scuttle.webp
  40. BIN atlas/portraits/dialog/wriggle.alphamap.webp
  41. BIN atlas/portraits/dialog/wriggle.webp
  42. BIN atlas/portraits/dialog/youmu.alphamap.webp
  43. BIN atlas/portraits/dialog/youmu.webp
  44. BIN atlas/portraits/dialog/youmu_face_normal.webp
  45. BIN atlas/portraits/dialog/youmu_face_smug.webp
  46. BIN atlas/portraits/dialog/youmu_face_surprised.webp
  47. BIN atlas/portraits/dialog/youmu_face_unamused.webp
  48. BIN resources/00-taisei.pkgdir/gfx/atlas_portraits_0.alphamap.webp
  49. BIN resources/00-taisei.pkgdir/gfx/atlas_portraits_0.webp
  50. +8 −6 resources/00-taisei.pkgdir/gfx/dialog/cirno.spr
  51. +5 −3 resources/00-taisei.pkgdir/gfx/dialog/elly.spr
  52. +7 −5 resources/00-taisei.pkgdir/gfx/dialog/hina.spr
  53. +7 −5 resources/00-taisei.pkgdir/gfx/dialog/iku.spr
  54. +6 −4 resources/00-taisei.pkgdir/gfx/dialog/kurumi.spr
  55. +8 −6 resources/00-taisei.pkgdir/gfx/dialog/marisa.spr
  56. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/marisa_face_normal.spr
  57. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/marisa_face_smug.spr
  58. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/marisa_face_surprised.spr
  59. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/marisa_face_unamused.spr
  60. +8 −6 resources/00-taisei.pkgdir/gfx/dialog/reimu.spr
  61. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/reimu_face_normal.spr
  62. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/reimu_face_smug.spr
  63. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/reimu_face_surprised.spr
  64. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/reimu_face_unamused.spr
  65. +6 −5 resources/00-taisei.pkgdir/gfx/dialog/scuttle.spr
  66. +8 −6 resources/00-taisei.pkgdir/gfx/dialog/wriggle.spr
  67. +7 −6 resources/00-taisei.pkgdir/gfx/dialog/youmu.spr
  68. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/youmu_face_normal.spr
  69. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/youmu_face_smug.spr
  70. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/youmu_face_surprised.spr
  71. +14 −0 resources/00-taisei.pkgdir/gfx/dialog/youmu_face_unamused.spr
  72. +69 −56 src/dialog.c
  73. +47 −17 src/dialog.h
  74. +37 −0 src/dialog/dialog_macros.h
  75. +83 −99 src/dialog/marisa.c
  76. +84 −100 src/dialog/reimu.c
  77. +83 −99 src/dialog/youmu.c
  78. +100 −17 src/menu/charselect.c
  79. +1 −1 src/menu/mainmenu.c
  80. +5 −2 src/player.c
  81. +1 −0 src/player.h
  82. +82 −1 src/plrmodes.c
  83. +5 −2 src/plrmodes.h
  84. +7 −1 src/plrmodes/marisa.c
  85. +7 −1 src/plrmodes/reimu.c
  86. +2 −2 src/plrmodes/reimu_a.c
  87. +7 −1 src/plrmodes/youmu.c
  88. +2 −2 src/stage.c
  89. +1 −1 src/stagedraw.c
  90. +7 −3 src/stages/stage1_events.c
  91. +7 −3 src/stages/stage2_events.c
  92. +7 −3 src/stages/stage3_events.c
  93. +7 −3 src/stages/stage4_events.c
  94. +11 −6 src/stages/stage5_events.c
  95. +9 −5 src/stages/stage6_events.c
@@ -1,3 +1,5 @@

w = 326.5
h = 478
w = 326
h = 477.5
offset_x = 0
offset_y = 0
@@ -1,3 +1,5 @@

w = 388
w = 386
h = 500
offset_x = 0
offset_y = 0
@@ -1,3 +1,5 @@

w = 338.5
h = 493.5
w = 337.5
h = 492.5
offset_x = 0
offset_y = 0
@@ -1,3 +1,5 @@

w = 340
h = 513
w = 339
h = 512.5
offset_x = 0
offset_y = 0
@@ -1,3 +1,5 @@

w = 402.5
h = 478
w = 400.5
h = 477
offset_x = 0
offset_y = 0
@@ -1,3 +1,5 @@

w = 257
h = 498.5
w = 256
h = 497.5
offset_x = 0
offset_y = 0
@@ -0,0 +1,5 @@

w = 57
h = 50.5
offset_x = -22
offset_y = -134
@@ -0,0 +1,5 @@

w = 57
h = 50
offset_x = -24
offset_y = -134.25
@@ -0,0 +1,5 @@

w = 138
h = 103.5
offset_x = 16.5
offset_y = -160
@@ -0,0 +1,5 @@

w = 130
h = 94
offset_x = 11
offset_y = -156.25
@@ -1,3 +1,5 @@

w = 311
h = 491.5
w = 310
h = 491
offset_x = 0
offset_y = 0
@@ -0,0 +1,5 @@

w = 62.5
h = 57.5
offset_x = 23.25
offset_y = -155.75
@@ -0,0 +1,5 @@

w = 63
h = 64
offset_x = 22
offset_y = -157
@@ -0,0 +1,5 @@

w = 132.5
h = 107
offset_x = -11.75
offset_y = -179
@@ -0,0 +1,5 @@

w = 100.5
h = 61.5
offset_x = 41.75
offset_y = -157.25
@@ -1,4 +1,5 @@

w = 263.5
h = 474
w = 262.5
h = 473.5
offset_x = -16
offset_y = 0
@@ -1,3 +1,5 @@

w = 322
h = 545.5
w = 321
h = 544.5
offset_x = 0
offset_y = 0
@@ -1,4 +1,5 @@

w = 288.5
h = 491
w = 286
h = 490
offset_x = 32
offset_y = 0
@@ -0,0 +1,5 @@

w = 65.5
h = 60.5
offset_x = -0.75
offset_y = -173.75
@@ -0,0 +1,5 @@

w = 58
h = 56
offset_x = -2.5
offset_y = -171.5
@@ -0,0 +1,5 @@

w = 119
h = 95.5
offset_x = -27.5
offset_y = -190.25
@@ -0,0 +1,5 @@

w = 116.5
h = 106
offset_x = -27.75
offset_y = -196.5
Binary file not shown.
BIN -208 Bytes (100%) atlas/portraits/dialog/cirno.webp
Binary file not shown.
BIN -376 Bytes (100%) atlas/portraits/dialog/elly.webp
Binary file not shown.
BIN +178 Bytes (100%) atlas/portraits/dialog/hina.webp
Binary file not shown.
BIN +110 Bytes (100%) atlas/portraits/dialog/iku.webp
Binary file not shown.
BIN +124 Bytes (100%) atlas/portraits/dialog/kurumi.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN -132 Bytes (100%) atlas/portraits/dialog/scuttle.webp
Binary file not shown.
Binary file not shown.
BIN +178 Bytes (100%) atlas/portraits/dialog/wriggle.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,12 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 2
region_y = 962
region_w = 653
region_h = 956
region_x = 2944
region_y = 2
region_w = 652
region_h = 955

# -- Pasted from the override file --

w = 326.5
h = 478
w = 326
h = 477.5
offset_x = 0
offset_y = 0
@@ -1,12 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 811
region_x = 807
region_y = 2
region_w = 776
region_w = 772
region_h = 1000

# -- Pasted from the override file --

w = 388
w = 386
h = 500
offset_x = 0
offset_y = 0
@@ -1,12 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 2275
region_x = 2265
region_y = 2
region_w = 677
region_h = 987
region_w = 675
region_h = 985

# -- Pasted from the override file --

w = 338.5
h = 493.5
w = 337.5
h = 492.5
offset_x = 0
offset_y = 0
@@ -1,12 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 1591
region_x = 1583
region_y = 2
region_w = 680
region_h = 1026
region_w = 678
region_h = 1025

# -- Pasted from the override file --

w = 340
h = 513
w = 339
h = 512.5
offset_x = 0
offset_y = 0
@@ -3,10 +3,12 @@
texture = atlas_portraits_0
region_x = 2
region_y = 2
region_w = 805
region_h = 956
region_w = 801
region_h = 954

# -- Pasted from the override file --

w = 402.5
h = 478
w = 400.5
h = 477
offset_x = 0
offset_y = 0
@@ -1,12 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 1190
region_y = 1032
region_w = 514
region_h = 997
region_x = 1177
region_y = 1031
region_w = 512
region_h = 995

# -- Pasted from the override file --

w = 257
h = 498.5
w = 256
h = 497.5
offset_x = 0
offset_y = 0
@@ -0,0 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 1942
region_y = 1717
region_w = 114
region_h = 101

# -- Pasted from the override file --

w = 57
h = 50.5
offset_x = -22
offset_y = -134
@@ -0,0 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 2060
region_y = 1717
region_w = 114
region_h = 100

# -- Pasted from the override file --

w = 57
h = 50
offset_x = -24
offset_y = -134.25
@@ -0,0 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 1962
region_y = 1247
region_w = 276
region_h = 207

# -- Pasted from the override file --

w = 138
h = 103.5
offset_x = 16.5
offset_y = -160
@@ -0,0 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 1693
region_y = 1444
region_w = 260
region_h = 188

# -- Pasted from the override file --

w = 130
h = 94
offset_x = 11
offset_y = -156.25
@@ -1,12 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 2956
region_y = 2
region_w = 622
region_h = 983
region_x = 2944
region_y = 961
region_w = 620
region_h = 982

# -- Pasted from the override file --

w = 311
h = 491.5
w = 310
h = 491
offset_x = 0
offset_y = 0
@@ -0,0 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 1693
region_y = 1636
region_w = 125
region_h = 115

# -- Pasted from the override file --

w = 62.5
h = 57.5
offset_x = 23.25
offset_y = -155.75
@@ -0,0 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 1957
region_y = 1458
region_w = 126
region_h = 128

# -- Pasted from the override file --

w = 63
h = 64
offset_x = 22
offset_y = -157
@@ -0,0 +1,14 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_portraits_0
region_x = 1693
region_y = 1031
region_w = 265
region_h = 214

# -- Pasted from the override file --

w = 132.5
h = 107
offset_x = -11.75
offset_y = -179

0 comments on commit cf1ab22

Please sign in to comment.
You can’t perform that action at this time.