From cf9f42d840beb642b3ec32b34a9199e7b5f89e32 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Thu, 10 Oct 2024 10:54:51 -0500 Subject: [PATCH 01/26] unpack pl_batt_obj and document some related code (not matching yet) --- include/unk_0207C908.h | 16 +- platinum.us/filesys.sha1 | 2 +- platinum.us/rom.rsf | 8 +- res/battle/graphic/meson.build | 1 + res/battle/graphic/pl_batt_obj/meson.build | 33 ++ res/battle/graphic/pl_batt_obj/order.txt | 343 ++++++++++++++++++ .../pl_batt_obj/palettes/icon_palettes.pal | 51 +++ .../graphic/pl_batt_obj/palettes/meson.build | 126 +++++++ .../palettes/pl_batt_obj_00000000.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000001.pal | 19 + .../palettes/pl_batt_obj_00000002.pal | 19 + .../palettes/pl_batt_obj_00000003.pal | 19 + .../palettes/pl_batt_obj_00000004.pal | 19 + .../palettes/pl_batt_obj_00000005.pal | 19 + .../palettes/pl_batt_obj_00000006.pal | 19 + .../palettes/pl_batt_obj_00000007.pal | 19 + .../palettes/pl_batt_obj_00000008.pal | 19 + .../palettes/pl_batt_obj_00000009.pal | 19 + .../palettes/pl_batt_obj_00000010.pal | 19 + .../palettes/pl_batt_obj_00000011.pal | 19 + .../palettes/pl_batt_obj_00000012.pal | 19 + .../palettes/pl_batt_obj_00000013.pal | 19 + .../palettes/pl_batt_obj_00000014.pal | 19 + .../palettes/pl_batt_obj_00000015.pal | 19 + .../palettes/pl_batt_obj_00000016.pal | 19 + .../palettes/pl_batt_obj_00000017.pal | 19 + .../palettes/pl_batt_obj_00000018.pal | 19 + .../palettes/pl_batt_obj_00000019.pal | 19 + .../palettes/pl_batt_obj_00000020.pal | 19 + .../palettes/pl_batt_obj_00000021.pal | 19 + .../palettes/pl_batt_obj_00000022.pal | 19 + .../palettes/pl_batt_obj_00000023.pal | 19 + .../palettes/pl_batt_obj_00000024.pal | 19 + .../palettes/pl_batt_obj_00000025.pal | 19 + .../palettes/pl_batt_obj_00000026.pal | 19 + .../palettes/pl_batt_obj_00000027.pal | 19 + .../palettes/pl_batt_obj_00000028.pal | 19 + .../palettes/pl_batt_obj_00000029.pal | 19 + .../palettes/pl_batt_obj_00000030.pal | 19 + .../palettes/pl_batt_obj_00000031.pal | 19 + .../palettes/pl_batt_obj_00000032.pal | 19 + .../palettes/pl_batt_obj_00000033.pal | 19 + .../palettes/pl_batt_obj_00000034.pal | 19 + .../palettes/pl_batt_obj_00000035.pal | 19 + .../palettes/pl_batt_obj_00000036.pal | 19 + .../palettes/pl_batt_obj_00000037.pal | 19 + .../palettes/pl_batt_obj_00000038.pal | 19 + .../palettes/pl_batt_obj_00000039.pal | 19 + .../palettes/pl_batt_obj_00000040.pal | 19 + .../palettes/pl_batt_obj_00000041.pal | 19 + .../palettes/pl_batt_obj_00000042.pal | 19 + .../palettes/pl_batt_obj_00000043.pal | 19 + .../palettes/pl_batt_obj_00000044.pal | 19 + .../palettes/pl_batt_obj_00000045.pal | 19 + .../palettes/pl_batt_obj_00000046.pal | 19 + .../palettes/pl_batt_obj_00000047.pal | 19 + .../palettes/pl_batt_obj_00000048.pal | 19 + .../palettes/pl_batt_obj_00000049.pal | 19 + .../palettes/pl_batt_obj_00000050.pal | 19 + .../palettes/pl_batt_obj_00000051.pal | 19 + .../palettes/pl_batt_obj_00000052.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000053.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000054.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000055.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000056.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000057.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000058.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000059.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000060.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000061.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000062.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000063.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000064.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000065.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000066.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000067.pal | 19 + .../palettes/pl_batt_obj_00000068.pal | 19 + .../palettes/pl_batt_obj_00000069.pal | 19 + .../palettes/pl_batt_obj_00000070.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000071.pal | 19 + .../palettes/pl_batt_obj_00000072.pal | 115 ++++++ .../palettes/pl_batt_obj_00000073.pal | 19 + .../palettes/pl_batt_obj_00000075.pal | 19 + .../palettes/pl_batt_obj_00000079.pal | 19 + .../palettes/pl_batt_obj_00000080.pal | 19 + .../palettes/pl_batt_obj_00000081.pal | 19 + .../palettes/pl_batt_obj_00000082.pal | 35 ++ .../palettes/pl_batt_obj_00000083.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000084.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000085.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000086.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000087.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000088.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000089.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000090.pal | 259 +++++++++++++ .../palettes/pl_batt_obj_00000091.pal | 19 + .../palettes/pl_batt_obj_00000092.pal | 19 + .../palettes/pl_batt_obj_00000093.pal | 19 + .../palettes/pl_batt_obj_00000094.pal | 19 + .../palettes/pl_batt_obj_00000095.pal | 19 + .../palettes/pl_batt_obj_00000096.pal | 19 + .../palettes/pl_batt_obj_00000097.pal | 19 + .../palettes/pl_batt_obj_00000098.pal | 19 + .../palettes/pl_batt_obj_00000099.pal | 19 + .../palettes/pl_batt_obj_00000100.pal | 19 + .../palettes/pl_batt_obj_00000101.pal | 19 + .../palettes/pl_batt_obj_00000102.pal | 19 + .../palettes/pl_batt_obj_00000103.pal | 19 + .../palettes/pl_batt_obj_00000104.pal | 19 + .../palettes/pl_batt_obj_00000105.pal | 19 + .../palettes/pl_batt_obj_00000106.pal | 19 + .../palettes/pl_batt_obj_00000107.pal | 19 + .../palettes/pl_batt_obj_00000108.pal | 19 + .../palettes/pl_batt_obj_00000109.pal | 19 + .../palettes/pl_batt_obj_00000110.pal | 19 + .../palettes/pl_batt_obj_00000111.pal | 19 + .../graphic/pl_batt_obj/prebuilt/meson.build | 124 +++++++ .../prebuilt/pl_batt_obj_00000077.NCER | Bin 0 -> 135 bytes .../prebuilt/pl_batt_obj_00000078.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000113.NCER | Bin 0 -> 135 bytes .../prebuilt/pl_batt_obj_00000114.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000115.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000116.NCER | Bin 0 -> 115 bytes .../prebuilt/pl_batt_obj_00000118.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000119.NCER | Bin 0 -> 103 bytes .../prebuilt/pl_batt_obj_00000122.NCER | Bin 0 -> 109 bytes .../prebuilt/pl_batt_obj_00000123.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000125.NCER | Bin 0 -> 109 bytes .../prebuilt/pl_batt_obj_00000126.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000128.NCER | Bin 0 -> 123 bytes .../prebuilt/pl_batt_obj_00000129.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000131.NCER | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000132.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000177.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000178.NCER | Bin 0 -> 97 bytes .../prebuilt/pl_batt_obj_00000180.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000181.NCER | Bin 0 -> 173 bytes .../prebuilt/pl_batt_obj_00000183.NANR | Bin 0 -> 159 bytes .../prebuilt/pl_batt_obj_00000184.NCER | Bin 0 -> 227 bytes .../prebuilt/pl_batt_obj_00000186.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000187.NCER | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000189.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000190.NCER | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000192.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000193.NCER | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000195.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000196.NCER | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000198.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000199.NCER | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000201.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000202.NCER | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000204.NCER | Bin 0 -> 216 bytes .../prebuilt/pl_batt_obj_00000206.NANR | Bin 0 -> 240 bytes .../prebuilt/pl_batt_obj_00000207.NCER | Bin 0 -> 216 bytes .../prebuilt/pl_batt_obj_00000209.NANR | Bin 0 -> 240 bytes .../prebuilt/pl_batt_obj_00000210.NCER | Bin 0 -> 199 bytes .../prebuilt/pl_batt_obj_00000212.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000213.NCER | Bin 0 -> 145 bytes .../prebuilt/pl_batt_obj_00000215.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000216.NCER | Bin 0 -> 163 bytes .../prebuilt/pl_batt_obj_00000218.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000242.NCER | Bin 0 -> 97 bytes .../prebuilt/pl_batt_obj_00000243.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000248.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000249.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000251.NCER | Bin 0 -> 216 bytes .../prebuilt/pl_batt_obj_00000252.NANR | Bin 0 -> 416 bytes .../prebuilt/pl_batt_obj_00000254.NCER | Bin 0 -> 103 bytes .../prebuilt/pl_batt_obj_00000255.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000257.NCER | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000258.NANR | Bin 0 -> 111 bytes .../prebuilt/pl_batt_obj_00000267.NCER | Bin 0 -> 391 bytes .../prebuilt/pl_batt_obj_00000268.NCER | Bin 0 -> 391 bytes .../prebuilt/pl_batt_obj_00000269.NCER | Bin 0 -> 391 bytes .../prebuilt/pl_batt_obj_00000270.NCER | Bin 0 -> 391 bytes .../prebuilt/pl_batt_obj_00000271.NCER | Bin 0 -> 391 bytes .../prebuilt/pl_batt_obj_00000272.NCER | Bin 0 -> 391 bytes .../prebuilt/pl_batt_obj_00000273.NCER | Bin 0 -> 391 bytes .../prebuilt/pl_batt_obj_00000274.NCER | Bin 0 -> 391 bytes .../prebuilt/pl_batt_obj_00000275.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000276.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000277.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000278.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000279.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000280.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000281.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000282.NANR | Bin 0 -> 151 bytes .../prebuilt/pl_batt_obj_00000283.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000284.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000286.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000287.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000289.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000290.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000292.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000293.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000295.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000296.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000298.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000299.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000301.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000302.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000304.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000305.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000307.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000308.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000310.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000311.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000313.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000314.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000316.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000317.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000319.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000320.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000322.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000323.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000325.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000326.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000328.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000329.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000331.NANR | Bin 0 -> 238 bytes .../prebuilt/pl_batt_obj_00000332.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000334.NANR | Bin 0 -> 178 bytes .../prebuilt/pl_batt_obj_00000335.NCER | Bin 0 -> 318 bytes .../prebuilt/pl_batt_obj_00000337.NANR | Bin 0 -> 210 bytes .../prebuilt/pl_batt_obj_00000338.NCER | Bin 0 -> 252 bytes .../prebuilt/pl_batt_obj_00000341.NCER | Bin 0 -> 857 bytes .../prebuilt/pl_batt_obj_00000342.NANR | Bin 0 -> 815 bytes .../sprites/contest_icon_beauty.png | Bin 0 -> 227 bytes .../pl_batt_obj/sprites/contest_icon_cool.png | Bin 0 -> 204 bytes .../pl_batt_obj/sprites/contest_icon_cute.png | Bin 0 -> 215 bytes .../sprites/contest_icon_smart.png | Bin 0 -> 230 bytes .../sprites/contest_icon_tough.png | Bin 0 -> 210 bytes .../graphic/pl_batt_obj/sprites/meson.build | 139 +++++++ .../sprites/move_type_physical.png | Bin 0 -> 224 bytes .../pl_batt_obj/sprites/move_type_special.png | Bin 0 -> 228 bytes .../pl_batt_obj/sprites/move_type_status.png | Bin 0 -> 218 bytes .../sprites/pl_batt_obj_00000076.png | Bin 0 -> 888 bytes .../sprites/pl_batt_obj_00000112.png | Bin 0 -> 888 bytes .../sprites/pl_batt_obj_00000117.png | Bin 0 -> 609 bytes .../sprites/pl_batt_obj_00000120.png | Bin 0 -> 341 bytes .../sprites/pl_batt_obj_00000121.png | Bin 0 -> 250 bytes .../sprites/pl_batt_obj_00000124.png | Bin 0 -> 250 bytes .../sprites/pl_batt_obj_00000127.png | Bin 0 -> 1066 bytes .../sprites/pl_batt_obj_00000130.png | Bin 0 -> 975 bytes .../sprites/pl_batt_obj_00000133.png | Bin 0 -> 609 bytes .../sprites/pl_batt_obj_00000134.png | Bin 0 -> 630 bytes .../sprites/pl_batt_obj_00000135.png | Bin 0 -> 843 bytes .../sprites/pl_batt_obj_00000136.png | Bin 0 -> 845 bytes .../sprites/pl_batt_obj_00000137.png | Bin 0 -> 834 bytes .../sprites/pl_batt_obj_00000138.png | Bin 0 -> 820 bytes .../sprites/pl_batt_obj_00000139.png | Bin 0 -> 987 bytes .../sprites/pl_batt_obj_00000140.png | Bin 0 -> 994 bytes .../sprites/pl_batt_obj_00000141.png | Bin 0 -> 588 bytes .../sprites/pl_batt_obj_00000142.png | Bin 0 -> 690 bytes .../sprites/pl_batt_obj_00000143.png | Bin 0 -> 466 bytes .../sprites/pl_batt_obj_00000144.png | Bin 0 -> 521 bytes .../sprites/pl_batt_obj_00000145.png | Bin 0 -> 541 bytes .../sprites/pl_batt_obj_00000146.png | Bin 0 -> 568 bytes .../sprites/pl_batt_obj_00000147.png | Bin 0 -> 566 bytes .../sprites/pl_batt_obj_00000148.png | Bin 0 -> 594 bytes .../sprites/pl_batt_obj_00000149.png | Bin 0 -> 1030 bytes .../sprites/pl_batt_obj_00000150.png | Bin 0 -> 1040 bytes .../sprites/pl_batt_obj_00000151.png | Bin 0 -> 931 bytes .../sprites/pl_batt_obj_00000152.png | Bin 0 -> 869 bytes .../sprites/pl_batt_obj_00000153.png | Bin 0 -> 663 bytes .../sprites/pl_batt_obj_00000154.png | Bin 0 -> 774 bytes .../sprites/pl_batt_obj_00000155.png | Bin 0 -> 663 bytes .../sprites/pl_batt_obj_00000156.png | Bin 0 -> 774 bytes .../sprites/pl_batt_obj_00000157.png | Bin 0 -> 663 bytes .../sprites/pl_batt_obj_00000158.png | Bin 0 -> 774 bytes .../sprites/pl_batt_obj_00000159.png | Bin 0 -> 663 bytes .../sprites/pl_batt_obj_00000160.png | Bin 0 -> 774 bytes .../sprites/pl_batt_obj_00000161.png | Bin 0 -> 687 bytes .../sprites/pl_batt_obj_00000162.png | Bin 0 -> 812 bytes .../sprites/pl_batt_obj_00000163.png | Bin 0 -> 830 bytes .../sprites/pl_batt_obj_00000164.png | Bin 0 -> 859 bytes .../sprites/pl_batt_obj_00000165.png | Bin 0 -> 482 bytes .../sprites/pl_batt_obj_00000166.png | Bin 0 -> 524 bytes .../sprites/pl_batt_obj_00000167.png | Bin 0 -> 482 bytes .../sprites/pl_batt_obj_00000168.png | Bin 0 -> 524 bytes .../sprites/pl_batt_obj_00000169.png | Bin 0 -> 482 bytes .../sprites/pl_batt_obj_00000170.png | Bin 0 -> 524 bytes .../sprites/pl_batt_obj_00000171.png | Bin 0 -> 482 bytes .../sprites/pl_batt_obj_00000172.png | Bin 0 -> 524 bytes .../sprites/pl_batt_obj_00000173.png | Bin 0 -> 482 bytes .../sprites/pl_batt_obj_00000174.png | Bin 0 -> 524 bytes .../sprites/pl_batt_obj_00000175.png | Bin 0 -> 830 bytes .../sprites/pl_batt_obj_00000176.png | Bin 0 -> 90 bytes .../sprites/pl_batt_obj_00000179.png | Bin 0 -> 73 bytes .../sprites/pl_batt_obj_00000182.png | Bin 0 -> 181 bytes .../sprites/pl_batt_obj_00000185.png | Bin 0 -> 169 bytes .../sprites/pl_batt_obj_00000188.png | Bin 0 -> 315 bytes .../sprites/pl_batt_obj_00000191.png | Bin 0 -> 309 bytes .../sprites/pl_batt_obj_00000194.png | Bin 0 -> 315 bytes .../sprites/pl_batt_obj_00000197.png | Bin 0 -> 315 bytes .../sprites/pl_batt_obj_00000200.png | Bin 0 -> 320 bytes .../sprites/pl_batt_obj_00000203.png | Bin 0 -> 320 bytes .../sprites/pl_batt_obj_00000205.png | Bin 0 -> 260 bytes .../sprites/pl_batt_obj_00000208.png | Bin 0 -> 531 bytes .../sprites/pl_batt_obj_00000211.png | Bin 0 -> 226 bytes .../sprites/pl_batt_obj_00000214.png | Bin 0 -> 203 bytes .../sprites/pl_batt_obj_00000217.png | Bin 0 -> 208 bytes .../sprites/pl_batt_obj_00000247.png | Bin 0 -> 515 bytes .../sprites/pl_batt_obj_00000250.png | Bin 0 -> 105 bytes .../sprites/pl_batt_obj_00000253.png | Bin 0 -> 281 bytes .../sprites/pl_batt_obj_00000256.png | Bin 0 -> 263 bytes .../sprites/pl_batt_obj_00000259.png | Bin 0 -> 4397 bytes .../sprites/pl_batt_obj_00000260.png | Bin 0 -> 4222 bytes .../sprites/pl_batt_obj_00000261.png | Bin 0 -> 3944 bytes .../sprites/pl_batt_obj_00000262.png | Bin 0 -> 4456 bytes .../sprites/pl_batt_obj_00000263.png | Bin 0 -> 4360 bytes .../sprites/pl_batt_obj_00000264.png | Bin 0 -> 3861 bytes .../sprites/pl_batt_obj_00000265.png | Bin 0 -> 3449 bytes .../sprites/pl_batt_obj_00000266.png | Bin 0 -> 3652 bytes .../sprites/pl_batt_obj_00000285.png | Bin 0 -> 548 bytes .../sprites/pl_batt_obj_00000288.png | Bin 0 -> 683 bytes .../sprites/pl_batt_obj_00000291.png | Bin 0 -> 581 bytes .../sprites/pl_batt_obj_00000294.png | Bin 0 -> 668 bytes .../sprites/pl_batt_obj_00000297.png | Bin 0 -> 726 bytes .../sprites/pl_batt_obj_00000300.png | Bin 0 -> 736 bytes .../sprites/pl_batt_obj_00000303.png | Bin 0 -> 707 bytes .../sprites/pl_batt_obj_00000306.png | Bin 0 -> 717 bytes .../sprites/pl_batt_obj_00000309.png | Bin 0 -> 692 bytes .../sprites/pl_batt_obj_00000312.png | Bin 0 -> 651 bytes .../sprites/pl_batt_obj_00000315.png | Bin 0 -> 571 bytes .../sprites/pl_batt_obj_00000318.png | Bin 0 -> 496 bytes .../sprites/pl_batt_obj_00000321.png | Bin 0 -> 750 bytes .../sprites/pl_batt_obj_00000324.png | Bin 0 -> 780 bytes .../sprites/pl_batt_obj_00000327.png | Bin 0 -> 758 bytes .../sprites/pl_batt_obj_00000330.png | Bin 0 -> 597 bytes .../sprites/pl_batt_obj_00000333.png | Bin 0 -> 574 bytes .../sprites/pl_batt_obj_00000336.png | Bin 0 -> 266 bytes .../sprites/pl_batt_obj_00000339.png | Bin 0 -> 388 bytes .../sprites/pl_batt_obj_00000340.png | Bin 0 -> 901 bytes .../pl_batt_obj/sprites/type_icon_bug.png | Bin 0 -> 213 bytes .../pl_batt_obj/sprites/type_icon_dark.png | Bin 0 -> 215 bytes .../pl_batt_obj/sprites/type_icon_dragon.png | Bin 0 -> 230 bytes .../sprites/type_icon_electric.png | Bin 0 -> 230 bytes .../sprites/type_icon_fighting.png | Bin 0 -> 227 bytes .../pl_batt_obj/sprites/type_icon_fire.png | Bin 0 -> 226 bytes .../pl_batt_obj/sprites/type_icon_flying.png | Bin 0 -> 234 bytes .../pl_batt_obj/sprites/type_icon_ghost.png | Bin 0 -> 231 bytes .../pl_batt_obj/sprites/type_icon_grass.png | Bin 0 -> 230 bytes .../pl_batt_obj/sprites/type_icon_ground.png | Bin 0 -> 234 bytes .../pl_batt_obj/sprites/type_icon_ice.png | Bin 0 -> 214 bytes .../pl_batt_obj/sprites/type_icon_mystery.png | Bin 0 -> 205 bytes .../pl_batt_obj/sprites/type_icon_normal.png | Bin 0 -> 227 bytes .../pl_batt_obj/sprites/type_icon_poison.png | Bin 0 -> 234 bytes .../pl_batt_obj/sprites/type_icon_psychic.png | Bin 0 -> 236 bytes .../pl_batt_obj/sprites/type_icon_rock.png | Bin 0 -> 218 bytes .../pl_batt_obj/sprites/type_icon_steel.png | Bin 0 -> 222 bytes .../pl_batt_obj/sprites/type_icon_water.png | Bin 0 -> 220 bytes res/battle/meson.build | 1 + res/prebuilt/battle/graphic/meson.build | 1 - src/battle/ov16_0226871C.c | 2 +- src/overlay013/ov13_02224500.c | 8 +- src/overlay019/ov19_021DA92C.c | 28 +- src/overlay070/ov70_0225D9A4.c | 6 +- src/overlay084/ov84_022403F4.c | 8 +- src/overlay091/ov91_021D0D80.c | 8 +- src/unk_0207C908.c | 99 +++-- src/unk_0208EA44.c | 8 +- tools/scripts/make_pl_batt_obj.py | 49 +++ tools/scripts/make_pl_batt_obj_palettes.py | 45 +++ tools/scripts/meson.build | 4 +- 365 files changed, 9200 insertions(+), 74 deletions(-) create mode 100644 res/battle/graphic/meson.build create mode 100644 res/battle/graphic/pl_batt_obj/meson.build create mode 100644 res/battle/graphic/pl_batt_obj/order.txt create mode 100644 res/battle/graphic/pl_batt_obj/palettes/icon_palettes.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/meson.build create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000000.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000001.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000002.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000003.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000004.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000005.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000006.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000007.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000008.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000009.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000010.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000011.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000012.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000013.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000014.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000015.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000016.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000017.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000018.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000019.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000020.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000021.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000022.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000023.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000024.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000025.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000026.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000027.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000028.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000029.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000030.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000031.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000032.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000033.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000034.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000035.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000036.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000037.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000038.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000039.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000040.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000041.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000042.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000043.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000044.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000045.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000046.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000047.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000048.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000049.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000050.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000051.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000052.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000053.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000054.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000055.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000056.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000057.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000058.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000059.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000060.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000061.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000062.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000063.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000064.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000065.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000066.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000067.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000068.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000069.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000070.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000071.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000072.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000073.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000075.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000079.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000080.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000081.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000082.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000083.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000084.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000085.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000086.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000087.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000088.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000089.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000090.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000091.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000092.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000093.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000094.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000095.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000096.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000097.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000098.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000099.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000100.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000101.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000102.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000103.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000104.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000105.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000106.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000107.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000108.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000109.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000110.pal create mode 100644 res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000111.pal create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/meson.build create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000077.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000078.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000113.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000114.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000115.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000116.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000118.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000119.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000122.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000123.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000125.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000126.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000128.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000129.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000131.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000132.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000177.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000178.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000180.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000181.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000183.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000184.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000186.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000187.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000189.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000190.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000192.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000193.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000195.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000196.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000198.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000199.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000201.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000202.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000204.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000206.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000207.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000209.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000210.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000212.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000213.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000215.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000216.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000218.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000242.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000243.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000248.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000249.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000251.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000252.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000254.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000255.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000257.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000258.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000267.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000268.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000269.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000270.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000271.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000272.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000273.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000274.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000275.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000276.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000277.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000278.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000279.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000280.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000281.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000282.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000283.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000284.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000286.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000287.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000289.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000290.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000292.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000293.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000295.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000296.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000298.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000299.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000301.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000302.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000304.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000305.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000307.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000308.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000310.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000311.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000313.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000314.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000316.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000317.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000319.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000320.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000322.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000323.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000325.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000326.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000328.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000329.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000331.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000332.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000334.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000335.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000337.NANR create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000338.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000341.NCER create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000342.NANR create mode 100644 res/battle/graphic/pl_batt_obj/sprites/contest_icon_beauty.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/contest_icon_cool.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/contest_icon_cute.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/contest_icon_smart.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/contest_icon_tough.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/meson.build create mode 100644 res/battle/graphic/pl_batt_obj/sprites/move_type_physical.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/move_type_special.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/move_type_status.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000076.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000112.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000117.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000120.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000121.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000124.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000127.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000130.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000133.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000134.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000135.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000136.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000137.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000138.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000139.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000140.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000141.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000142.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000143.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000144.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000145.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000146.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000147.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000148.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000149.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000150.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000151.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000152.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000153.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000154.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000155.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000156.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000157.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000158.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000159.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000160.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000161.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000162.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000163.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000164.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000165.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000166.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000167.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000168.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000169.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000170.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000171.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000172.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000173.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000174.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000175.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000176.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000179.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000182.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000185.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000188.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000191.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000194.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000197.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000200.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000203.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000205.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000208.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000211.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000214.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000217.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000247.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000250.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000253.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000256.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000259.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000260.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000261.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000262.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000263.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000264.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000265.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000266.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000285.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000288.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000291.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000294.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000297.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000300.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000303.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000306.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000309.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000312.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000315.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000318.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000321.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000324.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000327.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000330.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000333.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000336.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000339.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000340.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_bug.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_dark.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_dragon.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_electric.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_fighting.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_fire.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_flying.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_ghost.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_grass.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_ground.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_ice.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_mystery.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_normal.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_poison.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_psychic.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_rock.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_steel.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/type_icon_water.png create mode 100644 tools/scripts/make_pl_batt_obj.py create mode 100644 tools/scripts/make_pl_batt_obj_palettes.py diff --git a/include/unk_0207C908.h b/include/unk_0207C908.h index 01ef934b76..adaf4f9a5b 100644 --- a/include/unk_0207C908.h +++ b/include/unk_0207C908.h @@ -10,12 +10,14 @@ #include "palette.h" -u32 sub_0207C908(int param0); -u32 sub_0207C920(void); +#define NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE 74 + +u32 Battle_Obj_TypeIndexToIconNARCMember(int param0); +u32 Battle_Obj_GetPaletteNARCMember(void); u32 sub_0207C924(void); u32 sub_0207C928(void); -u8 sub_0207C92C(int param0); -u32 sub_0207C944(void); +u8 Battle_Obj_TypeIndexToPaletteIndex(int param0); +u32 Battle_Obj_GetNARCIndex(void); void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5); @@ -25,9 +27,9 @@ void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1); void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2); CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); void sub_0207CA88(CellActorData *param0); -u32 sub_0207CA90(int param0); -u8 sub_0207CAA8(int param0); -u32 sub_0207CAC0(void); +u32 Battle_Obj_MoveTypeIndexToIconNARCMember(int param0); +u8 Battle_Obj_MoveTypeIndexToPaletteIndex(int param0); +u32 Battle_Obj_GetMoveTypeNARCIndex(void); void sub_0207CAC4(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); void sub_0207CB00(CellActorData *param0); diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index 745da05271..49b0b6144a 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -172,7 +172,7 @@ d672202157109fb1bb293070b5d35787b2b2b6d3 *res/prebuilt/battle/graphic/batt_bg.na c9baf056c8646bc0bc826bbc98f5cbd439643f3d *res/prebuilt/battle/graphic/batt_obj.narc 036b81fe61c6347100c73b2c23d28da5abc7626c *res/prebuilt/battle/graphic/pl_b_plist_gra.narc 2fafdda86f7f740e2843c95382f08dfac35fa64f *res/prebuilt/battle/graphic/pl_batt_bg.narc -db5906303178da70f6b6c852990df560fb4dfeba *res/prebuilt/battle/graphic/pl_batt_obj.narc +db5906303178da70f6b6c852990df560fb4dfeba *res/battle/graphic/pl_batt_obj/pl_batt_obj.narc 955ce80b532be2184c62c36a6cb9d6b68c4669dd *res/prebuilt/battle/graphic/vs_demo_gra.narc c7e601f3c145dd3c36c6f1deee1f63d526be3c37 *res/prebuilt/wazaeffect/we.arc 30bb77e76c27874bc8ff923b33492595f1a377e2 *res/prebuilt/wazaeffect/we_sub.narc diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf index e1d9d5f6e6..24117dae70 100644 --- a/platinum.us/rom.rsf +++ b/platinum.us/rom.rsf @@ -247,7 +247,13 @@ RomSpec File battle/graphic/batt_obj.narc File battle/graphic/pl_b_plist_gra.narc File battle/graphic/pl_batt_bg.narc - File battle/graphic/pl_batt_obj.narc + + Root / + HostRoot res + File battle/graphic/pl_batt_obj/pl_batt_obj.narc + + Root / + HostRoot res/prebuilt File battle/graphic/vs_demo_gra.narc File wazaeffect/we.arc File wazaeffect/we_sub.narc diff --git a/res/battle/graphic/meson.build b/res/battle/graphic/meson.build new file mode 100644 index 0000000000..f00855949b --- /dev/null +++ b/res/battle/graphic/meson.build @@ -0,0 +1 @@ +subdir('pl_batt_obj') \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build new file mode 100644 index 0000000000..754592ec09 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -0,0 +1,33 @@ +pl_batt_obj_lz_builder = generator(nitrogfx_exe, + output: '@BASENAME@.lz', + arguments: ['@INPUT@', '@OUTPUT@'] +) + +subdir('prebuilt') +subdir('palettes') +subdir('sprites') + +pl_batt_order = files('order.txt') + +pl_batt_obj_narc = custom_target('pl_batt_obj.narc', + output: 'pl_batt_obj.narc', + input: [ + pl_batt_order, + pl_batt_obj_nclr, + pl_batt_obj_nclr_pcmp, + pl_batt_obj_prebuilt_copy, + pl_batt_obj_prebuilt_compressed, + pl_batt_obj_ncgr, + pl_batt_obj_ncgr_compressed + ], + command: [ + make_pl_batt_obj_py, + '--nitrogfx', nitrogfx_exe, + '--knarc', knarc_exe, + '--private-dir', '@PRIVATE_DIR@', + '--output-dir', '@OUTDIR@', + '@INPUT0@' + ] +) + +nitrofs_files += pl_batt_obj_narc \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/order.txt new file mode 100644 index 0000000000..89be5aca63 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/order.txt @@ -0,0 +1,343 @@ +pl_batt_obj_00000000.NCLR +pl_batt_obj_00000001.NCLR +pl_batt_obj_00000002.NCLR +pl_batt_obj_00000003.NCLR +pl_batt_obj_00000004.NCLR +pl_batt_obj_00000005.NCLR +pl_batt_obj_00000006.NCLR +pl_batt_obj_00000007.NCLR +pl_batt_obj_00000008.NCLR +pl_batt_obj_00000009.NCLR +pl_batt_obj_00000010.NCLR +pl_batt_obj_00000011.NCLR +pl_batt_obj_00000012.NCLR +pl_batt_obj_00000013.NCLR +pl_batt_obj_00000014.NCLR +pl_batt_obj_00000015.NCLR +pl_batt_obj_00000016.NCLR +pl_batt_obj_00000017.NCLR +pl_batt_obj_00000018.NCLR +pl_batt_obj_00000019.NCLR +pl_batt_obj_00000020.NCLR +pl_batt_obj_00000021.NCLR +pl_batt_obj_00000022.NCLR +pl_batt_obj_00000023.NCLR +pl_batt_obj_00000024.NCLR +pl_batt_obj_00000025.NCLR +pl_batt_obj_00000026.NCLR +pl_batt_obj_00000027.NCLR +pl_batt_obj_00000028.NCLR +pl_batt_obj_00000029.NCLR +pl_batt_obj_00000030.NCLR +pl_batt_obj_00000031.NCLR +pl_batt_obj_00000032.NCLR +pl_batt_obj_00000033.NCLR +pl_batt_obj_00000034.NCLR +pl_batt_obj_00000035.NCLR +pl_batt_obj_00000036.NCLR +pl_batt_obj_00000037.NCLR +pl_batt_obj_00000038.NCLR +pl_batt_obj_00000039.NCLR +pl_batt_obj_00000040.NCLR +pl_batt_obj_00000041.NCLR +pl_batt_obj_00000042.NCLR +pl_batt_obj_00000043.NCLR +pl_batt_obj_00000044.NCLR +pl_batt_obj_00000045.NCLR +pl_batt_obj_00000046.NCLR +pl_batt_obj_00000047.NCLR +pl_batt_obj_00000048.NCLR +pl_batt_obj_00000049.NCLR +pl_batt_obj_00000050.NCLR +pl_batt_obj_00000051.NCLR +pl_batt_obj_00000052.NCLR +pl_batt_obj_00000053.NCLR +pl_batt_obj_00000054.NCLR +pl_batt_obj_00000055.NCLR +pl_batt_obj_00000056.NCLR +pl_batt_obj_00000057.NCLR +pl_batt_obj_00000058.NCLR +pl_batt_obj_00000059.NCLR +pl_batt_obj_00000060.NCLR +pl_batt_obj_00000061.NCLR +pl_batt_obj_00000062.NCLR +pl_batt_obj_00000063.NCLR +pl_batt_obj_00000064.NCLR +pl_batt_obj_00000065.NCLR +pl_batt_obj_00000066.NCLR +pl_batt_obj_00000067.NCLR +pl_batt_obj_00000068.NCLR +pl_batt_obj_00000069.NCLR +pl_batt_obj_00000070.NCLR +pl_batt_obj_00000071.NCLR +pl_batt_obj_00000072.NCLR +pl_batt_obj_00000073.NCLR +icon_palettes.NCLR +pl_batt_obj_00000075.NCLR +pl_batt_obj_00000076.NCGR +pl_batt_obj_00000077.NCER +pl_batt_obj_00000078.NANR +pl_batt_obj_00000079.NCLR +pl_batt_obj_00000080.NCLR +pl_batt_obj_00000081.NCLR +pl_batt_obj_00000082.NCLR +pl_batt_obj_00000083.NCLR +pl_batt_obj_00000084.NCLR +pl_batt_obj_00000085.NCLR +pl_batt_obj_00000086.NCLR +pl_batt_obj_00000087.NCLR +pl_batt_obj_00000088.NCLR +pl_batt_obj_00000089.NCLR +pl_batt_obj_00000090.NCLR +pl_batt_obj_00000091.NCLR +pl_batt_obj_00000092.NCLR +pl_batt_obj_00000093.NCLR +pl_batt_obj_00000094.NCLR +pl_batt_obj_00000095.NCLR +pl_batt_obj_00000096.NCLR +pl_batt_obj_00000097.NCLR +pl_batt_obj_00000098.NCLR +pl_batt_obj_00000099.NCLR +pl_batt_obj_00000100.NCLR +pl_batt_obj_00000101.NCLR +pl_batt_obj_00000102.NCLR +pl_batt_obj_00000103.NCLR +pl_batt_obj_00000104.NCLR +pl_batt_obj_00000105.NCLR +pl_batt_obj_00000106.NCLR +pl_batt_obj_00000107.NCLR +pl_batt_obj_00000108.NCLR +pl_batt_obj_00000109.NCLR +pl_batt_obj_00000110.NCLR +pl_batt_obj_00000111.NCLR +pl_batt_obj_00000112.NCGR +pl_batt_obj_00000113.NCER +pl_batt_obj_00000114.NANR +pl_batt_obj_00000115.lz +pl_batt_obj_00000116.lz +pl_batt_obj_00000117.lz +pl_batt_obj_00000118.lz +pl_batt_obj_00000119.lz +pl_batt_obj_00000120.lz +pl_batt_obj_00000121.lz +pl_batt_obj_00000122.lz +pl_batt_obj_00000123.lz +pl_batt_obj_00000124.lz +pl_batt_obj_00000125.lz +pl_batt_obj_00000126.lz +pl_batt_obj_00000127.lz +pl_batt_obj_00000128.lz +pl_batt_obj_00000129.lz +pl_batt_obj_00000130.lz +pl_batt_obj_00000131.lz +pl_batt_obj_00000132.lz +pl_batt_obj_00000133.lz +pl_batt_obj_00000134.lz +pl_batt_obj_00000135.lz +pl_batt_obj_00000136.lz +pl_batt_obj_00000137.lz +pl_batt_obj_00000138.lz +pl_batt_obj_00000139.lz +pl_batt_obj_00000140.lz +pl_batt_obj_00000141.lz +pl_batt_obj_00000142.lz +pl_batt_obj_00000143.lz +pl_batt_obj_00000144.lz +pl_batt_obj_00000145.lz +pl_batt_obj_00000146.lz +pl_batt_obj_00000147.lz +pl_batt_obj_00000148.lz +pl_batt_obj_00000149.lz +pl_batt_obj_00000150.lz +pl_batt_obj_00000151.lz +pl_batt_obj_00000152.lz +pl_batt_obj_00000153.lz +pl_batt_obj_00000154.lz +pl_batt_obj_00000155.lz +pl_batt_obj_00000156.lz +pl_batt_obj_00000157.lz +pl_batt_obj_00000158.lz +pl_batt_obj_00000159.lz +pl_batt_obj_00000160.lz +pl_batt_obj_00000161.lz +pl_batt_obj_00000162.lz +pl_batt_obj_00000163.lz +pl_batt_obj_00000164.lz +pl_batt_obj_00000165.lz +pl_batt_obj_00000166.lz +pl_batt_obj_00000167.lz +pl_batt_obj_00000168.lz +pl_batt_obj_00000169.lz +pl_batt_obj_00000170.lz +pl_batt_obj_00000171.lz +pl_batt_obj_00000172.lz +pl_batt_obj_00000173.lz +pl_batt_obj_00000174.lz +pl_batt_obj_00000175.lz +pl_batt_obj_00000176.lz +pl_batt_obj_00000177.lz +pl_batt_obj_00000178.lz +pl_batt_obj_00000179.lz +pl_batt_obj_00000180.lz +pl_batt_obj_00000181.lz +pl_batt_obj_00000182.lz +pl_batt_obj_00000183.lz +pl_batt_obj_00000184.lz +pl_batt_obj_00000185.lz +pl_batt_obj_00000186.lz +pl_batt_obj_00000187.lz +pl_batt_obj_00000188.lz +pl_batt_obj_00000189.lz +pl_batt_obj_00000190.lz +pl_batt_obj_00000191.lz +pl_batt_obj_00000192.lz +pl_batt_obj_00000193.lz +pl_batt_obj_00000194.lz +pl_batt_obj_00000195.lz +pl_batt_obj_00000196.lz +pl_batt_obj_00000197.lz +pl_batt_obj_00000198.lz +pl_batt_obj_00000199.lz +pl_batt_obj_00000200.lz +pl_batt_obj_00000201.lz +pl_batt_obj_00000202.lz +pl_batt_obj_00000203.lz +pl_batt_obj_00000204.lz +pl_batt_obj_00000205.lz +pl_batt_obj_00000206.lz +pl_batt_obj_00000207.lz +pl_batt_obj_00000208.lz +pl_batt_obj_00000209.lz +pl_batt_obj_00000210.lz +pl_batt_obj_00000211.lz +pl_batt_obj_00000212.lz +pl_batt_obj_00000213.lz +pl_batt_obj_00000214.lz +pl_batt_obj_00000215.lz +pl_batt_obj_00000216.lz +pl_batt_obj_00000217.lz +pl_batt_obj_00000218.lz +contest_icon_beauty.lz +contest_icon_cute.lz +type_icon_dragon.lz +type_icon_electric.lz +type_icon_psychic.lz +type_icon_dark.lz +type_icon_fighting.lz +type_icon_fire.lz +type_icon_flying.lz +type_icon_ghost.lz +type_icon_ground.lz +type_icon_ice.lz +type_icon_bug.lz +contest_icon_smart.lz +type_icon_grass.lz +type_icon_normal.lz +type_icon_poison.lz +type_icon_mystery.lz +type_icon_rock.lz +type_icon_steel.lz +contest_icon_tough.lz +contest_icon_cool.lz +type_icon_water.lz +pl_batt_obj_00000242.lz +pl_batt_obj_00000243.lz +move_type_physical.lz +move_type_status.lz +move_type_special.lz +pl_batt_obj_00000247.lz +pl_batt_obj_00000248.lz +pl_batt_obj_00000249.lz +pl_batt_obj_00000250.lz +pl_batt_obj_00000251.lz +pl_batt_obj_00000252.lz +pl_batt_obj_00000253.lz +pl_batt_obj_00000254.lz +pl_batt_obj_00000255.lz +pl_batt_obj_00000256.lz +pl_batt_obj_00000257.lz +pl_batt_obj_00000258.lz +pl_batt_obj_00000259.lz +pl_batt_obj_00000260.lz +pl_batt_obj_00000261.lz +pl_batt_obj_00000262.lz +pl_batt_obj_00000263.lz +pl_batt_obj_00000264.lz +pl_batt_obj_00000265.lz +pl_batt_obj_00000266.lz +pl_batt_obj_00000267.lz +pl_batt_obj_00000268.lz +pl_batt_obj_00000269.lz +pl_batt_obj_00000270.lz +pl_batt_obj_00000271.lz +pl_batt_obj_00000272.lz +pl_batt_obj_00000273.lz +pl_batt_obj_00000274.lz +pl_batt_obj_00000275.lz +pl_batt_obj_00000276.lz +pl_batt_obj_00000277.lz +pl_batt_obj_00000278.lz +pl_batt_obj_00000279.lz +pl_batt_obj_00000280.lz +pl_batt_obj_00000281.lz +pl_batt_obj_00000282.lz +pl_batt_obj_00000283.lz +pl_batt_obj_00000284.lz +pl_batt_obj_00000285.lz +pl_batt_obj_00000286.lz +pl_batt_obj_00000287.lz +pl_batt_obj_00000288.lz +pl_batt_obj_00000289.lz +pl_batt_obj_00000290.lz +pl_batt_obj_00000291.lz +pl_batt_obj_00000292.lz +pl_batt_obj_00000293.lz +pl_batt_obj_00000294.lz +pl_batt_obj_00000295.lz +pl_batt_obj_00000296.lz +pl_batt_obj_00000297.lz +pl_batt_obj_00000298.lz +pl_batt_obj_00000299.lz +pl_batt_obj_00000300.lz +pl_batt_obj_00000301.lz +pl_batt_obj_00000302.lz +pl_batt_obj_00000303.lz +pl_batt_obj_00000304.lz +pl_batt_obj_00000305.lz +pl_batt_obj_00000306.lz +pl_batt_obj_00000307.lz +pl_batt_obj_00000308.lz +pl_batt_obj_00000309.lz +pl_batt_obj_00000310.lz +pl_batt_obj_00000311.lz +pl_batt_obj_00000312.lz +pl_batt_obj_00000313.lz +pl_batt_obj_00000314.lz +pl_batt_obj_00000315.lz +pl_batt_obj_00000316.lz +pl_batt_obj_00000317.lz +pl_batt_obj_00000318.lz +pl_batt_obj_00000319.lz +pl_batt_obj_00000320.lz +pl_batt_obj_00000321.lz +pl_batt_obj_00000322.lz +pl_batt_obj_00000323.lz +pl_batt_obj_00000324.lz +pl_batt_obj_00000325.lz +pl_batt_obj_00000326.lz +pl_batt_obj_00000327.lz +pl_batt_obj_00000328.lz +pl_batt_obj_00000329.lz +pl_batt_obj_00000330.lz +pl_batt_obj_00000331.lz +pl_batt_obj_00000332.lz +pl_batt_obj_00000333.lz +pl_batt_obj_00000334.lz +pl_batt_obj_00000335.lz +pl_batt_obj_00000336.lz +pl_batt_obj_00000337.lz +pl_batt_obj_00000338.lz +pl_batt_obj_00000339.lz +pl_batt_obj_00000340.lz +pl_batt_obj_00000341.lz +pl_batt_obj_00000342.lz \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/palettes/icon_palettes.pal b/res/battle/graphic/pl_batt_obj/palettes/icon_palettes.pal new file mode 100644 index 0000000000..0442b5a5ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/icon_palettes.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 213 49 +246 82 49 +148 49 41 +230 197 106 +189 164 57 +139 106 49 +255 255 123 +172 172 123 +222 222 197 +115 90 74 +74 65 57 +189 189 213 +0 0 0 +131 123 115 +255 255 255 +0 0 0 +205 197 255 +172 148 246 +115 90 156 +106 148 246 +156 222 222 +213 255 238 +74 57 82 +255 90 139 +255 197 180 +148 98 98 +164 65 164 +222 131 189 +148 148 164 +131 123 115 +255 255 255 +0 0 0 +197 255 98 +123 205 82 +90 131 65 +115 57 255 +74 57 148 +189 164 255 +172 189 32 +222 230 49 +123 148 16 +106 164 148 +115 205 180 +32 106 98 +0 0 0 +131 123 115 +255 255 255 diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/pl_batt_obj/palettes/meson.build new file mode 100644 index 0000000000..241935d347 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/meson.build @@ -0,0 +1,126 @@ +pl_batt_obj_palettes = files( + 'pl_batt_obj_00000000.pal', + 'pl_batt_obj_00000052.pal', + 'pl_batt_obj_00000053.pal', + 'pl_batt_obj_00000054.pal', + 'pl_batt_obj_00000055.pal', + 'pl_batt_obj_00000056.pal', + 'pl_batt_obj_00000057.pal', + 'pl_batt_obj_00000058.pal', + 'pl_batt_obj_00000059.pal', + 'pl_batt_obj_00000060.pal', + 'pl_batt_obj_00000061.pal', + 'pl_batt_obj_00000062.pal', + 'pl_batt_obj_00000063.pal', + 'pl_batt_obj_00000064.pal', + 'pl_batt_obj_00000065.pal', + 'pl_batt_obj_00000066.pal', + 'pl_batt_obj_00000070.pal', + 'pl_batt_obj_00000083.pal', + 'pl_batt_obj_00000084.pal', + 'pl_batt_obj_00000085.pal', + 'pl_batt_obj_00000086.pal', + 'pl_batt_obj_00000087.pal', + 'pl_batt_obj_00000088.pal', + 'pl_batt_obj_00000089.pal', + 'pl_batt_obj_00000090.pal' +) + +pl_batt_obj_palettes_pcmp = files( + 'pl_batt_obj_00000001.pal', + 'pl_batt_obj_00000002.pal', + 'pl_batt_obj_00000003.pal', + 'pl_batt_obj_00000004.pal', + 'pl_batt_obj_00000005.pal', + 'pl_batt_obj_00000006.pal', + 'pl_batt_obj_00000007.pal', + 'pl_batt_obj_00000008.pal', + 'pl_batt_obj_00000009.pal', + 'pl_batt_obj_00000010.pal', + 'pl_batt_obj_00000011.pal', + 'pl_batt_obj_00000012.pal', + 'pl_batt_obj_00000013.pal', + 'pl_batt_obj_00000014.pal', + 'pl_batt_obj_00000015.pal', + 'pl_batt_obj_00000016.pal', + 'pl_batt_obj_00000017.pal', + 'pl_batt_obj_00000018.pal', + 'pl_batt_obj_00000019.pal', + 'pl_batt_obj_00000020.pal', + 'pl_batt_obj_00000021.pal', + 'pl_batt_obj_00000022.pal', + 'pl_batt_obj_00000023.pal', + 'pl_batt_obj_00000024.pal', + 'pl_batt_obj_00000025.pal', + 'pl_batt_obj_00000026.pal', + 'pl_batt_obj_00000027.pal', + 'pl_batt_obj_00000028.pal', + 'pl_batt_obj_00000029.pal', + 'pl_batt_obj_00000030.pal', + 'pl_batt_obj_00000031.pal', + 'pl_batt_obj_00000032.pal', + 'pl_batt_obj_00000033.pal', + 'pl_batt_obj_00000034.pal', + 'pl_batt_obj_00000035.pal', + 'pl_batt_obj_00000036.pal', + 'pl_batt_obj_00000037.pal', + 'pl_batt_obj_00000038.pal', + 'pl_batt_obj_00000039.pal', + 'pl_batt_obj_00000040.pal', + 'pl_batt_obj_00000041.pal', + 'pl_batt_obj_00000042.pal', + 'pl_batt_obj_00000043.pal', + 'pl_batt_obj_00000044.pal', + 'pl_batt_obj_00000045.pal', + 'pl_batt_obj_00000046.pal', + 'pl_batt_obj_00000047.pal', + 'pl_batt_obj_00000048.pal', + 'pl_batt_obj_00000049.pal', + 'pl_batt_obj_00000050.pal', + 'pl_batt_obj_00000051.pal', + 'pl_batt_obj_00000067.pal', + 'pl_batt_obj_00000068.pal', + 'pl_batt_obj_00000069.pal', + 'pl_batt_obj_00000071.pal', + 'pl_batt_obj_00000072.pal', + 'pl_batt_obj_00000073.pal', + 'icon_palettes.pal', + 'pl_batt_obj_00000075.pal', + 'pl_batt_obj_00000079.pal', + 'pl_batt_obj_00000080.pal', + 'pl_batt_obj_00000081.pal', + 'pl_batt_obj_00000082.pal', + 'pl_batt_obj_00000091.pal', + 'pl_batt_obj_00000092.pal', + 'pl_batt_obj_00000093.pal', + 'pl_batt_obj_00000094.pal', + 'pl_batt_obj_00000095.pal', + 'pl_batt_obj_00000096.pal', + 'pl_batt_obj_00000097.pal', + 'pl_batt_obj_00000098.pal', + 'pl_batt_obj_00000099.pal', + 'pl_batt_obj_00000100.pal', + 'pl_batt_obj_00000101.pal', + 'pl_batt_obj_00000102.pal', + 'pl_batt_obj_00000103.pal', + 'pl_batt_obj_00000104.pal', + 'pl_batt_obj_00000105.pal', + 'pl_batt_obj_00000106.pal', + 'pl_batt_obj_00000107.pal', + 'pl_batt_obj_00000108.pal', + 'pl_batt_obj_00000109.pal', + 'pl_batt_obj_00000110.pal', + 'pl_batt_obj_00000111.pal' +) + +# for some reason, the pcmp file 'size' field is the real size subtracted from 512 +# (e.g., actual numColors=16, size should=32, but real size is 512-32=480) +# is this part of the standard? nitrogfx can't currently handle it. +# take a custom build step to fix it. +pl_batt_obj_palette_builder = generator(make_pl_batt_obj_palettes_py, + output: '@BASENAME@.NCLR', + arguments: ['--nitrogfx', nitrogfx_exe.full_path(), '--input', '@INPUT@', '--output', '@OUTPUT@', '@EXTRA_ARGS@'] +) + +pl_batt_obj_nclr = pl_batt_obj_palette_builder.process(pl_batt_obj_palettes, extra_args: ['-bitdepth', '4', '-nopad']) +pl_batt_obj_nclr_pcmp = pl_batt_obj_palette_builder.process(pl_batt_obj_palettes_pcmp, extra_args: ['-fixsize', '-bitdepth', '4', '-nopad', '-pcmp']) diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000000.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000000.pal new file mode 100644 index 0000000000..93447325d6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000000.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +106 213 49 +65 65 65 +255 255 255 +205 205 205 +148 148 123 +82 123 189 +16 65 131 +41 49 65 +82 98 139 +255 213 82 +255 180 65 +230 98 115 +16 238 238 +32 156 164 +246 246 246 +0 0 0 +0 255 0 +0 0 0 +57 74 65 +222 106 90 +123 148 131 +255 255 222 +32 57 0 +197 189 115 +255 230 0 +90 213 131 +222 213 180 +82 106 98 +255 255 255 +115 255 172 +255 172 123 +74 65 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000001.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000001.pal new file mode 100644 index 0000000000..56d2100709 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000001.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +90 74 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 213 82 +139 230 172 +123 222 156 +98 213 131 +74 189 106 +32 164 65 +0 0 0 +230 197 98 +197 164 74 +148 123 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000002.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000002.pal new file mode 100644 index 0000000000..c0083ca20f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000002.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 180 +123 57 24 +49 0 0 +49 0 0 +49 0 0 +49 0 0 +180 164 57 +164 180 123 +148 172 106 +131 164 90 +106 148 74 +74 131 41 +49 0 0 +238 156 65 +213 131 49 +172 98 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000003.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000003.pal new file mode 100644 index 0000000000..5708f71320 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000003.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 131 255 +49 49 74 +0 0 41 +0 0 41 +0 0 41 +0 0 41 +98 139 115 +82 156 189 +65 148 172 +57 139 156 +41 123 131 +16 106 98 +0 0 41 +131 131 131 +115 106 106 +82 82 82 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000004.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000004.pal new file mode 100644 index 0000000000..7fe5767a74 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000004.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 106 255 +0 0 0 +0 0 0 +148 205 255 +123 189 255 +90 172 255 +90 156 255 +82 148 238 +74 131 213 +57 115 205 +32 115 189 +16 106 172 +0 106 148 +0 90 123 +0 65 106 +0 49 82 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000005.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000005.pal new file mode 100644 index 0000000000..a1d2251af5 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000005.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 106 255 +0 0 0 +0 0 0 +255 164 148 +255 139 115 +255 115 74 +238 106 82 +230 106 74 +213 98 65 +205 90 49 +189 74 49 +164 49 49 +148 32 57 +123 24 32 +98 8 16 +74 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000006.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000006.pal new file mode 100644 index 0000000000..ae42cc40d6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000006.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 106 255 +0 0 0 +0 0 0 +115 115 205 +98 98 197 +82 82 197 +57 57 189 +65 57 189 +57 49 172 +57 41 164 +41 41 148 +32 49 131 +24 57 115 +16 41 90 +8 24 74 +0 8 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000007.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000007.pal new file mode 100644 index 0000000000..5baab8190c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000007.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +131 106 32 +115 98 41 +180 222 164 +238 213 180 +238 222 189 +213 156 131 +222 205 164 +230 205 164 +222 197 164 +213 180 156 +205 205 164 +189 230 164 +156 189 115 +131 139 65 +98 82 24 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000008.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000008.pal new file mode 100644 index 0000000000..4ce5c07e2f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000008.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 255 164 +123 32 49 +115 32 49 +222 205 115 +238 180 139 +238 189 139 +213 131 131 +222 164 123 +230 164 131 +222 164 131 +213 156 131 +205 164 115 +230 205 115 +189 148 82 +139 65 57 +98 16 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000009.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000009.pal new file mode 100644 index 0000000000..3fe2794569 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000009.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 180 131 +24 24 82 +32 41 82 +123 164 148 +131 131 164 +139 139 164 +115 98 131 +123 123 156 +123 123 156 +123 115 148 +123 106 131 +123 131 139 +123 172 156 +82 123 131 +49 74 98 +16 24 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000010.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000010.pal new file mode 100644 index 0000000000..7e1e5170d7 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +115 90 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 189 255 +180 205 255 +180 213 255 +205 230 255 +222 238 255 +238 246 255 +255 255 255 +213 205 230 +156 139 180 +98 65 131 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000011.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000011.pal new file mode 100644 index 0000000000..fb633d1e2a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000011.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 139 180 +139 65 106 +41 0 0 +41 0 0 +41 0 0 +41 0 0 +197 131 180 +197 148 180 +197 156 180 +213 164 180 +230 172 180 +246 172 180 +255 180 180 +222 148 164 +172 98 131 +123 41 90 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000012.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000012.pal new file mode 100644 index 0000000000..151746340a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000012.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 123 238 +57 49 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 115 238 +98 123 238 +98 131 238 +115 139 238 +123 148 238 +131 148 238 +139 156 238 +115 123 222 +82 90 172 +41 32 115 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000013.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000013.pal new file mode 100644 index 0000000000..c9a71e4326 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000013.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +131 106 32 +180 156 139 +148 139 148 +131 123 131 +90 82 65 +131 131 123 +106 106 98 +98 90 82 +197 164 148 +172 148 115 +148 123 82 +131 106 57 +115 98 32 +82 74 32 +49 32 16 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000014.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000014.pal new file mode 100644 index 0000000000..737757db0b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000014.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +139 65 16 +189 123 82 +156 115 82 +139 98 74 +98 57 32 +139 106 65 +115 82 57 +106 65 49 +205 131 82 +180 115 65 +156 90 49 +139 74 32 +123 65 16 +98 49 16 +65 16 8 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000015.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000015.pal new file mode 100644 index 0000000000..c8f57e062f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000015.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +16 49 115 +82 90 156 +82 90 131 +74 82 115 +32 49 82 +65 82 115 +57 65 98 +49 49 82 +82 98 172 +65 82 148 +49 65 131 +32 57 115 +16 49 106 +16 32 82 +8 16 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000016.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000016.pal new file mode 100644 index 0000000000..54662085d3 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000016.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 238 246 +255 255 255 +238 230 238 +222 213 222 +205 189 205 +189 172 189 +156 139 156 +90 65 90 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000017.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000017.pal new file mode 100644 index 0000000000..efcc9748cc --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000017.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 148 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 180 180 +255 189 189 +238 172 180 +222 156 164 +205 139 156 +189 131 139 +156 106 115 +90 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000018.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000018.pal new file mode 100644 index 0000000000..5ce8355f9b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000018.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 115 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 139 180 +148 148 189 +139 131 180 +131 123 164 +115 106 156 +106 98 139 +90 82 115 +49 32 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000019.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000019.pal new file mode 100644 index 0000000000..72379f06ad --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000019.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 205 213 +230 222 230 +238 230 238 +222 213 222 +205 197 205 +189 172 189 +172 156 164 +139 123 131 +98 82 98 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000020.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000020.pal new file mode 100644 index 0000000000..72379f06ad --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000020.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 205 213 +230 222 230 +238 230 238 +222 213 222 +205 197 205 +189 172 189 +172 156 164 +139 123 131 +98 82 98 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000021.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000021.pal new file mode 100644 index 0000000000..72379f06ad --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000021.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 205 213 +230 222 230 +238 230 238 +222 213 222 +205 197 205 +189 172 189 +172 156 164 +139 123 131 +98 82 98 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000022.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000022.pal new file mode 100644 index 0000000000..94e99d4f73 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000022.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 189 123 +222 197 123 +230 205 123 +238 213 139 +246 222 156 +246 230 172 +197 180 123 +139 123 82 +90 65 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000023.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000023.pal new file mode 100644 index 0000000000..2bc0d955c6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000023.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 255 +57 0 0 +57 0 0 +57 0 0 +57 0 0 +57 0 0 +57 0 0 +222 148 123 +230 156 123 +238 164 123 +246 164 139 +255 172 156 +255 180 172 +213 139 123 +164 98 82 +123 49 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000024.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000024.pal new file mode 100644 index 0000000000..121fd9dff1 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000024.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 98 255 +32 0 65 +32 0 65 +32 0 65 +32 0 65 +32 0 65 +32 0 65 +148 90 156 +156 98 156 +164 98 156 +164 106 172 +172 106 180 +172 115 197 +139 90 156 +115 57 123 +82 32 90 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000025.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000025.pal new file mode 100644 index 0000000000..d8ea085601 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000025.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 139 131 +172 131 131 +164 123 123 +156 115 115 +148 106 106 +139 106 106 +131 98 98 +115 82 90 +106 65 74 +65 41 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000026.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000026.pal new file mode 100644 index 0000000000..5b64d03bbe --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000026.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 172 230 +41 0 0 +41 0 0 +41 0 0 +41 0 0 +41 0 0 +197 115 115 +189 106 115 +180 106 106 +172 98 98 +164 90 98 +164 90 98 +156 82 90 +139 65 82 +131 57 65 +98 32 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000027.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000027.pal new file mode 100644 index 0000000000..fc42e93aa2 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000027.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 172 238 +0 0 41 +0 0 41 +0 0 41 +0 0 41 +0 0 41 +148 123 139 +139 115 139 +131 106 139 +123 98 131 +115 90 123 +106 90 123 +106 82 115 +90 65 106 +82 57 98 +49 32 82 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000028.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000028.pal new file mode 100644 index 0000000000..b0788dfa7b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000028.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +74 65 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 90 148 +98 98 148 +82 82 148 +82 74 123 +82 74 98 +74 74 82 +57 57 74 +41 49 65 +16 32 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000029.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000029.pal new file mode 100644 index 0000000000..b0788dfa7b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000029.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +74 65 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 90 148 +98 98 148 +82 82 148 +82 74 123 +82 74 98 +74 74 82 +57 57 74 +41 49 65 +16 32 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000030.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000030.pal new file mode 100644 index 0000000000..b0788dfa7b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000030.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +74 65 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 90 148 +98 98 148 +82 82 148 +82 74 123 +82 74 98 +74 74 82 +57 57 74 +41 49 65 +16 32 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000031.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000031.pal new file mode 100644 index 0000000000..dcc5923cfe --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000031.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 197 255 +139 205 255 +115 197 255 +82 180 246 +238 213 180 +238 222 189 +213 156 131 +189 205 213 +230 205 164 +222 197 164 +213 180 156 +205 205 164 +189 230 164 +156 189 115 +131 139 65 +98 82 24 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000032.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000032.pal new file mode 100644 index 0000000000..45e88174fa --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000032.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 156 238 +172 164 238 +148 156 238 +123 139 230 +246 164 172 +246 172 180 +230 123 123 +205 164 197 +238 164 156 +230 156 156 +230 139 148 +222 164 156 +205 180 156 +180 148 106 +164 106 57 +139 65 16 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000033.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000033.pal new file mode 100644 index 0000000000..6382261414 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000033.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 115 238 +57 115 238 +49 115 238 +32 106 230 +106 123 172 +106 131 180 +98 90 123 +82 115 197 +106 115 156 +98 115 156 +98 106 148 +90 115 156 +82 131 156 +65 106 106 +57 82 57 +41 49 16 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000034.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000034.pal new file mode 100644 index 0000000000..da4d8e7c2b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000034.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 230 213 +213 238 230 +230 246 238 +205 230 222 +189 222 205 +156 205 189 +131 189 197 +90 164 172 +57 115 98 +32 74 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000035.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000035.pal new file mode 100644 index 0000000000..da4d8e7c2b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000035.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 230 213 +213 238 230 +230 246 238 +205 230 222 +189 222 205 +156 205 189 +131 189 197 +90 164 172 +57 115 98 +32 74 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000036.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000036.pal new file mode 100644 index 0000000000..da4d8e7c2b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000036.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 230 213 +213 238 230 +230 246 238 +205 230 222 +189 222 205 +156 205 189 +131 189 197 +90 164 172 +57 115 98 +32 74 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000037.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000037.pal new file mode 100644 index 0000000000..47d12bba4f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000037.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 197 +238 230 213 +246 238 230 +230 222 205 +222 205 180 +205 180 156 +197 197 131 +164 172 90 +115 90 57 +74 57 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000038.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000038.pal new file mode 100644 index 0000000000..47d12bba4f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000038.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 197 +238 230 213 +246 238 230 +230 222 205 +222 205 180 +205 180 156 +197 197 131 +164 172 90 +115 90 57 +74 57 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000039.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000039.pal new file mode 100644 index 0000000000..47d12bba4f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000039.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 197 +238 230 213 +246 238 230 +230 222 205 +222 205 180 +205 180 156 +197 197 131 +164 172 90 +115 90 57 +74 57 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000040.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000040.pal new file mode 100644 index 0000000000..e3cca78bcc --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000040.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 197 205 +238 213 222 +246 230 230 +230 205 213 +222 180 197 +205 156 172 +197 139 131 +172 106 90 +115 57 74 +74 32 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000041.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000041.pal new file mode 100644 index 0000000000..e3cca78bcc --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000041.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 197 205 +238 213 222 +246 230 230 +230 205 213 +222 180 197 +205 156 172 +197 139 131 +172 106 90 +115 57 74 +74 32 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000042.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000042.pal new file mode 100644 index 0000000000..e3cca78bcc --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000042.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 197 205 +238 213 222 +246 230 230 +230 205 213 +222 180 197 +205 156 172 +197 139 131 +172 106 90 +115 57 74 +74 32 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000043.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000043.pal new file mode 100644 index 0000000000..5909572ef6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000043.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 222 +213 213 238 +230 230 246 +205 205 230 +189 180 222 +156 156 205 +164 131 197 +139 90 172 +65 57 115 +32 32 74 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000044.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000044.pal new file mode 100644 index 0000000000..5909572ef6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000044.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 222 +213 213 238 +230 230 246 +205 205 230 +189 180 222 +156 156 205 +164 131 197 +139 90 172 +65 57 115 +32 32 74 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000045.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000045.pal new file mode 100644 index 0000000000..5909572ef6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000045.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 222 +213 213 238 +230 230 246 +205 205 230 +189 180 222 +156 156 205 +164 131 197 +139 90 172 +65 57 115 +32 32 74 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000046.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000046.pal new file mode 100644 index 0000000000..c7db4c1ce4 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000046.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 255 +139 131 172 +156 148 180 +156 156 189 +213 213 222 +197 197 213 +180 180 205 +172 164 197 +213 172 213 +222 197 222 +238 213 238 +246 238 246 +255 255 255 +222 213 230 +180 180 205 +82 82 115 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000047.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000047.pal new file mode 100644 index 0000000000..c7db4c1ce4 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000047.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 255 +139 131 172 +156 148 180 +156 156 189 +213 213 222 +197 197 213 +180 180 205 +172 164 197 +213 172 213 +222 197 222 +238 213 238 +246 238 246 +255 255 255 +222 213 230 +180 180 205 +82 82 115 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000048.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000048.pal new file mode 100644 index 0000000000..c7db4c1ce4 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000048.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 255 +139 131 172 +156 148 180 +156 156 189 +213 213 222 +197 197 213 +180 180 205 +172 164 197 +213 172 213 +222 197 222 +238 213 238 +246 238 246 +255 255 255 +222 213 230 +180 180 205 +82 82 115 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000049.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000049.pal new file mode 100644 index 0000000000..652d0ca272 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000049.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000050.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000050.pal new file mode 100644 index 0000000000..652d0ca272 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000050.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000051.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000051.pal new file mode 100644 index 0000000000..652d0ca272 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000051.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000052.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000052.pal new file mode 100644 index 0000000000..c9edd11d27 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000052.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 131 +238 230 139 +246 238 139 +222 213 131 +197 189 115 +172 156 106 +148 131 98 +115 106 90 +90 74 74 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000053.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000053.pal new file mode 100644 index 0000000000..c9edd11d27 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000053.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 131 +238 230 139 +246 238 139 +222 213 131 +197 189 115 +172 156 106 +148 131 98 +115 106 90 +90 74 74 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000054.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000054.pal new file mode 100644 index 0000000000..c9edd11d27 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000054.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 131 +238 230 139 +246 238 139 +222 213 131 +197 189 115 +172 156 106 +148 131 98 +115 106 90 +90 74 74 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000055.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000055.pal new file mode 100644 index 0000000000..d563c1b8bc --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000055.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 164 172 +98 189 197 +106 197 205 +98 180 189 +98 156 164 +90 131 148 +82 115 123 +74 90 106 +74 65 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000056.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000056.pal new file mode 100644 index 0000000000..d563c1b8bc --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000056.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 164 172 +98 189 197 +106 197 205 +98 180 189 +98 156 164 +90 131 148 +82 115 123 +74 90 106 +74 65 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000057.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000057.pal new file mode 100644 index 0000000000..d563c1b8bc --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000057.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 164 172 +98 189 197 +106 197 205 +98 180 189 +98 156 164 +90 131 148 +82 115 123 +74 90 106 +74 65 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000058.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000058.pal new file mode 100644 index 0000000000..740e758f47 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000058.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 205 +255 213 255 +255 230 255 +255 189 230 +255 148 197 +222 131 172 +180 106 148 +139 90 115 +106 65 90 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000059.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000059.pal new file mode 100644 index 0000000000..740e758f47 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000059.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 205 +255 213 255 +255 230 255 +255 189 230 +255 148 197 +222 131 172 +180 106 148 +139 90 115 +106 65 90 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000060.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000060.pal new file mode 100644 index 0000000000..740e758f47 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000060.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 205 +255 213 255 +255 230 255 +255 189 230 +255 148 197 +222 131 172 +180 106 148 +139 90 115 +106 65 90 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000061.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000061.pal new file mode 100644 index 0000000000..5dda77425c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000061.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 172 +131 222 180 +131 230 189 +123 205 172 +115 180 156 +106 156 139 +90 123 115 +82 98 98 +74 74 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000062.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000062.pal new file mode 100644 index 0000000000..5dda77425c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000062.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 172 +131 222 180 +131 230 189 +123 205 172 +115 180 156 +106 156 139 +90 123 115 +82 98 98 +74 74 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000063.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000063.pal new file mode 100644 index 0000000000..5dda77425c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000063.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 172 +131 222 180 +131 230 189 +123 205 172 +115 180 156 +106 156 139 +90 123 115 +82 98 98 +74 74 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000064.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000064.pal new file mode 100644 index 0000000000..c27d83a5e3 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000064.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 255 246 +246 255 255 +255 255 255 +238 255 255 +213 255 246 +189 255 238 +164 246 230 +131 180 180 +98 115 123 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000065.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000065.pal new file mode 100644 index 0000000000..c27d83a5e3 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000065.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 255 246 +246 255 255 +255 255 255 +238 255 255 +213 255 246 +189 255 238 +164 246 230 +131 180 180 +98 115 123 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000066.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000066.pal new file mode 100644 index 0000000000..c27d83a5e3 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000066.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 255 246 +246 255 255 +255 255 255 +238 255 255 +213 255 246 +189 255 238 +164 246 230 +131 180 180 +98 115 123 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000067.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000067.pal new file mode 100644 index 0000000000..652d0ca272 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000067.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000068.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000068.pal new file mode 100644 index 0000000000..652d0ca272 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000068.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000069.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000069.pal new file mode 100644 index 0000000000..652d0ca272 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000069.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000070.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000070.pal new file mode 100644 index 0000000000..a6d3d14091 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000070.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +172 172 189 +180 180 189 +189 189 197 +255 255 255 +222 222 205 +197 197 197 +139 139 156 +222 238 238 +246 246 246 +156 156 172 +0 0 0 +205 205 205 +82 82 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000071.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000071.pal new file mode 100644 index 0000000000..1e04468236 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000071.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 180 238 +172 172 148 +41 49 41 +98 74 57 +222 222 222 +0 0 0 +24 197 32 +189 115 0 +238 172 0 +172 49 16 +255 65 16 +24 98 189 +65 148 230 +222 65 205 +255 255 255 +106 115 90 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000072.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000072.pal new file mode 100644 index 0000000000..c52c8b72b2 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000072.pal @@ -0,0 +1,115 @@ +JASC-PAL +0100 +112 +123 131 255 +139 139 148 +172 172 189 +255 255 255 +57 49 49 +255 148 131 +255 82 57 +164 65 123 +205 205 213 +82 82 82 +222 139 164 +189 82 98 +131 74 74 +0 0 0 +139 139 139 +123 123 123 +123 131 255 +139 139 148 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +255 106 106 +115 115 115 +164 65 82 +189 106 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +131 131 131 +106 106 106 +98 98 205 +255 255 255 +238 213 213 +90 32 32 +255 255 255 +238 230 189 +98 65 0 +255 255 255 +213 238 213 +32 74 24 +255 255 255 +205 205 230 +16 32 90 +0 0 0 +0 0 0 +172 230 189 +98 98 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 131 +115 115 106 +32 32 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +123 131 255 +57 65 57 +115 139 115 +139 106 16 +255 230 8 +180 65 0 +255 131 0 +148 0 32 +255 106 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 82 98 +255 255 255 +255 255 255 +205 205 205 +0 0 0 +172 172 172 +148 148 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +123 131 255 +255 255 255 +238 213 213 +90 32 32 +255 255 255 +205 205 230 +16 32 90 +0 57 255 +106 205 255 +255 0 32 +255 156 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000073.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000073.pal new file mode 100644 index 0000000000..1a2567d257 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000073.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 0 0 +222 0 0 +98 41 246 +139 8 41 +197 0 0 +0 0 0 +255 197 180 +255 131 131 +197 106 98 +156 74 65 +148 139 205 +0 0 0 +106 90 156 +106 74 82 +49 41 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000075.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000075.pal new file mode 100644 index 0000000000..98addad595 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000075.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +8 16 16 +41 49 49 +106 115 115 +172 180 180 +205 213 213 +24 41 82 +74 82 82 +139 148 148 +57 65 65 +238 255 255 +90 98 98 +24 32 32 +123 131 131 +189 197 197 +222 230 230 +156 164 164 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000079.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000079.pal new file mode 100644 index 0000000000..5bd5fcccfa --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000079.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 131 255 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 65 41 +156 32 82 +213 16 90 +148 148 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000080.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000080.pal new file mode 100644 index 0000000000..c0b150c7af --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000080.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +255 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000081.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000081.pal new file mode 100644 index 0000000000..dcf7b8cb67 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000081.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 180 238 +106 156 74 +156 189 131 +205 222 197 +255 255 255 +24 32 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +49 98 0 +41 90 0 +255 255 255 +49 115 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000082.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000082.pal new file mode 100644 index 0000000000..1b12ee7b6a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000082.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +123 156 115 +74 74 98 +90 98 115 +255 255 255 +156 197 246 +131 180 246 +90 131 213 +65 106 156 +230 205 197 +98 255 98 +24 197 32 +197 172 148 +139 98 74 +74 49 0 +255 222 0 +238 172 0 +0 0 0 +255 255 255 +90 98 115 +90 131 213 +156 197 246 +255 49 49 +255 115 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000083.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000083.pal new file mode 100644 index 0000000000..ed023b25a4 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000083.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 189 156 +98 139 213 +197 57 57 +246 106 74 +57 65 82 +57 98 139 +255 222 90 +123 172 222 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000084.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000084.pal new file mode 100644 index 0000000000..e5acd6f1d2 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000084.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 189 156 +197 106 156 +197 57 57 +246 106 74 +57 65 82 +82 98 139 +255 222 90 +238 148 197 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000085.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000085.pal new file mode 100644 index 0000000000..19bee2fb03 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000085.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +205 189 156 +139 189 106 +197 115 57 +255 148 74 +82 90 106 +131 148 156 +255 222 123 +189 222 156 +205 205 222 +197 164 115 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000086.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000086.pal new file mode 100644 index 0000000000..df198e5fe9 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000086.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 189 156 +82 123 90 +197 57 57 +255 238 172 +57 65 82 +90 98 115 +172 205 148 +90 172 106 +205 205 222 +148 180 123 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000087.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000087.pal new file mode 100644 index 0000000000..ecafecad0d --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000087.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 189 156 +98 106 139 +74 82 115 +106 156 205 +57 65 82 +57 82 115 +82 139 189 +123 131 164 +255 222 115 +65 106 156 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000088.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000088.pal new file mode 100644 index 0000000000..fe9aeb863a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000088.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 189 156 +41 41 49 +197 57 57 +255 238 172 +65 65 74 +98 98 115 +255 222 90 +222 98 156 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +246 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000089.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000089.pal new file mode 100644 index 0000000000..efe8d27a8d --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000089.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 189 156 +98 139 213 +189 74 65 +246 82 82 +57 65 82 +57 98 139 +255 222 90 +123 172 222 +205 205 222 +205 156 57 +123 65 65 +205 148 123 +230 189 164 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000090.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000090.pal new file mode 100644 index 0000000000..d6fe59a828 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000090.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 189 156 +180 65 115 +197 57 57 +255 238 172 +57 65 82 +82 98 139 +255 222 90 +222 98 156 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000091.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000091.pal new file mode 100644 index 0000000000..4a62092d92 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000091.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 65 41 +156 32 82 +213 16 90 +148 148 164 +0 0 0 +0 0 0 +213 16 90 +148 148 164 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000092.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000092.pal new file mode 100644 index 0000000000..d1b94f87f2 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000092.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 74 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +189 180 255 +139 115 238 +189 74 139 +98 74 172 +148 148 164 +98 57 106 +238 65 164 +255 123 205 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000093.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000093.pal new file mode 100644 index 0000000000..66c2880f14 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000093.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +238 246 205 +246 230 106 +156 32 82 +180 172 90 +148 148 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000094.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000094.pal new file mode 100644 index 0000000000..992d603fd6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000094.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +131 164 246 +74 106 246 +131 32 65 +65 90 213 +148 148 164 +197 0 0 +255 156 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000095.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000095.pal new file mode 100644 index 0000000000..886c041b0f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000095.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 74 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +189 197 139 +148 148 41 +156 32 82 +98 115 41 +148 148 164 +180 115 82 +123 90 57 +0 98 0 +230 197 164 +139 156 123 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000096.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000096.pal new file mode 100644 index 0000000000..dda3d29b80 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000096.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +139 222 230 +32 180 205 +156 32 82 +74 131 180 +148 148 164 +82 82 98 +74 131 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000097.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000097.pal new file mode 100644 index 0000000000..edfd975771 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000097.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +189 205 238 +49 197 255 +156 32 82 +90 156 246 +148 148 164 +32 82 180 +32 123 205 +164 222 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000098.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000098.pal new file mode 100644 index 0000000000..bbf21fc04b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000098.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 74 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +139 189 123 +49 156 41 +156 32 82 +65 106 8 +148 148 164 +0 0 0 +164 131 0 +180 164 123 +131 106 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000099.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000099.pal new file mode 100644 index 0000000000..8a88c0fc3a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000099.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 98 41 +156 32 82 +213 90 90 +148 148 164 +246 230 0 +222 180 0 +246 230 205 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000100.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000100.pal new file mode 100644 index 0000000000..9b1c80a645 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000100.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 65 41 +156 32 82 +213 16 90 +148 148 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000101.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000101.pal new file mode 100644 index 0000000000..29ac4242cd --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000101.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 164 139 +255 82 0 +156 32 82 +213 90 90 +148 148 164 +246 230 0 +222 180 0 +246 230 205 +180 41 41 +255 255 205 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000102.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000102.pal new file mode 100644 index 0000000000..3c18251456 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000102.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 139 41 +156 32 0 +213 49 32 +148 148 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000103.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000103.pal new file mode 100644 index 0000000000..d3aaea663c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000103.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +74 139 222 +139 213 255 +213 16 90 +148 148 164 +0 0 0 +255 222 0 +213 172 0 +74 106 164 +255 246 189 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000104.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000104.pal new file mode 100644 index 0000000000..e6fa8bbb0f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000104.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +164 246 139 +49 49 49 +246 139 139 +49 213 57 +156 65 0 +197 189 0 +115 115 139 +255 82 0 +49 156 57 +255 205 255 +255 164 0 +65 65 74 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000105.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000105.pal new file mode 100644 index 0000000000..e35f56927c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000105.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 57 230 +115 98 180 +255 197 230 +255 164 205 +148 148 164 +255 246 213 +230 148 172 +213 197 164 +189 189 255 +115 123 222 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000106.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000106.pal new file mode 100644 index 0000000000..1de8248d61 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000106.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 65 41 +8 255 82 +205 32 41 +131 123 139 +90 90 90 +164 32 41 +246 213 197 +123 32 41 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000107.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000107.pal new file mode 100644 index 0000000000..940c44d81c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000107.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 106 156 +82 82 98 +213 172 82 +255 197 90 +49 49 49 +205 197 172 +246 139 41 +41 82 189 +49 115 246 +148 148 164 +172 106 41 +255 246 213 +255 115 180 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000108.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000108.pal new file mode 100644 index 0000000000..6eed278fb2 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000108.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 189 156 +82 82 98 +230 213 189 +238 222 189 +49 49 49 +205 197 172 +246 139 41 +189 164 148 +49 115 246 +148 148 164 +172 106 41 +255 255 255 +255 115 180 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000109.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000109.pal new file mode 100644 index 0000000000..41c968b088 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000109.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 189 156 +82 82 98 +139 106 82 +148 98 57 +49 49 49 +205 197 172 +246 139 41 +106 74 57 +49 115 246 +148 148 164 +172 106 41 +180 148 106 +255 115 180 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000110.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000110.pal new file mode 100644 index 0000000000..2e0c228655 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000110.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 131 255 +164 164 172 +213 213 222 +255 255 255 +57 49 49 +41 82 41 +32 115 32 +16 148 24 +8 180 16 +0 213 8 +131 131 139 +255 106 106 +222 57 57 +213 115 139 +189 90 106 +156 98 98 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000111.pal b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000111.pal new file mode 100644 index 0000000000..30bf18950e --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000111.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 197 106 +82 82 90 +164 164 172 +238 32 16 +255 172 189 +0 115 255 +123 189 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +255 189 197 +222 222 222 +148 213 255 +255 255 255 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/meson.build b/res/battle/graphic/pl_batt_obj/prebuilt/meson.build new file mode 100644 index 0000000000..b7e1b01519 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/prebuilt/meson.build @@ -0,0 +1,124 @@ +pl_batt_obj_prebuilt_raw = files( + 'pl_batt_obj_00000077.NCER', + 'pl_batt_obj_00000078.NANR', + 'pl_batt_obj_00000113.NCER', + 'pl_batt_obj_00000114.NANR' +) + +pl_batt_obj_prebuilt_lz = files( + 'pl_batt_obj_00000115.NANR', + 'pl_batt_obj_00000116.NCER', + 'pl_batt_obj_00000118.NANR', + 'pl_batt_obj_00000119.NCER', + 'pl_batt_obj_00000122.NCER', + 'pl_batt_obj_00000123.NANR', + 'pl_batt_obj_00000125.NCER', + 'pl_batt_obj_00000126.NANR', + 'pl_batt_obj_00000128.NCER', + 'pl_batt_obj_00000129.NANR', + 'pl_batt_obj_00000131.NCER', + 'pl_batt_obj_00000132.NANR', + 'pl_batt_obj_00000177.NANR', + 'pl_batt_obj_00000178.NCER', + 'pl_batt_obj_00000180.NANR', + 'pl_batt_obj_00000181.NCER', + 'pl_batt_obj_00000183.NANR', + 'pl_batt_obj_00000184.NCER', + 'pl_batt_obj_00000186.NANR', + 'pl_batt_obj_00000187.NCER', + 'pl_batt_obj_00000189.NANR', + 'pl_batt_obj_00000190.NCER', + 'pl_batt_obj_00000192.NANR', + 'pl_batt_obj_00000193.NCER', + 'pl_batt_obj_00000195.NANR', + 'pl_batt_obj_00000196.NCER', + 'pl_batt_obj_00000198.NANR', + 'pl_batt_obj_00000199.NCER', + 'pl_batt_obj_00000201.NANR', + 'pl_batt_obj_00000202.NCER', + 'pl_batt_obj_00000204.NCER', + 'pl_batt_obj_00000206.NANR', + 'pl_batt_obj_00000207.NCER', + 'pl_batt_obj_00000209.NANR', + 'pl_batt_obj_00000210.NCER', + 'pl_batt_obj_00000212.NANR', + 'pl_batt_obj_00000213.NCER', + 'pl_batt_obj_00000215.NANR', + 'pl_batt_obj_00000216.NCER', + 'pl_batt_obj_00000218.NANR', + 'pl_batt_obj_00000242.NCER', + 'pl_batt_obj_00000243.NANR', + 'pl_batt_obj_00000248.NCER', + 'pl_batt_obj_00000249.NANR', + 'pl_batt_obj_00000251.NCER', + 'pl_batt_obj_00000252.NANR', + 'pl_batt_obj_00000254.NCER', + 'pl_batt_obj_00000255.NANR', + 'pl_batt_obj_00000257.NCER', + 'pl_batt_obj_00000258.NANR', + 'pl_batt_obj_00000267.NCER', + 'pl_batt_obj_00000268.NCER', + 'pl_batt_obj_00000269.NCER', + 'pl_batt_obj_00000270.NCER', + 'pl_batt_obj_00000271.NCER', + 'pl_batt_obj_00000272.NCER', + 'pl_batt_obj_00000273.NCER', + 'pl_batt_obj_00000274.NCER', + 'pl_batt_obj_00000275.NANR', + 'pl_batt_obj_00000276.NANR', + 'pl_batt_obj_00000277.NANR', + 'pl_batt_obj_00000278.NANR', + 'pl_batt_obj_00000279.NANR', + 'pl_batt_obj_00000280.NANR', + 'pl_batt_obj_00000281.NANR', + 'pl_batt_obj_00000282.NANR', + 'pl_batt_obj_00000283.NANR', + 'pl_batt_obj_00000284.NCER', + 'pl_batt_obj_00000286.NANR', + 'pl_batt_obj_00000287.NCER', + 'pl_batt_obj_00000289.NANR', + 'pl_batt_obj_00000290.NCER', + 'pl_batt_obj_00000292.NANR', + 'pl_batt_obj_00000293.NCER', + 'pl_batt_obj_00000295.NANR', + 'pl_batt_obj_00000296.NCER', + 'pl_batt_obj_00000298.NANR', + 'pl_batt_obj_00000299.NCER', + 'pl_batt_obj_00000301.NANR', + 'pl_batt_obj_00000302.NCER', + 'pl_batt_obj_00000304.NANR', + 'pl_batt_obj_00000305.NCER', + 'pl_batt_obj_00000307.NANR', + 'pl_batt_obj_00000308.NCER', + 'pl_batt_obj_00000310.NANR', + 'pl_batt_obj_00000311.NCER', + 'pl_batt_obj_00000313.NANR', + 'pl_batt_obj_00000314.NCER', + 'pl_batt_obj_00000316.NANR', + 'pl_batt_obj_00000317.NCER', + 'pl_batt_obj_00000319.NANR', + 'pl_batt_obj_00000320.NCER', + 'pl_batt_obj_00000322.NANR', + 'pl_batt_obj_00000323.NCER', + 'pl_batt_obj_00000325.NANR', + 'pl_batt_obj_00000326.NCER', + 'pl_batt_obj_00000328.NANR', + 'pl_batt_obj_00000329.NCER', + 'pl_batt_obj_00000331.NANR', + 'pl_batt_obj_00000332.NCER', + 'pl_batt_obj_00000334.NANR', + 'pl_batt_obj_00000335.NCER', + 'pl_batt_obj_00000337.NANR', + 'pl_batt_obj_00000338.NCER', + 'pl_batt_obj_00000341.NCER', + 'pl_batt_obj_00000342.NANR' +) + +copy_prog = find_program('cp') +pl_batt_obj_prebuilt_builder = generator(copy_prog, + output: '@PLAINNAME@', + arguments: ['@INPUT@', '@OUTPUT@'] +) + +pl_batt_obj_prebuilt_copy = pl_batt_obj_prebuilt_builder.process(pl_batt_obj_prebuilt_raw) +pl_batt_obj_prebuilt_compressed = pl_batt_obj_lz_builder.process(pl_batt_obj_prebuilt_lz) \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000077.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000077.NCER new file mode 100644 index 0000000000000000000000000000000000000000..ce7759de1945b7640bdef19ecdb2c2340e88c503 GIT binary patch literal 135 zcmWG?b@u!JkAbnBfq_AQftkVE$<;Xo$YumW2`~*LkN_J49|wr50faaH10lnWgA5Ee z8YCJN7=8dr6$S~18;u%3@<*c%&;$tw0|p-_M;~#h8P2IWIgWXmxv2&WArY>jJWyc( DzS$b6 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000078.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000078.NANR new file mode 100644 index 0000000000000000000000000000000000000000..a066aec11a353f778d21c772579e731d195ed1d8 GIT binary patch literal 111 zcmWIYbM*WFkAX3tfq_AQftkVE&&kmS$YumW2_UTj#0EeN1B_q>BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdI_ cPL4j}P!-OpIXRAbnYpP33?UJ&p*&Dw03~1#_y7O^ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000122.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000122.NCER new file mode 100644 index 0000000000000000000000000000000000000000..db89a58eb293eca715658d7dbf89a1d63edcbd94 GIT binary patch literal 109 zcmWG?b@u!JkAX3lfq_AQftkVE$<^5k$Yum$2`CMu;DDKd3(WrEaHEld;fKSIMiz!2 i3=$3;3_ebdKH^Yy&Z#*$j(M56sRj%o5w4*;P+BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIGILW67(yakLwTUW0G#Cw!~g&Q literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000180.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000180.NANR new file mode 100644 index 0000000000000000000000000000000000000000..bcd5952e3ffabd4d32958196bbf14243ffac7bf2 GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wS|-f(Za=0fzVc zKztS;%>ty^fHWJF=77>56PbYKvoM@F$&F7+4vE zptKy2{=x7AXv7bPAB>D(k_k*Q1I0NQSio#nFq@6R$H~!09H;{XoKtgh9P=`BQw?qEjbw3 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000183.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000183.NANR new file mode 100644 index 0000000000000000000000000000000000000000..301d2daef934aa06e2c3f66458f8d127ed86bc9c GIT binary patch literal 159 zcmWIYbM*WFkAZPM0|SEq12coSpOa$_kj==z#vlQtHGnt*h+%*Y%wS|-f(d}>_xnJ6 z7KZoxSfDgW9f;2Xqy>O97m#KH(jb$WfcCI3url~KIr@kL#X-P1H7Cb0FEcmQfFUHp KHIxS;$^Zbpt`>^` literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000184.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000184.NCER new file mode 100644 index 0000000000000000000000000000000000000000..711cd0e1fed73def5646c1f4a42af19fcbfe25ce GIT binary patch literal 227 zcmWG?b@u!JkAd+q0|SEq12coSldJOvAe)VWkwF4TGXgOh-~jU*7#jZ9|F36cU`!jF!(q*`iKMdgMf2tPL5+cD9Bn6003D&GzBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdI&GzG}!VeoNs^l<^I0|9Oz76W2MAa+j8$#Klf%uO{wFbxq* RBLvf!Atb^z6l6CD006_{Fl7J$ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000206.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000206.NANR new file mode 100644 index 0000000000000000000000000000000000000000..2ea3db82778bd35fc441fee413c134dab541f83d GIT binary patch literal 240 zcmWIYbM*WFkAd+60|SEq12coSpOfPRAe#jUC4h7U5LW;(3^0Njj0{Xr0c1W0Pz;$b zfW`-z2Ldb%@At7lX^?_)SMj0 ayv*EG0|e6$!8AfJjTu5BTth+Tg8%^5{3Wme literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000207.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000207.NCER new file mode 100644 index 0000000000000000000000000000000000000000..b2e993a397ebf33b1d703433aa8759aff1ca2910 GIT binary patch literal 216 zcmWG?b@u!JkAd+90|SEq12coSldE$Dkj=ut$RGiv(E%d^8wW^C00=+)|L`BgXG7!j zpz(!}_#YTPG%_%NNT7ZosQ@Mo7<`-@eO!R*K!6*F#ei55h@De&avbwAb5jivOhW|I Q2*EUF2#IhF1=$S(031m%SpWb4 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000209.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000209.NANR new file mode 100644 index 0000000000000000000000000000000000000000..2ea3db82778bd35fc441fee413c134dab541f83d GIT binary patch literal 240 zcmWIYbM*WFkAd+60|SEq12coSpOfPRAe#jUC4h7U5LW;(3^0Njj0{Xr0c1W0Pz;$b zfW`-z2Ldb%@At7lX^?_)SMj0 ayv*EG0|e6$!8AfJjTu5BTth+Tg8%^5{3Wme literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000210.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000210.NCER new file mode 100644 index 0000000000000000000000000000000000000000..f7d66b4a46af23c5fd7ede6066472eadb26c6940 GIT binary patch literal 199 zcmWG?b@u!JkAd+x0|SEq12coSldJO-Ae#}0C4d+m2r)>4g+4R{I4}r&XjtLMBB0@5 z;J^VS1sr&QB+win`GHYL-~x~>0we_-#DJuMgA|bbz$hmm0Mx4>Z~;iF099UaBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdI literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000215.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000215.NANR new file mode 100644 index 0000000000000000000000000000000000000000..a066aec11a353f778d21c772579e731d195ed1d8 GIT binary patch literal 111 zcmWIYbM*WFkAX3tfq_AQftkVE&&kmS$YumW2_UTj#0EeN1B_q>BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdI890VL#1b#3W zFmMPkG#EH=3fusS@B+yXj)DR=fFhzmH5VKufoe`L$^zA#aFhdzpKw$Hs=45(Cg9`b b=pzob#5px5$1yK6H`Rb4B*Hb62PzBzN_8Mv literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000218.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000218.NANR new file mode 100644 index 0000000000000000000000000000000000000000..a066aec11a353f778d21c772579e731d195ed1d8 GIT binary patch literal 111 zcmWIYbM*WFkAX3tfq_AQftkVE&&kmS$YumW2_UTj#0EeN1B_q>BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIGILW67(yakLwTUW0G#Cw!~g&Q literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000243.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000243.NANR new file mode 100644 index 0000000000000000000000000000000000000000..a066aec11a353f778d21c772579e731d195ed1d8 GIT binary patch literal 111 zcmWIYbM*WFkAX3tfq_AQftkVE&&kmS$YumW2_UTj#0EeN1B_q>BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdISXxPD8%67%tc|Ir~NHK5$KW0M04h-+V zzpxu}%}wqssgELxD4|bAFT0 zW8u>CM0_huJwJ+Hg#7({U+0933e(gM!?eyiB|TG-`@1IVwDe4FncN1_GZp>^Q{(iU kne)DVfF|G!yTIf^eP8@d&T`&91u0iAzZ_5c6? literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000254.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000254.NCER new file mode 100644 index 0000000000000000000000000000000000000000..eacfdfa5f4af073b3f6c3b12263e2837f53f0b3a GIT binary patch literal 103 zcmWG?b@u!JkAX3rfq_AQftkVE$<^5e$Yum$2`CMu;DCui2+V%KaNr;V!vh9}0}2d2 cPL4j}P!-OpIXRAbnYpP33?UJ&p*&Dw014XBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdI-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000268.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000268.NCER new file mode 100644 index 0000000000000000000000000000000000000000..7143524813b90c410a0276e5f5bb412415a6a396 GIT binary patch literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000269.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000269.NCER new file mode 100644 index 0000000000000000000000000000000000000000..7143524813b90c410a0276e5f5bb412415a6a396 GIT binary patch literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000270.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000270.NCER new file mode 100644 index 0000000000000000000000000000000000000000..7143524813b90c410a0276e5f5bb412415a6a396 GIT binary patch literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000271.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000271.NCER new file mode 100644 index 0000000000000000000000000000000000000000..7143524813b90c410a0276e5f5bb412415a6a396 GIT binary patch literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000272.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000272.NCER new file mode 100644 index 0000000000000000000000000000000000000000..7143524813b90c410a0276e5f5bb412415a6a396 GIT binary patch literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000273.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000273.NCER new file mode 100644 index 0000000000000000000000000000000000000000..7143524813b90c410a0276e5f5bb412415a6a396 GIT binary patch literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000274.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000274.NCER new file mode 100644 index 0000000000000000000000000000000000000000..7143524813b90c410a0276e5f5bb412415a6a396 GIT binary patch literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000275.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000275.NANR new file mode 100644 index 0000000000000000000000000000000000000000..dbf426d4c77f62991d6d0e62628d278d9786b56f GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000276.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000276.NANR new file mode 100644 index 0000000000000000000000000000000000000000..dbf426d4c77f62991d6d0e62628d278d9786b56f GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000277.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000277.NANR new file mode 100644 index 0000000000000000000000000000000000000000..dbf426d4c77f62991d6d0e62628d278d9786b56f GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000278.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000278.NANR new file mode 100644 index 0000000000000000000000000000000000000000..dbf426d4c77f62991d6d0e62628d278d9786b56f GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000279.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000279.NANR new file mode 100644 index 0000000000000000000000000000000000000000..dbf426d4c77f62991d6d0e62628d278d9786b56f GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000280.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000280.NANR new file mode 100644 index 0000000000000000000000000000000000000000..dbf426d4c77f62991d6d0e62628d278d9786b56f GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000281.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000281.NANR new file mode 100644 index 0000000000000000000000000000000000000000..dbf426d4c77f62991d6d0e62628d278d9786b56f GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000282.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000282.NANR new file mode 100644 index 0000000000000000000000000000000000000000..dbf426d4c77f62991d6d0e62628d278d9786b56f GIT binary patch literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000283.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000283.NANR new file mode 100644 index 0000000000000000000000000000000000000000..891de6dba49d650acfa95e806377e1f7f8ba8cf4 GIT binary patch literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000284.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000284.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000287.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000287.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000290.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000290.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000293.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000293.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000296.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000296.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000299.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000299.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000302.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000302.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000305.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000305.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000308.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000308.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000311.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000311.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000314.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000314.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000317.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000317.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672g%?71G`a$AcP?`ry^Fe7K#lQuW7l6`2K-vh%XJ7!?$;`mQz{Y)nM7V~6YyklPmqH{{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000320.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000320.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672g%?71G`a$AcP?`ry^Fe7K#lQuW7l6`2K-vh%XJ7!?$;`mQz{Y)nM7V~6YyklPmqH{{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000323.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000323.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672g%?71G`a$AcP?`ry^Fe7K#lQuW7l6`2K-vh%XJ7!?$;`mQz{Y)nM7V~6YyklPmqH{{ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000326.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000326.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000329.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000329.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%672Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000332.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000332.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%67fXrZK@NshVQ3DAA0XGmkr{?51=4Ixl8X%a43?UJ& Kp*&zU3=9CLJQ(W$ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000335.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000335.NCER new file mode 100644 index 0000000000000000000000000000000000000000..1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424 GIT binary patch literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%67Rq@W|KH;hNG{h=I4*v{y0rl+V8dk)h2JHBU9i9dK>jZaY?n@4 zyz(M1$Q|Kj;Z@=E+|~Q*!W+Vy!rQ`o!iT~G;TOWk!Y9J-gwKTE3r~eV3x5&*D*R3O zyYSBycfec!LZ9Im%?bc?_h-d($Ta}5#9U)KOxz%zZ!pWuEoOyTWo|QTOpm$4++)_6 zKJ$RtU>-7$m`!GjdCbK9DHV5+e%wVuj2l$TWPn^G=g2I<9jZ*z%tF)5Qqv45n(-CQ zC^dvpphqA0wp5$gHSB%t7Iq(-Hh+aZ#SZ6bs-GSn=K~Y_CiYBhn|NYk$HY?;yC$B& LWE$Pj&rkISD&*s? literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000342.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000342.NANR new file mode 100644 index 0000000000000000000000000000000000000000..ed9257d8de88176c5f0c26bd642f4568f8a58697 GIT binary patch literal 815 zcmZ9KK~BOz7=>Rgq5@(?L?y;AIFR_Yjl3x{hYC2EE*$Y$yhd4jP4t_ z=c~qTwG@L@6$B4jlcr3nCD!`vl8%Jte}Wx6p%-brz^q+Dp*GuYbarrXKg&* zVpUnaZrpq0K5pb$&igLQd26w{tXo!}bu}0ci&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?tK3ba4!kn3~#e z$alnmgC+CQv(OlBO}+p7o2q^?rWE@Lsw+2t@aWE&sD9dRM!yG8s*tY@j8+H7od zB(OE*v4Km-%bO9$CJL6sIvJO^>}mfH{6~2Qr`wKwoAeSn8d3vR1n!X&`+PU$=#lqd be>2~m+WgdG_rhmDn;AS^{an^LB{Ts5`6OTu literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/contest_icon_cool.png b/res/battle/graphic/pl_batt_obj/sprites/contest_icon_cool.png new file mode 100644 index 0000000000000000000000000000000000000000..cf1b47fa1dcb5e95364d7f3a64465ebdb1673a89 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zo;hrvzArezt`!@8O<~Y1{I3w@=JHL%-9m~CopPBC+nCp9kMc}36vm+|qYGD`qtV5PR<7unNJ(wuh zulpjuL&l4Bt5gj4a@K?s?Xs2kQf!2OKmX1BQrLS^XnW2&pcM?Bu6{1-oD!Mi&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?oxiba4!kn3~$J zE!5z^;jpr*$mEUGR!LcZw?`Zs7DyamZ#6&6zraYglef%Ar-4=6Ywi;5m6w#Qx;xcW zWSVZUR3&iKw0a31nm^&rr7605RktnR{qEAI`*ef$b?r0dkN(u!Gr09k{H2nuX8^Q~ N!PC{xWt~$(698I6R1*LI literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/contest_icon_smart.png b/res/battle/graphic/pl_batt_obj/sprites/contest_icon_smart.png new file mode 100644 index 0000000000000000000000000000000000000000..45ee66a4d91b2d5e318b8e4f1403bc287cbacbdd GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1mj`ah}qY*19QW3lCb zFUu)=m;7I|SK;0>!|EvlSxcrApWUL6l>}7QTwVPC|9^8=`D;KfdPthWl*tORs0_`K;RVfr-T>Ew8`P^_tm-DQ1C(GVT-1TQoQoh;*IJv8Bodq{Ki{g1MiN6+)|mh$#{T|8QH!|vMbJNKE_ b?|;uP(iV65b1UmSpydpnu6{1-oD!MU;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zov7RoDArez_&u`>C zV8FrRU>=yI-w^IK+4fRuoY(_%hTATIEFZ<=Wt^IVioRJt(K1bCUFIuo|CAxH;p*u` zKlK2%X4eBZcrWY|T`|KUUO{c8QCGyZcGVl_COrOL%kD8JrsViH<%d9v7(8A5T-G@y GGywoOP)?oz literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/meson.build b/res/battle/graphic/pl_batt_obj/sprites/meson.build new file mode 100644 index 0000000000..4a885ce38e --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/sprites/meson.build @@ -0,0 +1,139 @@ +pl_batt_obj_sprites_raw = files( + 'pl_batt_obj_00000076.png', + 'pl_batt_obj_00000112.png' +) + +pl_batt_obj_sprites_lz = files( + 'pl_batt_obj_00000117.png', + 'pl_batt_obj_00000120.png', + 'pl_batt_obj_00000121.png', + 'pl_batt_obj_00000124.png', + 'pl_batt_obj_00000127.png', + 'pl_batt_obj_00000130.png', + 'pl_batt_obj_00000133.png', + 'pl_batt_obj_00000134.png', + 'pl_batt_obj_00000135.png', + 'pl_batt_obj_00000136.png', + 'pl_batt_obj_00000137.png', + 'pl_batt_obj_00000138.png', + 'pl_batt_obj_00000139.png', + 'pl_batt_obj_00000140.png', + 'pl_batt_obj_00000141.png', + 'pl_batt_obj_00000142.png', + 'pl_batt_obj_00000143.png', + 'pl_batt_obj_00000144.png', + 'pl_batt_obj_00000145.png', + 'pl_batt_obj_00000146.png', + 'pl_batt_obj_00000147.png', + 'pl_batt_obj_00000148.png', + 'pl_batt_obj_00000149.png', + 'pl_batt_obj_00000150.png', + 'pl_batt_obj_00000151.png', + 'pl_batt_obj_00000152.png', + 'pl_batt_obj_00000153.png', + 'pl_batt_obj_00000154.png', + 'pl_batt_obj_00000155.png', + 'pl_batt_obj_00000156.png', + 'pl_batt_obj_00000157.png', + 'pl_batt_obj_00000158.png', + 'pl_batt_obj_00000159.png', + 'pl_batt_obj_00000160.png', + 'pl_batt_obj_00000161.png', + 'pl_batt_obj_00000162.png', + 'pl_batt_obj_00000163.png', + 'pl_batt_obj_00000164.png', + 'pl_batt_obj_00000165.png', + 'pl_batt_obj_00000166.png', + 'pl_batt_obj_00000167.png', + 'pl_batt_obj_00000168.png', + 'pl_batt_obj_00000169.png', + 'pl_batt_obj_00000170.png', + 'pl_batt_obj_00000171.png', + 'pl_batt_obj_00000172.png', + 'pl_batt_obj_00000173.png', + 'pl_batt_obj_00000174.png', + 'pl_batt_obj_00000175.png', + 'pl_batt_obj_00000176.png', + 'pl_batt_obj_00000179.png', + 'pl_batt_obj_00000182.png', + 'pl_batt_obj_00000185.png', + 'pl_batt_obj_00000188.png', + 'pl_batt_obj_00000191.png', + 'pl_batt_obj_00000194.png', + 'pl_batt_obj_00000197.png', + 'pl_batt_obj_00000200.png', + 'pl_batt_obj_00000203.png', + 'pl_batt_obj_00000205.png', + 'pl_batt_obj_00000208.png', + 'pl_batt_obj_00000211.png', + 'pl_batt_obj_00000214.png', + 'pl_batt_obj_00000217.png', + 'contest_icon_beauty.png', + 'contest_icon_cute.png', + 'type_icon_dragon.png', + 'type_icon_electric.png', + 'type_icon_psychic.png', + 'type_icon_dark.png', + 'type_icon_fighting.png', + 'type_icon_fire.png', + 'type_icon_flying.png', + 'type_icon_ghost.png', + 'type_icon_ground.png', + 'type_icon_ice.png', + 'type_icon_bug.png', + 'contest_icon_smart.png', + 'type_icon_grass.png', + 'type_icon_normal.png', + 'type_icon_poison.png', + 'type_icon_mystery.png', + 'type_icon_rock.png', + 'type_icon_steel.png', + 'contest_icon_tough.png', + 'contest_icon_cool.png', + 'type_icon_water.png', + 'move_type_physical.png', + 'move_type_status.png', + 'move_type_special.png', + 'pl_batt_obj_00000247.png', + 'pl_batt_obj_00000250.png', + 'pl_batt_obj_00000253.png', + 'pl_batt_obj_00000256.png', + 'pl_batt_obj_00000259.png', + 'pl_batt_obj_00000260.png', + 'pl_batt_obj_00000261.png', + 'pl_batt_obj_00000262.png', + 'pl_batt_obj_00000263.png', + 'pl_batt_obj_00000264.png', + 'pl_batt_obj_00000265.png', + 'pl_batt_obj_00000266.png', + 'pl_batt_obj_00000285.png', + 'pl_batt_obj_00000288.png', + 'pl_batt_obj_00000291.png', + 'pl_batt_obj_00000294.png', + 'pl_batt_obj_00000297.png', + 'pl_batt_obj_00000300.png', + 'pl_batt_obj_00000303.png', + 'pl_batt_obj_00000306.png', + 'pl_batt_obj_00000309.png', + 'pl_batt_obj_00000312.png', + 'pl_batt_obj_00000315.png', + 'pl_batt_obj_00000318.png', + 'pl_batt_obj_00000321.png', + 'pl_batt_obj_00000324.png', + 'pl_batt_obj_00000327.png', + 'pl_batt_obj_00000330.png', + 'pl_batt_obj_00000333.png', + 'pl_batt_obj_00000336.png', + 'pl_batt_obj_00000339.png', + 'pl_batt_obj_00000340.png' +) + +pl_batt_obj_ncgr_builder = generator(nitrogfx_exe, + output: '@BASENAME@.NCGR', + arguments: ['@INPUT@', '@OUTPUT@'] +) + +pl_batt_obj_ncgr = pl_batt_obj_ncgr_builder.process(pl_batt_obj_sprites_raw) + +pl_batt_obj_lz_ncgr = pl_batt_obj_ncgr_builder.process(pl_batt_obj_sprites_lz) +pl_batt_obj_ncgr_compressed = pl_batt_obj_lz_builder.process(pl_batt_obj_lz_ncgr) diff --git a/res/battle/graphic/pl_batt_obj/sprites/move_type_physical.png b/res/battle/graphic/pl_batt_obj/sprites/move_type_physical.png new file mode 100644 index 0000000000000000000000000000000000000000..dccd216a4c1d0f57437bf8285c81825ee609b1d8 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zo*`6+rArezl`x^xt z6gXU8Mky39B{a7DE%){?eqFu%p7le;1Lo3tmJKS0ulaY#`c7!^z9Vd)CFWM&kW#sk z)55{di&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?tK7ba4!kn3~$Z zk?(*4hl}U*e{Rjp);xd0g4yc!FAtNxojjrXh;Zk=TNM`_kBVu2-ON{gol*UWet?C+ zOb4N9f4kT-7I}4@W?1+zF-gCGkH!DN(X5ONpjjV`oD7feJ9Ts3+AD?4s?pxndRF!O a_cLbgH=DCk$-W(EHG`+CpUXO@geCwyhFt~# literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/move_type_status.png b/res/battle/graphic/pl_batt_obj/sprites/move_type_status.png new file mode 100644 index 0000000000000000000000000000000000000000..613ab54d5e5fd0b1faca7176caa0f98f2cf4790d GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zosh%#5Arezl&l~bJ zDDbdeSf@8nTKv_D?Zqis;mhg-7qR}~Tv)5znga~n6dPqhDJHi OLIzJ)KbLh*2~7Yp3{rLg literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000076.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000076.png new file mode 100644 index 0000000000000000000000000000000000000000..75106b2b8c7950f517a7ee117a90928784c05153 GIT binary patch literal 888 zcmV-;1Bd*HP);Qi$gfQLQ*7RQ(O=Z7%%wz3I`fYcV6+9P zQ;6etk4YW)-)I3?FZe#K*AIMJPLxmEWwk$h7_Jc~02;s>na;T~9ETRNR{cguQV5Ay zGB^n@{M;nRf3->dMC*|_9H>Ey+B=HMp~S&bIx^g>As>;*r!$!?^CQ;rh-y?R0a}2 zrP!Gxji{^J_YH9A!vHsTlRum=;v_?(P=GM>J3e7^&Ih7LDqtK6F&v3ANriU;c%FfG z38Ejvs2!tx?5X78gn>6ze@0k4f~JnjI=}&Bl!*iEnYKy`B+cMX8$pUW^t&riIVu># zO=EFI%jGhQ4fy6QH3h+!X=8PwP%ncEXdvV<$)4GAG7;7w9OEbhg%GEIH7PfNGrNT( zZ=n}*jIA6wf+BM0xngk4?f$(8Hl3);sG`<@YL#1@#Ys^B%AELSr9h%tiD^SG##C1w zt|kWx$=(ra;|F)>xVv4`-I~!6{Q-GIIieIq8W6glum+|u<1{Ho9Kkg@vXTpI(*{Uw zfNB~71AaVWq!9?r*ANIIQ{x##;Xl-$qEn#cW9Y9i4$kH<;Pd8Ek&nG7@z6VC98X~8 zN^{urj!%IS+XK2q9-hL0kNA8Tt<7_{S_aGDGvi|h`F4z1?U~K*r$N9otmf4CYgT(v zhWpF!<3iPR=py55jJf#6eT@_yT6hF8-yMrf{0fvemIUSN8#XQH>k+Bt_}V`6tlM}B z;#-WGXT$|MFM&0naaBnnw#y_IwpXcHIbWsowF3Wp$iwg9b>~mGD}DpBU><4U`yy%p O0000;Qi$gfQLQ*7RQ(O=Z7%%wz3I`fYcV6+9P zQ;6etk4YW)-)I3?FZe#K*AIMJPLxmEWwk$h7_Jc~02;s>na;T~9ETRNR{cguQV5Ay zGB^n@{M;nRf3->dMC*|_9H>Ey+B=HMp~S&bIx^g>As>;*r!$!?^CQ;rh-y?R0a}2 zrP!Gxji{^J_YH9A!vHsTlRum=;v_?(P=GM>J3e7^&Ih7LDqtK6F&v3ANriU;c%FfG z38Ejvs2!tx?5X78gn>6ze@0k4f~JnjI=}&Bl!*iEnYKy`B+cMX8$pUW^t&riIVu># zO=EFI%jGhQ4fy6QH3h+!X=8PwP%ncEXdvV<$)4GAG7;7w9OEbhg%GEIH7PfNGrNT( zZ=n}*jIA6wf+BM0xngk4?f$(8Hl3);sG`<@YL#1@#Ys^B%AELSr9h%tiD^SG##C1w zt|kWx$=(ra;|F)>xVv4`-I~!6{Q-GIIieIq8W6glum+|u<1{Ho9Kkg@vXTpI(*{Uw zfNB~71AaVWq!9?r*ANIIQ{x##;Xl-$qEn#cW9Y9i4$kH<;Pd8Ek&nG7@z6VC98X~8 zN^{urj!%IS+XK2q9-hL0kNA8Tt<7_{S_aGDGvi|h`F4z1?U~K*r$N9otmf4CYgT(v zhWpF!<3iPR=py55jJf#6eT@_yT6hF8-yMrf{0fvemIUSN8#XQH>k+Bt_}V`6tlM}B z;#-WGXT$|MFM&0naaBnnw#y_IwpXcHIbWsowF3Wp$iwg9b>~mGD}DpBU><4U`yy%p O0000Ti9;lNFYxT@(kM~=qaJ_!CYGkzT-j!@LZmYUGi+WDS!8$u^WjJOb=?UHVi3K6-6das2XB-R;rKWT&Pc#9Bj%&(&tBzJ3OO1%LQ1zda!0aW zC#lg1hmejdk)_kA%@ z6HiFbGt~JwAr)`^U1{IZVzJyYDcBQf$^M*l2%oQ4qHix-&Z<6)%QU~ zOI5p|wS_*jsk!au8!6+oVkwG!H~1Z&{k~D!=Muss*66CXh8!?@8Oq*+cO(DPXvf$X zL=lfRh}16Ndb8MMdRH+O!fJkB++R#M0i(gFozdX?7bsU_J`%CD{4DmDZW-S;5iXKD nmV13DX1ELyXB97K___QJ*}q92ybE2F00000NkvXXu0mjf{{WLl literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000121.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000121.png new file mode 100644 index 0000000000000000000000000000000000000000..f619008952ba4d9378d34c34a722a00b690d55de GIT binary patch literal 250 zcmVX; z^uX!DD7!^U_FIVoV%o#4!y8I_U9_8NdH{i0)>^%G1%QWch&jYVhX~h%{lH5Zqf)l_ zQ8nx{?O6wp^DiHI>dK9d-?}%`*(n0{xC%FoYmfWu0Mn zCb#v@1IpstGB2}$U$!p0DwkSBP=_0^E`Nje0l;1~KFS-AZU6uP07*qoM6N<$f-RVE A-2eap literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000124.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000124.png new file mode 100644 index 0000000000000000000000000000000000000000..f619008952ba4d9378d34c34a722a00b690d55de GIT binary patch literal 250 zcmVX; z^uX!DD7!^U_FIVoV%o#4!y8I_U9_8NdH{i0)>^%G1%QWch&jYVhX~h%{lH5Zqf)l_ zQ8nx{?O6wp^DiHI>dK9d-?}%`*(n0{xC%FoYmfWu0Mn zCb#v@1IpstGB2}$U$!p0DwkSBP=_0^E`Nje0l;1~KFS-AZU6uP07*qoM6N<$f-RVE A-2eap literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000127.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000127.png new file mode 100644 index 0000000000000000000000000000000000000000..03508acefb15cec3ff5630c69c1c1a251f6eaf23 GIT binary patch literal 1066 zcmV+_1l9YAP)W~j5QXauIY592T;~oW6p3CpNMcsKBAHov8RP)dh*!R20<@47bpw0elVnH!iQAX~ z#@&tf;z1TmMHX50k(3R7@>_n(f00W0Rv}%kvRRk>kuh3pby9B{Cv9WOk1+ZRW!+O2 zl+q)PZgB%CD%HNnyJmnd4FhcCMzxj36)%XiNUO0(eRTy5kj92V987W)EifrNNi8O) zcsqZ0O8)nWSW{lNPisCQ-c3ckYX<$=7?p-g+ca3@8^k3hA#zh3g?}T&#r=3)K8o#O z`B>y>`8+%&yi0mw4jcsyig|Y42C*RozRQy+#VaIxD>jG8Bv7u9Nd4(KeLErD$!`bw zvRU`C+H}2qt+Br-forX2OxBdH-$?B~wCicNnxww1s#G?-u{7RR>|=><>!+`+w5}v+ zEtl4edAc42!}umI%nj3;h}=M`C>BX_K?*GBZ^4nK#w5wD!MY8#kUS)BvjmmaNquQi zJtl!AAv<>IBpoD3EmaC@u*AX~8YLel5(Z?%a8#~^M6dJS-o-?3Fx13yb z0x+q9F8s{FffRLtV`1&v(CJ-L7z^*lG`c9(Ie|F@hxzbReiRM29V1FF<8 zl^r4T0S}ty7IsZbqya%{S(5R{uC6fIW(ls@CHUh0%BC;mxCMM2B#mf^yU3Xlbp_AMUd*3=S8-$K zo`TVzOc08%I47p&4phbg@DM=}JQRl-XCdlGJc#01_8Nf%qayg!i1&T(=aQ)Ngg ze1O%ms5cwp-1u7D_+^E+K-`jWl>CB9hq8A{ z8;mP=&gK?V+z_Bf^^WH?8eQOjYnOOWq`}t2H2TV*mj$2+S za3)M+u@@fMF{fpp)Q=?fvp7ECQadTog?4=jNVU k8&3t0^P?ZVTyg&X0iii4nd0YGJ^%m!07*qoM6N<$f`BsbumAu6 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000130.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000130.png new file mode 100644 index 0000000000000000000000000000000000000000..33cb9a8530fc4085c4b75c51bb7fc90647d84d14 GIT binary patch literal 975 zcmV;=12FuFP)lL~0T!FBT)4>j7C~URqHdtgJW^Wi zM~;Iuaj^nCkj>%Kydf!#X^V@_aE4b6-HVhiQJXeuM+S7Qz`ejaQI{5;ekl{l)PPo| z-3bKTQfyHm-fb!}u{Hp2sEILBC!>!&fRfT%iZv*aL5V`iFltG-NGVnXT1~+Zlsz7* zQhE}eL6s`{eM;d81?r{VDp6gnYl3c1-W=D<{U$&{``ufn?WS7M_NOw`T{2pzz`MVI zpml9D84+X-pB7w$JLe)bK1At!Edz@~RZI}-(K&1RHI#u>KZ=1M5IGP>tI2BTiis}9 zrl&Lj6O1Dc7|j%iYj}pph#L9=gmbW_jE;b3fa1Y}bDr31k1E!k@J3Y(;o3s;5hX*X zDzOP(!LawRPKk*ZvXM5IvadG9;-Ow&`GV3c!4t5smkfImRJ8bMo_3aa3GhoNJf7xhf#s-K zgZHq#b=Y3fh$hME{TYxG>@IB`}-ULj|m|2y9QezTt83}-mQe}kNJo+J+~@H#}ykqG81dC{KctDKwC zeL@QIiXyVwNp9LzE;)?xqOE)-^-OcX>so<3N&+`2MFI_Acq(5#3b~=wc9H7YqmWA& z^Cb%9JXt_Qwz;DuYvjms9ySBCJCBqmR`=g!_%_JoaPX7A|dA3$!~XwR>AbS z$ymeWv^@z$rSlxJtN=IYQa3!o3lt;|nW6x((fLM#LnaTEoBick3}k3&7YSNdgK;e1oM})Uz#l^%1V|H5Mh- z?W9-u$tKPv8R4G+w$u4ai*W7cj374`-ZME2G`N8vhGtB^S|>b2HEowxw$yIlhh|6N zqGc`~tc*Fy7LM7FmGxy=imBWg#1F`6N_wNJU838gKE|xkk?2YMY;FRxvx10Jn`TQzTi**Jf&#tv4U1KL?ApTPj^40C5BX2dDcc+V+l2@ z4s8Gprogu3Rq``{bO#Y=6m8rY0vdiR{EDUtBAyH^YoJz8YI6^@nMX+Oau)+f>OqYF zR+;`Fd^7c?{2%MLdXVRQNeEU z!BTA=aI;p*ir{BV7%vdVvjvjba)pO=-YerWj^hauo($$5-cxVb5rMmjDt`DMKSQE- zT<9I>PBe!W$mmJ z7_b{aCkq=HeIE7v^Vo)IrIx1Fc4<~Ap?=E#y@GCBSJ92#6r#|4=Z$)r_m9il)IDW4 v?Vg(0TPrp!%)|7wX%++;ewqu;58l7O_{D_rt@v~-00000NkvXXu0mjf((4_O literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000134.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000134.png new file mode 100644 index 0000000000000000000000000000000000000000..0a2bc14d6c2fa43561b01938221621eb15671324 GIT binary patch literal 630 zcmV-+0*U>JP)INDHWdn$I11KA)Qq+pSs=l-f2xb9!*#A{!^WP7`4)9{w0iBr( z@x{3&41Su=#v?IRr-^902h zGh`U1WkOvH!*GO%kAo4T>Ys4A67ocQ68PYj|v8*c^lHBONj6Fc{OkS1Y>$ux;D$>#U?HOn%Xc*bDHk;4l^ zju*v~Deh<46j{c)nMXId8^_>V<2~!DIo2jMOs!KBmy35$|J7n8|4h?cqHwT41X9s&zU4ADGphwP+`SHHC3R;(-4Ft^g>iWo6LiX*6rD<&U zpf1qB3tT(Y-n4t&YkH0@wb=X5;-?9;s)3d^DC#)Z}Ju!kVKtsbOlJns_F5;-UWvwJhCpUcEQ&POxsS1AHeds9SOpP+!3u0BP7|wj72VkXPL{ zZX1J$LI6d0@zkH!pQ`S9U8W5_y1@-j1w@-QH4pR>da3y#=tBr`@$DXl^`4G3TUooK zbsZ+u9Xq&#&_PYK-EoH~0y+hEZrggAL=Y=_94bZM6+m#QG;GQ+j=O?Xs5OP2R2I(U zgF1j<<@yWYld*S=HrVg@Alq&S(1BSZkcBo8FubwRLkcvEmTa$5nZ1FAZN5??QjzDu zR0eNb;DBu`7hel3H3`?S8d#D7c9+rpji? zVYMpox@O}8%okzE9v(uxqvMb?2X=PlUo9X|h9n+M1k55-XCd{p3@Mf>au<*E0Hr8E z*n7Tn(M>hy8E3<+A6V!$;b3}aa6>JJBv~-b(~_#7+~E8$O0~{{saEhjZrEDza? zxOAxH5RD2!$JGj+QBhB30F7pH=viZOx92b_<|WW}#oE3b&d5`kl4|>yA48>{0TXu9 zgsa;(Am7V1xb84`sfU#H)gE3ceH#^XxIH}Idaa5#G#)~V%(Ov@H`tf}DY=a!2|nqSJqfBw6wU zo-8t0Du-tt+?e6T{GZ!Hv18NZy~RF-H(j4PkF|L<;@$HwK5dx`LJZ%`1Yb|?zu#i> V^%r*+kxc*q002ovPDHLkV1jc%f~)`l literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000136.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000136.png new file mode 100644 index 0000000000000000000000000000000000000000..e250bfb8a8d7040f3c0e9f013934431a08db37df GIT binary patch literal 845 zcmV-T1G4;yP)03?`!od~7ENNa+O)8vO70N*LYMNWP87F#5ckK$0ZG zxe`*0;eIzUk^}_3>LfHe6iNYYsyfm5KA)(Y3s^T{xOjZdi2lfrpT;q66tOJc0?(f>sd^0P$D=MotKL7=|ET1px%XO>9B) z9P^nw&??q7zQfI%jaaxjHjjfkKk&-dNP@ z;`mBg)axjmOOC0-f#uQBKF7Ji!Gew0h(9no`ZAypj~J2pq+tW;Sf_V|Uh_(?a+uv>X_^kHF8Al)i)D1edxGiGPbjQ&rm&LVtP6CAI)WV&=Q>{x zdMjOp0&R+tv%e(J#Y1z%$_`&aD2we%eKOVB-29}&viQaGN8J>qNB@z~zgRp)Xz zQiJaf5cFwoYQ_925{meU1I^1l$o&f4AOD_g(4awse-5QS)FmkK+LR(u(}#v!!MF-J zs@jKG_mDzzyE&!`W=)4=DrWq0(+4uW-K1W^lPh7$*i8Sch!^(6nPog5*=5vc@P+YW z^n}!&(3^gTPC85bNh*pK^K_>ij^re1@cm=IcO_kN3oZKb$1M>2s~bv}5S}1>49-Qh zm$VpLM8Gx1UMqzYBuLy!p^q=qAGDk0pz>-}*RSZ*l)Y69=IbtE3sXeAMON{34*R!r zt+P)QAo#{!7IU2Qs6_Dme%4RP`7JnSdH`OZJF833ecMa+fHyefa0VO`a$qJp+Dl=N zuynhxBFJpNB)rVp8zNX8AB+EU9Q=Zwfv@ieET^;Q$frEx7@mSsQHZB_RocsEVbG zR@r&W+j;wDZCT@yFZhCEfyjC#*U!ufX64!#F?i0N?%Q{{mL@jSG=jhFK33e|MKjxA z(`O0_>BRdnEpAcOS;1RY-Uu*pTqViHKxK1j;?3?P8yP8At@^5KK(y z$dJNTeA1_tPv_(N&~f2;_kO+3=Xa3*4~Wtb_fgQ0L%#F!h^x<#{b|98({sI=^k9c6 z&aQ>m=T4a5-DjZe^V~Zd<%r3hi=dA$lo88Z&MN={iUPEZ~Nx4T^33+_*M&EgC40Ygy?CB_gsLl@k#VfM+masH+Ej&hoY zPR`KTD`TN7?rDA4E|9VkYq?=P%nw)YOjzEW<|bd@<^IT4`2hX?0aXv}eOE3dU;qFB M07*qoM6N<$f>x)O9smFU literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000138.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000138.png new file mode 100644 index 0000000000000000000000000000000000000000..58c2f431764efb210eb6c118de83add40dc34116 GIT binary patch literal 820 zcmV-41Izr0P)f0I|&Xl&O5*+SoB308$=6kP|2eaB=hktGU1`$J+~#oIv(<4+^3rY;9`) zR6&)mKz=jR^9GnlDGq9+k^fy1O7}_k4P>7rl>E43VjLF{5D9@$#HFXum^Troi6F*2 z$3;$%qOE)|J|CD0RhCYRTnmHOJ!Qoy?cy6@vZU!Ybr4(W%19!mB|o zeeS6U=au5Q4~uZteFm3&&bd<0XFlV(FT-+_Z1VjI?vH;b8)>AGM*cY|Jv zC2kmDS9_2hkw;O9lkMa-gUw>1u0@Vi;Au2)q!v%3fn#%`MgzP1!6H;Jie%H&KrpgT@x#X~~7z7a4Q|qh4&3NQ|jOx&Hwfnvyn!AQ+@)IbvH{9c0IHJ00008U0jY!8KIgBOpXJ$hr!=$m0+c+ z%mOaiAiA2f7hAt;K75`Rsk}UDJ2rL?camY{uDl=4nsuh_RokKGBeU(}r zs#WF;&8UhYrPK~1U~G|;a_j0d?=o&Br7o9{Zx69jmy^B~2VMv2tu)p6)p1&eoJYpc z0|S^8_13^^AkHwBDyMr`=W@Bk0+fI!OEr1o5o_W9K-!sMn;j)5mnS8Jj>8q|!! zR;C&685-p>-^JW4`0gO+U;OMxrZUreWSu7-BQEt7%neK_4VT**F2}qKQan_O7B&F0 z2I#bhIt-=t5h>r7q=JCg2bYwTq=Sz{N1ekH3bdB=MjuM@H4Ks`l9WCJul;~NrTDxe z1id}Q43paod1{7Zwh(xR=V>WFygJT8i&pYy`)_I+@thtD_c&{ia)*9t{eiyOq&wQ` z0p}Y?GT|Dpie`Ul2s$ysCHVzwL4NgO*v{EoUX>ixD!HE5&Rrk2bL1ZnOIO^=!rBWrQ zrVpqw3ne_Ua;R7t_@qF*IdGeq_UxX#JJ)Q)y2j{_OkM;~kvM{(Va#<7(elWckA`8- zK3K@Sh|6vM<*>$Rj&%tW#Z;^Z0Dj`32w8Xpy8&8>J`&D#`S?uWt_ zkG^NJdQ~#td-g`#2q9e={>Eo$*c=Ij8bkh}h4hvRUkBJHq8L=ZjmQxj{?`NC3Pp?L*o&hPc8Pb&I@$|9&>!$=VSc4fg`L*HlSFa!$ui>wtZ?x zA#B(^&+d}n8Rl8W&tB8!qw(n3Te9s~yK~NG8W^8t)XF9F-yf-rn`c*o5oZ7Z002ov JPDHLkV1g`(-MIh& literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000140.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000140.png new file mode 100644 index 0000000000000000000000000000000000000000..7caf3f713e5e55c9549bd310ee5bb3b5ec18057f GIT binary patch literal 994 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 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000144.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000144.png new file mode 100644 index 0000000000000000000000000000000000000000..1dbef20c6199291ecd8b99401abef0bdd93d29c3 GIT binary patch literal 521 zcmV+k0`~ohP)qrqzb|I0>0E z19O=NgOUv$I@~%60{s(80k&Q!5H_b$8&;WPp6B^VWsD^o@|LFx2BT4Rqq!5W7mevr1FNIswZ<93=5Hfjv+ZD_kcomssKF}RUJHpGHcn0`H-@t-6a&o^y?V1A z@$4QC6&xU1OoN@b&|q$pWR%qi3tQc`&Ks|JQttbgU3oLT`~8Z{md=@5o-M@2t7Lq` z`}OZ+hYlS&TpccZ9;&|V^a57}9_>A|^9!|@bD65=Z&2Ky|8kzt8t z|6in7r&HJYbU`fGv0$7GHqxC9tTdcAjY-7YM8~TVkyr0i8}X&jLv3%ir`S5O71b!K zcwdpAI#_L=F9sLxo~5ayx;LsO2y_BC>W!TxeAJuk55AKfI$R8&O1Lnr3eGNy00000 LNkvXXu0mjfhTiiS literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000145.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000145.png new file mode 100644 index 0000000000000000000000000000000000000000..a8f83eda7bd46aba30a5e4ea0ec07579e36b5e57 GIT binary patch literal 541 zcmV+&0^UbcHMQ1w^}o#z(9KD~*|nu?FAnaVT00g=85q;bMxsJj6iJolEeR_gUgf0FQ=X zWHD9-fn-jc8AEdeFao|cvy_>&g+al7kXhO-y;*C{Rf7mX$g;Qv+-SZlWP*NT6S-G{{d_zyz83D6Nr})uN z{PZO<<9s;dwQay7aKW6L4i`+%y6juqi}W06_w{_}s=Eld88Umm<_*neZiXtpCaM`$ zov+m|;KSL^x<=l(6YtKxCk3G%be^8S$JeVK{5QVe)`Moh(FMq1KhVD(Jj9`29_Ur8 zuGRQZYitsnq5cW!7hlzxrX5)Op4PuNTAhu_gYUZbZCt*-48pfawKz7v>fg}%cZF|) zAWh_-5c7mi`JY!tj4omK=LJs*b0>#+Q*KQOF%3plZO>MWp(o z=aznG7{{X2K#7P?Nntc({rcCJSN*Nsbntmy(3+wbh+U+0zPO>LRV&Kaupe5}SO}M{P)uasX6(+}xnduJf)_Dp9FLia$n4Jf7I& zoy4?9qY*~XdX%-{WroWDa*{5K2O`CrX(*rLmRto^PJA2qHvOB zWY8S+q_~#KGU3@nJumM-uK*Mizyxb676N=vxLeWwmJJmXjGZ`@r6GRA*eCl9mE7(i zWi24L=uM;p)4-!GnRo3ldFz!vz?1*>^VlE>H4)7#Ybaw)x&6N+Hr3IQvNb%3We?(CGT z!v1+{7aCZu)O$`^(U8=U=D6WC^@5FBwaKM?y}zAh4J!BQPt(}&99ddVZ;*GHkL3s> zj4;AA!FkU^%A0}`%_?5XUcHWJdIK=-k;M3xs&f z$*x`d`RZi7)E%DQe$itNWLG&L6U&JAFCF&bJ(uWi1wi6JAcC>a3|Qly4Bs96_pk1J zbvC`Uwz#JkLoa4$XPJPA;1JAt6`NQLQ|r{kXj;{&um1jg9_s0(U5cbxa^2pyb=;*$ z)HHPE{1DDTl_p13Z{!3*5gL0000Hr0V?W&2Ov}#-vVw-y|L%^z%Eq` z0E2WL0#ydDih=U zK!@c( z;XVH`Z#?)}y(q(1g}mm(MX!-0e7bsa3a5!)GMT&#lzI!@_hq57@tm1?Q5yg3zMUI) z9-4R5Dmodr*>yBMZv6~$dB8{={t^v7tF($37?r7$QJ%NCA8}7U-`W8!MwYkoZyXQ3KP@Q zNeDAF57}&G#r1P~nv7y+o1KU0sc#m97`n#6ed+!C28JRsO>x(eP5=M^07*qoM6N<$ Ef<}A*D*ylh literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000148.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000148.png new file mode 100644 index 0000000000000000000000000000000000000000..4a8e9fa23df7f68056f81ea075e0b013f070c621 GIT binary patch literal 594 zcmV-Y0&?^#J|YTXF;X&IkfqP}4N_BW%KJ za35xvmmOG&F{qYW{<=gEYVJWI!f14v7^4(P2}LF}T?D~iglV=khJv8T2}0*7GMO!c zE#h!G6j8zC`WVh)(At==$VvH;l;1#YQCEaV6gPQ6@fjq-)zoAj;CC7j-{RUkW9&BG zMkJ7+JY5>PUCU`QVaUD%wvsK}-Jc2NKO2fzoLc*iiH((6>lWjP-Q~>}vxbwW&#UIZ zrjZzyT8DG7^McfWwb%(Y6yYJVF%K>v4eY=@#Fq(d9& zVy)nGjdw+~g<$`A?kQw)rB1@iTx)1|YoBLacK2BKi#(i!-#y=ge~5fj8rkvh1|!F9 zVHu8fmE6hSleN@ROD(@noPADMe1TSS`}R%pIq4*@eVtEA_Dvb=f$O)@psRT)=fIN$ z_V<lp_NJp+X*0rDd?tgpUm9Nk8;Xq#ImPcdeHU&QH+}IbEybo?(HOCWa zLy21=eHeSskQKK@F8`5#hw@@Q&&T{Z@7p!ufQi?z6UO#P4tf@Ip2Q|*FR>11G4;H3 zotCY?%6-mP_f6vhqJ5+tmE~ReMMOGYdtdJld3~B!MalXoo$YS}bR+OD*3fABO5!$lP6b=>Px#07*qoM6N<$g7RA&a{vGU literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000149.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000149.png new file mode 100644 index 0000000000000000000000000000000000000000..e4def8176e07971fc1681d82e8897e922a023513 GIT binary patch literal 1030 zcmV+h1o``kP)^5e5QbNc$39AmCeA%nb(RR#=Tw5}YdR5?t8Ieo9^ILY;9pSd=kgz@?+a2kZGBMb zxb-2{jGm#4#bUA8574s0N8a#;mx9QukoS8=1*7ub7%}*~y1DyNJo#C``qhcY1|6Xn zQnWOY*2vjXLBg0D)VfV3jR-B;Vkw+nPtdXq$DaBWqt`_^(GUgKQl z1Ls~7?o(2!QsRH|K?@L^R?!3Ag>x(Lx1wd>1N>~&cQhvEz+AjMY`v zKf(qi>nGg}=-V-R58Qjf*VjB$0Ru}M2oI%>rtJ&kxlyi7+_oE>ctWrFDu$klAa2@n z;{EM|Y2S%?!;%4)d)8&d3ZeuKkiuxT)ilgMmf@;M#k30?+3;OGu7V1BfCjbY8;#7p zpNgh4#K94UisZt}kwaD-CyC{glQ_Xa#TMuj{x)c7uVi6Ai&*=+0c`I96ClL%5%kHi zMWUR-7DL2ZVLSjn@j&4q;`|2F(hG5E>Hq{>PH4J5co>V6Tp(<{1Du^i53A)eW57AC z`wL??Dg(HSlpLuO!`0G0o}9xLAj>F@^g+Z*_Y|WDTStACnv-%Ls#7EL?5mL;l}-ZE zG!;vwnw?Q3SI)2{)b5V#Dl0aEdJ6{4BFKX#kw5RN{BV2a9`k6;;jrI-6H*AiaX?)gN~i&iy+RI`YrjfAFaCpd<4`i9TK6-OGS8odt*JH0 zb$v+(0GfJIc6L1ra&f07+~o~GBQp^FH62LC5~PazM)-_)%lPR1U*gy>^ulA*t!qiB zD)2QLH*}Wz*2O56iOynXV^*dldeRpbN?b%d3TW@QV2ge&r)fZD&Z>?>T=5wH2AUD(ozTDo(e(*3s)fA_bp*ELOb zH&~#G3y{YBXX{Qk>b*_aNt`R6GCqyVzoB`-_*nn z$J_lZVQz;F17tDp9I}P>Yx-}aAn(X{&B{{0(H!n-)9&DLT=3cHvW8;**rM~$8}li> zn{U+d&K94BY17)=&HsZ0pLPfi;VgrK;fwq49~g^ixGYOnumAu607*qoM6N<$g738e Ar2qf` literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000150.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000150.png new file mode 100644 index 0000000000000000000000000000000000000000..f969b19c961ebc37db8d504b19bc26313b29974d GIT binary patch literal 1040 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 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000153.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000153.png new file mode 100644 index 0000000000000000000000000000000000000000..a88950a40c8933c1729a65ca1009362ebb551926 GIT binary patch literal 663 zcmV;I0%-k-P)uuszN+to`9 zAN0U4{KB~a;A4cxOcW>zkBETuTs_@9jETT#s=RxKaX}?4oH|SZD8L0i<5VU6tqE!k z6hsp|1_Z&n2W+*5UK3~oPE@oS+OL2I7t&xs0957pL~zgbj`TmO-_gJ=RhSZXdR`@c zTvN{LNF84JA?ykE7zs3>hZ13L4-z{PY{!9)0u4e}&XlY#t>4W6%_f|}gTLYNA!f$W zoe1>PAcjW~Alj)P2?|2p_EX-WVO=W%O zlU#J&XLV)`)VGu$1^?O);=JMp?C?Brem{772zZ?gZduIN_|gTuf|8^?ee%#Xl|KjE znOFv7AdNpSF>+}yXIF+jPo$BTDLJ+$^NiKIb*L_W?IpFsasH;tST1eqnxIy)iSpWh zG9KHWY^KtZMSEyZW6AM!8AP2h)&CPz{F}ssgNQ?1@guP8b{xAhqvZ7+ zj>}U@D6Xj=|KLO8gzTL&B{LquZ-FRy8E)X+{C?K&Wgw>q8(y}VzJTm$whLQcw)Iym xji#igtEtlpdv4ed)^y1O0tQ}rgO{`G_X*u(u)4|5iar1U002ovPDHLkV1hVLINtyO literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000154.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000154.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed057e02fb5c10e9bd840cba8b723ed00e0c90b GIT binary patch literal 774 zcmV+h1Nr=kP)ID)(0;7J5I{qN%;<=)Ts!6pkl-^?e7q_Lo|)#nwi6tI8IZF^E{{gC^kLM zpSFa}l+vT*Eu1|(ZF0X2L9T=US}C)SamLn%n?Doaath_&R~_u z93Iz@PR_d4;QTv&B!9#o$#;Qh7uN072;#d_DzqXh_P%O{J&5pw2$ZH$uV|BNNNmIA zaYjESB3s#rXVVk0wr9+%5;o#rCv3esS+_}}RX1#1E5D-RPUU)oZ&O$pI^b?4@T;SIQu{BxB>ma_h2ddq=1y~JFuj5MhfmD?5Y9e$hHzry09aj_yU9&%@;}IR=ON3<iHsWe!QeTk&cU?{oOpGzE{xLkIR}T#;y4hPs0D$5_$*#!WFGq_%Zq~h zku2I~$0cNmjU_Gvr_JP>P4vw79{u2nhmQ_q=AhpuDxjI;1w=~Y73~GZ)#srGw}M4= zPWlMbSbbi5^^-!xw~3UD5MEh%vg*hJM9Z@zD4UbZ@{z!o1SAQR{F2l9&~MmOuuszN+to`9 zAN0U4{KB~a;A4cxOcW>zkBETuTs_@9jETT#s=RxKaX}?4oH|SZD8L0i<5VU6tqE!k z6hsp|1_Z&n2W+*5UK3~oPE@oS+OL2I7t&xs0957pL~zgbj`TmO-_gJ=RhSZXdR`@c zTvN{LNF84JA?ykE7zs3>hZ13L4-z{PY{!9)0u4e}&XlY#t>4W6%_f|}gTLYNA!f$W zoe1>PAcjW~Alj)P2?|2p_EX-WVO=W%O zlU#J&XLV)`)VGu$1^?O);=JMp?C?Brem{772zZ?gZduIN_|gTuf|8^?ee%#Xl|KjE znOFv7AdNpSF>+}yXIF+jPo$BTDLJ+$^NiKIb*L_W?IpFsasH;tST1eqnxIy)iSpWh zG9KHWY^KtZMSEyZW6AM!8AP2h)&CPz{F}ssgNQ?1@guP8b{xAhqvZ7+ zj>}U@D6Xj=|KLO8gzTL&B{LquZ-FRy8E)X+{C?K&Wgw>q8(y}VzJTm$whLQcw)Iym xji#igtEtlpdv4ed)^y1O0tQ}rgO{`G_X*u(u)4|5iar1U002ovPDHLkV1hVLINtyO literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000156.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000156.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed057e02fb5c10e9bd840cba8b723ed00e0c90b GIT binary patch literal 774 zcmV+h1Nr=kP)ID)(0;7J5I{qN%;<=)Ts!6pkl-^?e7q_Lo|)#nwi6tI8IZF^E{{gC^kLM zpSFa}l+vT*Eu1|(ZF0X2L9T=US}C)SamLn%n?Doaath_&R~_u z93Iz@PR_d4;QTv&B!9#o$#;Qh7uN072;#d_DzqXh_P%O{J&5pw2$ZH$uV|BNNNmIA zaYjESB3s#rXVVk0wr9+%5;o#rCv3esS+_}}RX1#1E5D-RPUU)oZ&O$pI^b?4@T;SIQu{BxB>ma_h2ddq=1y~JFuj5MhfmD?5Y9e$hHzry09aj_yU9&%@;}IR=ON3<iHsWe!QeTk&cU?{oOpGzE{xLkIR}T#;y4hPs0D$5_$*#!WFGq_%Zq~h zku2I~$0cNmjU_Gvr_JP>P4vw79{u2nhmQ_q=AhpuDxjI;1w=~Y73~GZ)#srGw}M4= zPWlMbSbbi5^^-!xw~3UD5MEh%vg*hJM9Z@zD4UbZ@{z!o1SAQR{F2l9&~MmOuuszN+to`9 zAN0U4{KB~a;A4cxOcW>zkBETuTs_@9jETT#s=RxKaX}?4oH|SZD8L0i<5VU6tqE!k z6hsp|1_Z&n2W+*5UK3~oPE@oS+OL2I7t&xs0957pL~zgbj`TmO-_gJ=RhSZXdR`@c zTvN{LNF84JA?ykE7zs3>hZ13L4-z{PY{!9)0u4e}&XlY#t>4W6%_f|}gTLYNA!f$W zoe1>PAcjW~Alj)P2?|2p_EX-WVO=W%O zlU#J&XLV)`)VGu$1^?O);=JMp?C?Brem{772zZ?gZduIN_|gTuf|8^?ee%#Xl|KjE znOFv7AdNpSF>+}yXIF+jPo$BTDLJ+$^NiKIb*L_W?IpFsasH;tST1eqnxIy)iSpWh zG9KHWY^KtZMSEyZW6AM!8AP2h)&CPz{F}ssgNQ?1@guP8b{xAhqvZ7+ zj>}U@D6Xj=|KLO8gzTL&B{LquZ-FRy8E)X+{C?K&Wgw>q8(y}VzJTm$whLQcw)Iym xji#igtEtlpdv4ed)^y1O0tQ}rgO{`G_X*u(u)4|5iar1U002ovPDHLkV1hVLINtyO literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000158.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000158.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed057e02fb5c10e9bd840cba8b723ed00e0c90b GIT binary patch literal 774 zcmV+h1Nr=kP)ID)(0;7J5I{qN%;<=)Ts!6pkl-^?e7q_Lo|)#nwi6tI8IZF^E{{gC^kLM zpSFa}l+vT*Eu1|(ZF0X2L9T=US}C)SamLn%n?Doaath_&R~_u z93Iz@PR_d4;QTv&B!9#o$#;Qh7uN072;#d_DzqXh_P%O{J&5pw2$ZH$uV|BNNNmIA zaYjESB3s#rXVVk0wr9+%5;o#rCv3esS+_}}RX1#1E5D-RPUU)oZ&O$pI^b?4@T;SIQu{BxB>ma_h2ddq=1y~JFuj5MhfmD?5Y9e$hHzry09aj_yU9&%@;}IR=ON3<iHsWe!QeTk&cU?{oOpGzE{xLkIR}T#;y4hPs0D$5_$*#!WFGq_%Zq~h zku2I~$0cNmjU_Gvr_JP>P4vw79{u2nhmQ_q=AhpuDxjI;1w=~Y73~GZ)#srGw}M4= zPWlMbSbbi5^^-!xw~3UD5MEh%vg*hJM9Z@zD4UbZ@{z!o1SAQR{F2l9&~MmOuuszN+to`9 zAN0U4{KB~a;A4cxOcW>zkBETuTs_@9jETT#s=RxKaX}?4oH|SZD8L0i<5VU6tqE!k z6hsp|1_Z&n2W+*5UK3~oPE@oS+OL2I7t&xs0957pL~zgbj`TmO-_gJ=RhSZXdR`@c zTvN{LNF84JA?ykE7zs3>hZ13L4-z{PY{!9)0u4e}&XlY#t>4W6%_f|}gTLYNA!f$W zoe1>PAcjW~Alj)P2?|2p_EX-WVO=W%O zlU#J&XLV)`)VGu$1^?O);=JMp?C?Brem{772zZ?gZduIN_|gTuf|8^?ee%#Xl|KjE znOFv7AdNpSF>+}yXIF+jPo$BTDLJ+$^NiKIb*L_W?IpFsasH;tST1eqnxIy)iSpWh zG9KHWY^KtZMSEyZW6AM!8AP2h)&CPz{F}ssgNQ?1@guP8b{xAhqvZ7+ zj>}U@D6Xj=|KLO8gzTL&B{LquZ-FRy8E)X+{C?K&Wgw>q8(y}VzJTm$whLQcw)Iym xji#igtEtlpdv4ed)^y1O0tQ}rgO{`G_X*u(u)4|5iar1U002ovPDHLkV1hVLINtyO literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000160.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000160.png new file mode 100644 index 0000000000000000000000000000000000000000..9ed057e02fb5c10e9bd840cba8b723ed00e0c90b GIT binary patch literal 774 zcmV+h1Nr=kP)ID)(0;7J5I{qN%;<=)Ts!6pkl-^?e7q_Lo|)#nwi6tI8IZF^E{{gC^kLM zpSFa}l+vT*Eu1|(ZF0X2L9T=US}C)SamLn%n?Doaath_&R~_u z93Iz@PR_d4;QTv&B!9#o$#;Qh7uN072;#d_DzqXh_P%O{J&5pw2$ZH$uV|BNNNmIA zaYjESB3s#rXVVk0wr9+%5;o#rCv3esS+_}}RX1#1E5D-RPUU)oZ&O$pI^b?4@T;SIQu{BxB>ma_h2ddq=1y~JFuj5MhfmD?5Y9e$hHzry09aj_yU9&%@;}IR=ON3<iHsWe!QeTk&cU?{oOpGzE{xLkIR}T#;y4hPs0D$5_$*#!WFGq_%Zq~h zku2I~$0cNmjU_Gvr_JP>P4vw79{u2nhmQ_q=AhpuDxjI;1w=~Y73~GZ)#srGw}M4= zPWlMbSbbi5^^-!xw~3UD5MEh%vg*hJM9Z@zD4UbZ@{z!o1SAQR{F2l9&~MmO=mjdu3s{sFu%rnhuB{DH5R@YRr1)Cbc5~5P-d&6b5_lk= zEqJ2`zTgWk1pse7JS;?kqVRwSNYBm7U50)p(3>t-PtdQag|*X%2>=DS!6zKMq`w_O zp@D*Ef>S^c>{`G|YiKorHsC}>rJ;Hc1aKt{)&xLZ_KyVLxZj>Wqy8NY+*XBY;i&yC z>E9jIyi4>Ev>(HX;Dm`l3A)P>PIe=4B*Bgxs3}k))VZf*ac%wX2Iy?UIXw6q9&fUG zo(@BF&qqc;5g@8@9y1h#qH4#v&21!!9c^RRMmt$DPvwk&!6(h z6x#XQZJ{gkg{bb-`x#H&52n;0-CCmd8I;UDu~idMnno#yB4nYGOG$sJs%axiXVh>M zlJQW6Ej^y}d1G52`6M@8w2L~k2F-_*PX+(l57NBs4(#wUaA`k~^4Ir>SF7ljrF@Mq zUBt`ii<{OA$z5H_@Eq`D5aSBSK+5pEq{z9opgNCdZpwIx%a|%yzULmV^?7ryXRf{Q zWY=9&r?0*8Hdm!wuv}WyH9_5|GRdpj(Rgg7^Zslquw+pU<0&mUT`q$tVpIK(p-F#} z1Tcu$r4^rmWw*z%&KH!ty@Px{FbG@oCWN?!bKdiYjO-q&zb-hoxp+=T@7y{W-NCvo zr**E6X9Scm4dBJ59eAU1W*$SDacbNcZ^z9!Eo8UUkALu?aYFV^Pss(3;I}{&oQ8XN zHNT(rYaYoNz@F3gTDx4pyo82HHx{J6M&zX8d$ VvOFLzVyl literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000162.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000162.png new file mode 100644 index 0000000000000000000000000000000000000000..4db9159fe6213619d0a0921908ad7b59dbe62c46 GIT binary patch literal 812 zcmV+{1JnG8P)Nkl-~wvl4aB_* zr!prP|JO{I$z*0AN|mM31%Cnkz3zU0PtQCkM5DE=AjDKwQ(xo8RQQ-3gw)*|9`dJ&T1#%MF7q2Wu6Lyp=g}t~m*q?!f)& z+vchym^;4UI#@BcmbI+qUy#+-Lxu~1Y(=pD{dAbgUBhK?Pi=ZH4>{le(a+>!SZlyT zfv3~{peU_!Ncth39j5Fl_Mj|Mr8~H`Y@L(M>1IAR8uVW$o>p$J>tu39csw|n71r9o z?ol_BGj-zV#8i=&9yOWYlKTu1Ur#Sskk1S1PQ1$EWR*S+@!9iEMZB{#m#`B`Y>U*f z6&DP7#Z@Uaw!@|CoFoU=7I5NKY+cLg9o**NkZ#Tk0_|iV5D<@nv|Q5rMU~}3!G3g` zS+(OHWDgyCSO#XRlf3DWw=49Vs}+2;Aax6dRaHoJtAdMK!A?~P!`tTkW<8YR+OR0e z)ot?!ELpGhq$ExbwPglU^SZ7}-FD6>Afj{BjC$*{0k&iSbXR6s#^(*4ifsIfa2TQT q&ShoE^SkPLNXeR)y?LzVf0v)5h8f`;f4hGG0000P)l_=b-HqT_)cE?5axdN76zuA7H@84eSMgJk*RnGSbI;V#KT33Rgm#9QV{`BAh9l;BOikkL#VAiT&V_k0790BN5D_b_kiD!e^P@q)up76 z$I~ovyF$#X(-i7_Pt*S_s01vaWPs(HPuLX!vq^LO=skYAiOjf3C&CQFfXBdPNlV|( z^Ms3`%opw4Pi@5TNqVl=z{M;X-LF8a7}!x|vto2N=lq@=h7$A}@-l@zuCsZb?T5|v z@hs_E#;tRR58>G+$cFo8^PEX&%-J5xu)<;8rQr_@XKtY3LM3~E2KX=qMm1o}h#h`& z1xR8UBxcv{rjhnE)o*@!%WJ^SNeUUo9p_XbRKzTG$pKDW@;b znsh$YdK#Mwg+?cpenLb&FsyP~)S}^Pd#g`*_nS;*>*Acf@Qrgi?xaEuv8_tDN6eer z5KH1stBKjEMikv`_HRK3=|ZKV>gqkls@oqJzALellde*s4LP99Z+Cv&UP1mp5Tqyh zCuGbM&H10#thoOQ(O(x5*$lOMyHRMh^C?;3w}3nbL$AWTO*hXdd&F-%HNf z7#GDPX)4KPvyn{;IUX^0%R7#F zPs?h?gN_b{#dO`-g&ic-VRcDW6$)D2TIW07Zl=bDv`en#rO&I&00(JExuI}tGc8!# z;Z0*4l!&E!II*i0k7@_JbyB;^>X6ERI}>yybJQm zX)Di!?^m0cYz>ehKBa7zIhs5dm0 lawW~-`U~I55k~lJ@BDvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000166.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000166.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb9d4b6c82fe68eac1d546b8578006a9b900069 GIT binary patch literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000Dvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000168.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000168.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb9d4b6c82fe68eac1d546b8578006a9b900069 GIT binary patch literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000Dvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000170.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000170.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb9d4b6c82fe68eac1d546b8578006a9b900069 GIT binary patch literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000Dvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000172.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000172.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb9d4b6c82fe68eac1d546b8578006a9b900069 GIT binary patch literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000Dvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000174.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000174.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb9d4b6c82fe68eac1d546b8578006a9b900069 GIT binary patch literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000P)l_=b-HqT_)cE?5axdN76zuA7H@84eSMgJk*RnGSbI;V#KT33Rgm#9QV{`BAh9l;BOikkL#VAiT&V_k0790BN5D_b_kiD!e^P@q)up76 z$I~ovyF$#X(-i7_Pt*S_s01vaWPs(HPuLX!vq^LO=skYAiOjf3C&CQFfXBdPNlV|( z^Ms3`%opw4Pi@5TNqVl=z{M;X-LF8a7}!x|vto2N=lq@=h7$A}@-l@zuCsZb?T5|v z@hs_E#;tRR58>G+$cFo8^PEX&%-J5xu)<;8rQr_@XKtY3LM3~E2KX=qMm1o}h#h`& z1xR8UBxcv{rjhnE)o*@!%WJ^SNeUUo9p_XbRKzTG$pKDW@;b znsh$YdK#Mwg+?cpenLb&FsyP~)S}^Pd#g`*_nS;*>*Acf@Qrgi?xaEuv8_tDN6eer z5KH1stBKjEMikv`_HRK3=|ZKV>gqkls@oqJzALellde*s4LP99Z+Cv&UP1mp5Tqyh zCuGbM&H10#thoOQ(O(x5*$lOMyHRMh^C?;3w}3nbL$AWTO*hXd3csgc mdwSzw^B0#%DxN@e={Q@q`iDnCY)2JAnmk?oT-G@yGywpk-Wg{A literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000179.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000179.png new file mode 100644 index 0000000000000000000000000000000000000000..1e7b03691cd4cd1088acee6dc2d1d11692d9fa25 GIT binary patch literal 73 zcmeAS@N?(olHy`uVBq!ia0vp^96;>A0wfrY&u<9_QUabXjv*3LlYj8D@GNH8$--;e@lk8jUXXh{UHx3vIVCg!08fWUC;$Ke literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000185.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000185.png new file mode 100644 index 0000000000000000000000000000000000000000..826bd0157dd94c7852702cbf5cda2eee5cef2ba2 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^96)@51xPU5`Z-AiNELXxIEGmCUY+F4cR+!Ib?5)7 z_nMkFZkST%;SlU`%Qg0l)5JZFnJ*T(d)yM%V3_dcKyT(pmb$}I5vvzxY6f()l`zN| z-kQ2z#3;tvxyU}=-Eq@#si5hFFIpzw77F{bRLg4L2Ts#{lIAsQf5hJ3zxO>Gw+pvk T!>i|FAUAlr`njxgN@xNAMAtw% literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000188.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000188.png new file mode 100644 index 0000000000000000000000000000000000000000..159bfdd8d778bf67d0d62c8932a51f96fb847059 GIT binary patch literal 315 zcmV-B0mS}^P)s{yW^TG<2P`p7!7M?5lL*^HJIdGxr$`hW~|0 z?N`6z1Goyn7mzrVXEirzI0dl$##NSIcW*)kF%0?rjlHhW*C@o&Ltfp*m)NiGoCk}n zjgk-|q8%QI4>7eaq{&9v*Z^|b#=2i9Pi4o)KNU0R0>Bh~-_ N002ovPDHLkV1k}`j*S2S literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000191.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000191.png new file mode 100644 index 0000000000000000000000000000000000000000..3f90fa233a641acee4597a139bcca9223f8ec587 GIT binary patch literal 309 zcmV-50m}Y~P)^i&u)TmRC4IUqV7eh<(0_&X<%FTr%h6O68Dege4+jrE}2Q zRBd1M^V-P1Ou&{Kc&lH10kxoKwtKsngkqns!uveZ{5LwTxEa{I-dGan00000NkvXX Hu0mjfz%YpG literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000194.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000194.png new file mode 100644 index 0000000000000000000000000000000000000000..159bfdd8d778bf67d0d62c8932a51f96fb847059 GIT binary patch literal 315 zcmV-B0mS}^P)s{yW^TG<2P`p7!7M?5lL*^HJIdGxr$`hW~|0 z?N`6z1Goyn7mzrVXEirzI0dl$##NSIcW*)kF%0?rjlHhW*C@o&Ltfp*m)NiGoCk}n zjgk-|q8%QI4>7eaq{&9v*Z^|b#=2i9Pi4o)KNU0R0>Bh~-_ N002ovPDHLkV1k}`j*S2S literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000197.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000197.png new file mode 100644 index 0000000000000000000000000000000000000000..159bfdd8d778bf67d0d62c8932a51f96fb847059 GIT binary patch literal 315 zcmV-B0mS}^P)s{yW^TG<2P`p7!7M?5lL*^HJIdGxr$`hW~|0 z?N`6z1Goyn7mzrVXEirzI0dl$##NSIcW*)kF%0?rjlHhW*C@o&Ltfp*m)NiGoCk}n zjgk-|q8%QI4>7eaq{&9v*Z^|b#=2i9Pi4o)KNU0R0>Bh~-_ N002ovPDHLkV1k}`j*S2S literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000200.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000200.png new file mode 100644 index 0000000000000000000000000000000000000000..121525218d8d1ad2bb8b1c88d5a839598e74602a GIT binary patch literal 320 zcmV-G0l)rq zt2H@2HRMVIEDmj_PeWv&Gg@fSzD_I-$37UFUPgxrbC&x=SC2El3gK7=D&CXjwV{$R zofTuR^ss(xS3Vr}OF@|8u%~bNJ@*C0^)2&^%r*mdI3Ta)K%>;7ugJ23iX50}4a`+R zN^x_|@4frmUb;?NPx|lPCz56eN08nas4pQQVOaR}_f+5! S9M1Uw0000q zt2H@2HRMVIEDmj_PeWv&Gg@fSzD_I-$37UFUPgxrbC&x=SC2El3gK7=D&CXjwV{$R zofTuR^ss(xS3Vr}OF@|8u%~bNJ@*C0^)2&^%r*mdI3Ta)K%>;7ugJ23iX50}4a`+R zN^x_|@4frmUb;?NPx|lPCz56eN08nas4pQQVOaR}_f+5! S9M1Uw0000HJ78xJBr4ggiSGdXmj{7Acwz_nGXN@2 zLOg`?9^Rnj0$%x~2%_(@{mA3EC<3Ur+^Ud)6NG)T323`}6^YLh>#gk*$aab!6W^g* zc{{s=fO9tI(v?U7xmAI4ygeX3`cYc?MmCQo0Zm)&GvYI*PaxBteY)Z8pc4WP^*-Gw z(3-ag{_k7Zy!Zt4TeZ)N&-*@s{C4)qq6nhz+PB3%SrmbP_I&|+oQzsQVF}9s0000< KMNUMnLSTY=vv8LH literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000208.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000208.png new file mode 100644 index 0000000000000000000000000000000000000000..5b92816e659e92a3b9a2327472cd7affbf555838 GIT binary patch literal 531 zcmV+u0_^>XP)|Lx2o=MSF^fc=p_ZvY$_nmcu9_@agZC7N8L`HiUE%7>RY z+Ew$Wg)`~H3z*ARtuSqTfbM==to1#0sx?Kfcd=H6s}8W%pBK=Z%S-6M5T9S*I*w!9 z#PN{fnj;?S6kI70dkhV~3}-yX;!4_d1AU3AMv2##9-OI#PjL67x6tH%0-Zl_?>2d& z^E@&8IrN$?4=hBYy5d)I51k}4=--5U$&8rMUiY|cB@bw)@88=K^!=-Cf}ijGwK&V~ zJ?J`8`%h>1_70$7L&dKs$Z^-kzZEUu_f2{{tx9 V444{$X)FK$002ovPDHLkV1m+v`rZHl literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000211.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000211.png new file mode 100644 index 0000000000000000000000000000000000000000..b69a6510be3990a5b45cf35a4e7c0a43c157e0e4 GIT binary patch literal 226 zcmV<803H8{P)j$?!PWA#1ohE~uXh4C0!IUx9@ zjF`8i&(gBRp=Nu3J5KV;@6nZxy{B#+^AGZhcLA4*sFs?Q6?7Ihg-;V7-eIBK82 zWnZ}R2=Pf#7fX>d=U48qv$HDSM5bs9#9I+^myJ`NYWjcTZtm%ac1002ovPDHLk FV1jP05AWEP)paB7D zi|Y`r#adk7I9gJDY{UvGSgh=LJawUbV|5919KDAH_<$KYs>E)P_-<$-3ugoGSf`0H z3ow(Qqh3^J#)d~AV5eWp8IL<8?#&qaYv0B(m0K|S(2LV4|7ZgUw)oks&*z^20000< KMNUMnLSTYqX;JI| literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000247.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000247.png new file mode 100644 index 0000000000000000000000000000000000000000..51681deab6aefbbc57f8a34c62e9f1bee42c49e0 GIT binary patch literal 515 zcmV+e0{s1nP)`j)H zuMg~Ns}ep6mqWNamE`_jr7FkGof2#9Hu5;fu#RCpWBM7^Z$sYfRLRQJD$TFvh*+R# zj4U7fiBO=jw_Y{o-K%2VBsGhO7*RC3exkG+gYSVpl&?@;ZZ8TYn-KPW6@3k9%^ER# zeDf-VXZV&FEO8k~i(MS>h46%LJVg&xrk&zLQK6;o19x2vzTk3s&scm$@Y^^K-<&>2 zRY{eYT>ky5uc6OTHAZ=ZqN{)QZNfsy^(7jlY|($E8PjK2-t72lHbe9BivDXs!?2_b zedd^NK^n@}C@;^WF3ULrk&#Z zi}iaJzLGvi)toAcU;3}}jp=h#VSTvxegFL+9ehI^meQAh(at9L&Hk4M51Zi8{qKax za7cyR%HpaFQ2NWb6 zg?j!gwk&w?|38ld8yn-aAOGdu6iOVnaw?skj{2a+_y^i66iUyi9ZuJYJ@-+M*R;mP?${zCKCh&CZ7_o(jF1o zS)fOBDx6>Z-HY*6Y<=41R z;EgiVFc;#?Yxv6`y)w$zCs^<6yW`vw+jrJDHoA$_I{18Wcv7X*;xKXMN$cc}_Y7=p zI;%c8eX^)jJA3Yj@p)?}2Z_q`iQMyCw;$V+Bp?2H+on|?4n%+QNc;YF@1zTcV%6b> zj-P+$)zw}XeUhB?uUl_g>58U;T>pg=7*~GRX1vF7o_EIE?1*aVRic;jx%PjHD_xp?6?2M#=5Tu^A^`GH!9S!FZ{l`>|V5wf!dSDOa5lA4_Giy?t#L;ee>e?fPCob L>gTe~DWM4f5r%M$ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000259.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000259.png new file mode 100644 index 0000000000000000000000000000000000000000..489e99128ccd612abd94581f4a8bd089c28c505d GIT binary patch literal 4397 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 UvNFhsZ2$lO07*qoM6N<$g7!p9wEzGB literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000261.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000261.png new file mode 100644 index 0000000000000000000000000000000000000000..33c4064bfbc80c5d1d4bf83f14ae1f3f24e1edc1 GIT binary patch literal 3944 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%0A6pzBAKT&&zz)!mFEVpdd-bzyG^8zB8|3&) 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 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000263.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000263.png new file mode 100644 index 0000000000000000000000000000000000000000..0103cf6c136d5127d3b666c911068584416afda7 GIT binary patch literal 4360 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 m^K*CbTj0Od?Jt?TSB~GP=ZP7k2`-KR0000z zv1=PK6o=pc)Xi(JG{$R(ZrN_R)>AF#kr1wk?AHr7w>YUtTYe??H8^+snvPoN#l~R(Qrx;Q( zl0zVP*C1(Y!Zc0xUZ!LxVoa{+7J!M!Sz|cfG#eoxmuH$PG1nALD@P*(7^4BzY~@seE(GpL7rSkEb@oR-rFYr423ieZMm9do-K3;74RqUtOs*iYqQ1QZk z{21)8+QRP(|Dp`X z4j%{=Y-Np)pRfBR@3CUghaZe!h5ArjACv8VD_8{BOPF4w3EBY2xd}d-r!?=;VacG= z_$BR>GH#Y?Ci+xN>M<&r``@C73$u)0+^_6YCh$b7dS0Rbttz?F%lPenyW!7Z$VZ&w z_9eGSg%+7k(IS6@A=xRg)*_{Ek+}Uxaf|Hcn!@l8qpSaW^MAo_?pVXwI%LzjIqVUJ zBlZgczd1A)+(RW`t{sP8LcTrQ5 RTJ-<`002ovPDHLkV1jv_Q6K;S literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000291.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000291.png new file mode 100644 index 0000000000000000000000000000000000000000..1978f792741fc1b76c02dfe27cb87cbc2c32fa77 GIT binary patch literal 581 zcmV-L0=oT)P)z z!A|2a6h-~D-ei=m#g`y65_|dqk{sfQ*mD6sga#wH{Rf={&IVXe_!a8EgD$a;*1`bau4Q8)$Tem={5E=sG z!+H?{Iv(!L!KrHOvuXkm0z!kV7v*ylznXr?Yj%il5TD|&N~JgN&-|j4ctrJ7>qnsZ zgWJ4+hTjVgr|{yb78Y#ydH;lOJOu}**)70>mIxzS)m2Ly`miC?r(d^ux>G2XPQ8YG3oio4D7g#`DL1octoy zVkGR_+K-Okkej%ui81suj5lX~bE9tQM>R78q2{xGX!e)5t2g^w`VrZWxYggzTKd^V z?b7_veWxt_jJbM#@BAL9W@lXVvooM(x8~QmKB0H^B8iCV@o3bKrU|$JWWZgNX^+eR}%a?zKa(SjkPEpe| zuETEd*w9Y{<#K3brK4L+%QSR_N3APDf0JJtM!2*?yu5d3zZ$<=@o>%F{o(ir0LiM4 TJwS|100000NkvXXu0mjfG36cW literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000294.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000294.png new file mode 100644 index 0000000000000000000000000000000000000000..6547dd1e480b49086b7991420f2de9e1471d3d13 GIT binary patch literal 668 zcmV;N0%QG&P)z zF>e|{5Jva+r9TOrew%Y>*9gfSGL8#Z2v$h$A+*oL#0lFD1x|x!Tecn{W0w zKmlZ2xG)k=TI+V^d2VJ99v^|P0nAYN*U?D$_7~vxWGF~S8qivV=L|y|hQ0>6HO5yU z(iVRM=vfa0&D2!*w2=ZX7M`5r@UBXP026&+j5fT4MRF;rT$zQ?rg6 zXMn$BtGnQ*cKmdgC#rj4VRcpcy;VP+51!xK_55}@Tfe?Lzmcs*w?v(@UE1z zy=ogl6h`lJxHP0ly0A9E2vWowgh{K#81>t1P$R=){1__{CW7>Gszi!}JX%ke#_PPm zdej62!O_0J6qE0cej+O}QVJIq=%9g_JBPb_Kas_U@RfjUlQkC?WIH>Imu)hMcR)t$ zSIF&?3?UhTveXQ!_*HqwI8-DOPm%c*RLP8jA=$K+0y;ubt+~9OUxWgK4v_?@a=NH*!Ec|vqll}S(<-ei4`Sd;_^E=B{{RRT1@}vY5K=1ocMOpR(ez(|c z^lip!dWJQAS$2aHH(J5UscqwjqJ~|Db6_>YU%yPc@``c2K&Ga68h$DJNw(^f@6^MI7-MDo9)$XJz{K%t|Ac7Z#D`eH>fFw;!H?(T1xB~K z%XssgOv69I{ND4M&M(i0@Og9_4oA2x0L+j^r6L=sIk*zTz z@+u6;jDe+yY;r^jJhw=4MAkZr!tjn!Q~!PWCb-KjYgki+Y+B5l-NUlSej(s4hlZuF zfL|f!%?=|h!!TlmkK|`YW4NTF;^Ew#`ql8ig~zrz z!D<^Z5QgXVf?=Pcs0X*cimjDj|KaXlkwupmTtXd(_=3i`DAu+)#wFuQ2$YE z$0Sbb9&(7mKPFI>N2 zQSojvCtbKL8Xfgpt^E>{%=h2p5U=bG&w#P+9M?}#;~yH_e}_qK%npCr@AXJEfN2f{d-H!q+B|BG;02rdeX-|w zoU@-mq|JqZmEhYVHEXJd=;Kj{K8JWGzp!rMf*1Gtz5D1l!2cFr+Zp%n2amr8@}-n$ Sn}2Em0000z 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 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000315.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000315.png new file mode 100644 index 0000000000000000000000000000000000000000..467ce7d7cc7e55c491c5f5b174117590c2f1b155 GIT binary patch literal 571 zcmV-B0>u4^P)z zO={yn5QX~+xk9#voI-eG2n+rv87wcRKz)}G31$R!fnF%@b=%VX z$d0|pA_hMsP`~>0y1Ha~{0#mA5oh}F-I~6(8`Ep+Oijd`VDaS(npEB@S^0joXRwh(s%aZ@` zIfd1-hV#6Dvug_Sp=7A}Mp9#i5Gcw7A6^S9I`IICXjkzi$aDFTPp9(xI($0<)fxFT zqrINsTfjMkOBPK(nUBp7b~*DSm5^#OKQx2p3lA!x>2>+t!1){a8djU=KOtW(M9XQf z<+1KUm1KMV4f18+J++@kl>~Dy zy>7xV6h`mUnjsP+uA0!bEagGkoeWOuks+olm4X>5QYkOs!Tqku4=RMxR;>yWN3oRL zd;B@Mu_{KQm-{N$&Uc5HPXT`GI}}|W_iNx#z-9Y>S>xA2Y3@sFuH219Gaml9JI_wFS6ZR88XbufexbU=9b=V@pQizBle!*|R2J-=2^7)Cm mAw&;;y&>kt@SM4E;dlqhHMPILu>$S@0000y z&1%~~6ov0A7`lk*&g#Y(vXHz9hC=G0AOd*|Z47>gLKn@ljW&ZJ?@-y8m`OShV(20@ z0aMTm%wl@Z$Z`}rKklN78hjXm=H5@|o*D7@3H}CRF2uW|FXCrGPCtv&Du?7s!h43I z4JEgfGcTzMqOGVD;@0_@xa0nf_@capL<1B}5|)qZMkp{#udFPGcUDGa&&xE1BngVf zrf%e$68PFE)p`rG7RoQix8kl8x~)``FK2<7La8Oumf3`lYw#(wbX}E->-1Cc)1PcgvE3Ds~is@ z>~XZc1M=5y`ZwczbEYYOl)rp;zGsxwR#GLl%N-RTt=ssQJj!24Y|R&K{X2ZVA%E(% z{NX{Zr|F{(e5qw-tv1?i!@uaS6KbtqUo%8t%SlEFmX$>mN>IU+JC{ zL^CT~OT}?{gOi*LIAlUjqfPmczZ5Ue)VYymdDoL^f|HzZ$nn5#%0JEbyaW$Un5L2V z>q}md23O?dekATkmWjKEgfG9O2Xm%rc>;Gw1~M-fR9i}xk(T}>x>aExx`s^S~tIG4Y8dU)?@ gI;mgD)&D7f0Pm~lW`eTEKmY&$07*qoM6N<$f?y z!D<>&6o&6B3|L4AWaonjBW)0b21k&9I|o7}tAM*ec2f$4K!sic_Z@^uXt~8%l_E&r zA)vN{<-WjOO#lC0O-!PRU3AeveiUZT`TWm+jwtXa@UJ0yBnmqoi(=TN%#MXs#!#ei z&uNO(6q!NPyb#JjjG1IYQtZ3DFKm(@iXu%Yr7DUBA1oB8y2l!{^97bmkH=%$R9d%m9Y@0|XbD_Td% z*^Ock_(sS#(jcd-=QBCc@-P$1^VPQCbN+F(p6_%mpP#RCeDkM#Erh{d5AM*c+pl=;Q| z;6{bUjaEM7E3MAgeBv9Juk@qU3%<%0^Bws49@9UXc)4l5dvwy7$ocNN{9Tgoa-V#` zGx^&^{%&`{7X(}9?_ilfe_uvG8$Opm?ynEw{62q7Y=awrP05 z`;us$g3Ww)Vo|_;9eGG=uq0{Sn8(lQjF4ALNMj7I#YFRADX!bHFVfc$4pb$qE|1J0 zSd{nsF{z1`oF0jCbXF6Mu$1{D6QHy&zn*WiIE%-$xC8nLkFN$nZPpQXh>fx{i2LQv zgJzv4vd$B!F}&t!nu$1`Q%g0o;7MdL6fKe0000< KMNUMnLSTZs7kIw_ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000327.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000327.png new file mode 100644 index 0000000000000000000000000000000000000000..363456e38dadf5536f2bde969257b688de4e730f GIT binary patch literal 758 zcmVz zv1;2;6o$_$IIbzBTcHKfDafG|Pesa*F-@FPyArJ^foET4?oV9L95PgbPI8G4s zPQe+x_7$=e@&b3b{m-=|3&&2Hp+gP+k<9fupZ@#bBeM7qz8NGNkTu80WXID9*->{w zMztBjOm1B!!kGwbOR?&UbZ{Fhjo%=q!G~nlpRSQj-wh$5hoa3;$~TKfC~(Hxn!Lk0 zBFlpocGWNO@7%6Ar{l*d5xY8~lTEBH3#iTsT=(EO%| zkD?+r^DBHD?`Vp5d`*E5G=C;2>Oa6I{*A6hx^18-Cu*sG9Cvd6Vg)p%93K{gPZfM( zoe7b{Re`7afjs|(RSl#6l|Csxw zxNdEoC!!($_`VCEk;~t%%iplVmnQ;_hnvqOe|XAdQ-;EFzETVdmYH=3BSaaQz2*8aIEHV9?Ju*L|h|CS7G9txdPa@!Dkkf;)rYQO?a-bjG{2_78 ztzcMO3h8ZO_Bn3Pg)f4*=D@Io3rn|IVRp2S+bG%>iT(lKDZ~f=;2R}2|Vsx#`NdN!<07*qoM6N<$f{MU#A^-pY literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000330.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000330.png new file mode 100644 index 0000000000000000000000000000000000000000..52667e285f442c76e02abaf165aef70398632312 GIT binary patch literal 597 zcmV-b0;>IqP)z zF>BjE6vy9Z(a@pv zwUyw!hpm8574ZvuO03?-2gIZ1oY?L9#p0LS7D%U_F49{39Q+ztkvXxVX09;cXKjiZXQm=! zP{8c(x0~PWC%<{fFAe#%Jwko}pX}>*_F#U^zWa+v*fp4;oWm|C1wR=L`K1WkIqa`e zSfH!_z)xE4<0mayjT~mIMJ;hR=Z8C>HWJDDH}ZQ5Y!vZaq1)OG`#Dil4sfc0pBuq% zBrB@#-rsaB`ofmTNIU;=G8BLEtTT8Og5)f)=5l!R8PAQLw>yVYbl=K*StsWtHi2rIXe!K3hsl+&3P2xl=VE7H0ZOsab~ zzYC$c7Y&c0n7S_P1uhqzUuX^uPZ;3ADY~%r7?)a){a^A+#2^v1WzwIk-E*%s{z>!% jFyXzCw6~x8{~SL6-5WY%1SXLW00000NkvXXu0mjfa3>r6 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000333.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000333.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe109b8464759d1bda7df0e3686734f62ea07fe GIT binary patch literal 574 zcmV-E0>S->P)z z!D<^Z5QgXB1cAi#1q?YV1w&533dHSsvHJ$O1{UP2vD4MMx)dB($I-1jRDpbB}^^ZiBSWFq~mH%cxp7yFnPa zibAeFQY_9G`U;_1bG&XEA)s`3maZ?ymiohKq+1PWjZkfxM)6l{{Z7~q$t8LOB_nq?^C`&@TfuF$QaKjbF4TIHo_+c4W90SKm?GQgv@87J!rkm*a36tV2 zJAXw*eu)bTr@tBELf7&2{yosbf0*G(Qsip?y({Gz{NCb!ON|e?cV9Vv0#IE@siw>$5dZ)H M07*qoM6N<$f(hOgIRF3v literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000336.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000336.png new file mode 100644 index 0000000000000000000000000000000000000000..0f9506db720b718ec1598768c9e6c6be19e3ab33 GIT binary patch literal 266 zcmV+l0rmcgP)un;%y{k5K;;KbEupBrR%L*!->mev_W} zXVr;8&Ch@3Cx`oG#vr?2;$DCA>c`#wdVckfT7MzHZ}R>79T*rG82Br^0F~_Lj%Xz$ QdjJ3c07*qoM6N<$f?i;9p8x;= literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000339.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000339.png new file mode 100644 index 0000000000000000000000000000000000000000..7431212e565c06d5b1210047f6f658299d9f1ad0 GIT binary patch literal 388 zcmV-~0ek+5P)IhzK z@9(1|P>D5F;zmTk>~${nx#kj~)HUkX85i37>!y*W+D(;`bx7LptK0f3?xt6ormrOL zQJ-(-EmC)`EskSti>tASiz*qW9>uB^HmUou2#J(DOkwFlxvEo5U-@Nkp>0000cXWFC0`kFSAv@>00d6mv!-}lg~%J^yFW-dcVfnuR$+u&Tn*j@lqrF zZ{xYE$?}Yv6S>s(dZxhmA`Z|{P~5mTlgm9+6)(v;csL_Fk7@`@weEiO|k z+5AuYu6Xu(`iHMA`Fb@)Z2sQMx>u~2aEs^mh3di+*M;{vvdV|9a8I?KzapUjl-`eN z&-U%vX}oXW%buzIu?hB7r9U2sTeZs>8f2Z$E7xYCkJaoD%z?^lWWqaeB?PpLaiRk>WaL#za|7ia=#`)@6zVcQ4z7Mk>@aTV0y1MXxRFL7fMzen^HE*|RZ1?-QXXE)N z9<8}6wpergn^|*K$j<+V)5FQe6;bJTI=i@5o(0-G%^4{8hs$mi&;w<5feYoP#(vm( z25hzOWl3%M-3RI_aC#$q`iIWA9|bn@3+qkfZ?wf7R-CV2GndQm_n&zmL_gm)1O|x| zI7sYH|9SWG2J5%QMRsi$Zs&Zc`NzGbvcaI{_kZb*Q*QH?`%6ERKJ~d$?#;jY>p_N- zpMQSS|6y&|qCIt=YvwKWIrh1db!uqSgn1{oYd+*|>3?4jii)&PUWb5wnD^t~_OcV= z9Pv>H-9=vo-aMzSb!G7;?tNQ#>gT`f$xpUQewr+PqkjRP{2!<17o3mz?oyNg8$R7% z#{2!HqhCJntXVB&x9`8L?D^w1wzK$iobz8y&==jer0Klfe)XE8f7IM=vfjUNXS#X$ zvGkeuZ9(A?a?YL4_RloeNkVTw@iCRVvWf;}JE>^78dP5NYpn{gd#J4yv6_4Dnkna7 zbPtKGy`dKMaP?KDYKQe(bQX-b(c5&mU>isFZ)6M`^x{??|(`@e12lh zn##o&|Jokvx8A(z+1}fr7EIv2jW@dkuhstaj`VZPzQk Zm*+7#vV_C(L>(x9dAj!|EvlSxcrApWUL6l>}7QTwVPC|9^8=`D;KsKgl@ypcan1f2H>Y{?L_ z?0Vq7VUOre*9&>B_EQ(UNvb`}xt!TUHe1~KP3^LeCU5rNkKgCjWTvAhTn4m@!PC{x JWt~$(69B!RQFj0U literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_dark.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..371b8a38c7fca2a6e84644b970efb89d3731ff75 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$ZoNuDl_Arezl`yII& z40u?IMgDAY|EMao@ar1;Th4zRld`#HS?RR$c+M93%2S-MsFhi}&|UE6fwrQw72Fr6 zaqBJ6Jry759+$ZF|82qd2ARQ+)~h%+Rmfe`Ejv=R_#@Ao{rB(x`oAQT=g8hwK-(BR MUHx3vIVCg!0FowD*Z=?k literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_dragon.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_dragon.png new file mode 100644 index 0000000000000000000000000000000000000000..37402ebc465907ccaf28279ae416e3039b57c2b6 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1mj`ah}qY*19QW3lCb zFUu)=m;7I|SK;0>!|EvlSxcrApWUL6l>}7QTwVPC|9^8=`D;K+a%Y2?gO4of}PjIcvJ>h*zb&<)UizVI; zzE>JMn0rLnGE|-&QS8{HbMPP2sVvRgN9~;b9q+$xNS|t)X8wM;=-Yia()ZXu{V4ls c-`{`y)fMeiV;^Mv2U^bH>FVdQ&MBb@080p7wEzGB literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_electric.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_electric.png new file mode 100644 index 0000000000000000000000000000000000000000..ee8c9dd83b0eb69e21fbaafde583142f55684634 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zog`O^sArezl`wjUT z6nI>BOQf?sRtvv$u=>T5%Kxmdc%$qUm_I1kKU}J-aLL%7clw=$iBm5q9{kJ79P`XA z(d%GU;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zod7dtgArezl`yII& z40u?Y!|fG+F;|Ps(&v_|^?Ns4e#tW3km&Z-WzOPKiza5ijmY4ZwQgk;pQ9rw-7O!= zz!NMQ9HJ=Ktyi;3^yGO{(?*?;i!LiaELT#Tc}sf{i-JfC1|Hgmu Wc3P1o-)WFD7(8A5T-G@yGywo`VNtaJ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_fire.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..e92d77a788266c725e0def004ea2ee8e439631cb GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zoxt=bLArezl`!Dhy zHsEmS+~qKf*X#dVt()~Tr5W-ISj_W;cKdsrP`5pxqcze=PX-+#+i XfAJR$Rp9*zw3xxu)z4*}Q$iB}8nReG literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_flying.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_flying.png new file mode 100644 index 0000000000000000000000000000000000000000..7a750718636b0dae519c87aaee9e615a7fcbbbff GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1mjd-VUBDc_2t=44Iz zHs{{GtN-75SqA-&>i&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?nmFba4!kn3{V2 zBJW`X4wisbdK1!`C)KZ*^>=zA!;J?gc2145+{v$FFP+jor?}cDGUckK|HWXJ-P$&L zb{ueYs8a}J(BgQN*zifh!0E8FHV5yQ9TQpP1O88w{~_)+y}Wm4OUUUh37uQ6ygq#I ibKT_Mc27%x{$;FKkl3TRFX08y0Sun5elF{r5}E)rhGakh literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_ghost.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_ghost.png new file mode 100644 index 0000000000000000000000000000000000000000..94f7b825ab64eefb36e5835dc5c09540d22d598a GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1mjd-VUBDc_2t=44Iz zHs{{GtN-75SqA-&>i&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?nmCba4!kn3{Ti zBd?Pok85Ceo2fufL-+lg+KPb&8-73Mo%d1QYhppSho#pVmz4KK@w-ksPoK9an%9rt zYU`pO%xP@ZjKa)sSk5;bZ#b3ZaJ1!f$$3WgA3GKaPvZ5wGAD6EgQK8XLiLU6yYfYU eb@u+N`_H!|EvlSxcrApWUL6l>}7QTwVPC|9^8=`D;K|}e+#F?qG6{lA7?pf+9b0~u|dG$3` zyPJ#vOj-oUCoQQbf8x|FnSc3jGz=`(7sAFZ_4nvH6C- bf9u!-Ws+vTXUbRsw4A}y)z4*}Q$iB}Ii*;C literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_ground.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_ground.png new file mode 100644 index 0000000000000000000000000000000000000000..623e5b7dd74edc2fd144f000e9443df41a3dfaa4 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$ZorJgR1Arezl`#16) zHsE22JlZYjslIN4lE+)62JwHtb}~wOW$FCxVlNeun{;C8+lU)amvif1Q|#Ow0f^VQ$P`CtD` gIbQy-_V-`;Yw~Skak~1RKnE~*y85}Sb4q9e0AqMu9RL6T literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_ice.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_ice.png new file mode 100644 index 0000000000000000000000000000000000000000..70f47b29dd61f59e536da86629e82454321f2712 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1mjd-VUBDc_2t=44Iz zHs{{GtN-75SqA-&>i&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?oxkba4!kn3~#e z$k(92<7&OLa?g9U(u<#WSy*lQ#v$+3Gx3qP;!E!r%axQb3*Ja^PY~oWS*W^r>U?*V zG}ESUTmrMs=6_+*kYUl~DD$^b6@49CQ?puMwdPINU#-uw7WKEoHz?mdKI;Vst0NHC*L;wH) literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_mystery.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_mystery.png new file mode 100644 index 0000000000000000000000000000000000000000..7c0e8d8ea9cfec0b2b0662eeac70f33cc847bb99 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1mj`ah}qY*19QW3lCb zFUu)=m;7I|SK;0>!|EvlSxcrApWUL6l>}7QTwVPC|9^8=`D;KU;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zod7dtgArezl`#176 zDDb%Keli&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?nmFba4!kn3~$} z$me9p;c|25#|`gdDh$LWUd81*8Qn<`=$QTQzmxI9ttM+vOnhDbSXcgTMW>vAZ&p=N zsK)eeBc?a2rd~{Hz0S8b$)(6;%b7RA5xP33id*_-oZP>`<*Z<&`Sb=Y8H17;^X0$Y i_`N*lo%Ht0@9QgfZMm=aE95EA0Sun5elF{r5}E+R_huph literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_psychic.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_psychic.png new file mode 100644 index 0000000000000000000000000000000000000000..6f1e1a94d6424af78f3862ac9f26c011f54084de GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1mjd-VUBDc_2t=44Iz zHs{{GtN-75SqA-&>i&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?nmHba4!kn3~#e zD8yvQ!+iJ9Xzopr0Eg*h761SM literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_rock.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_rock.png new file mode 100644 index 0000000000000000000000000000000000000000..948b295ead0c70de61d2cbdcd57d3d65f1d55226 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$Zosh%#5Arezl`yGWE z6gXTXP3Eq4y{izFHG7w3^d3gH6{as{@4wJ)!EnKNZ6B*y$(sgQtt7QAE|ZiZvV=q( zlOAfscXO@{nK&y$KO*b;fAE_QV~^!UvB-tahK`hIzX`+dbX{xM#do;RaukFqe( OLIzJ)KbLh*2~7ZT`c#_$ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_steel.png b/res/battle/graphic/pl_batt_obj/sprites/type_icon_steel.png new file mode 100644 index 0000000000000000000000000000000000000000..4bbdb9426596df845b43a50c88ddf96bd987f081 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f7S3?kl_?V&1Xlm z_AasP&NBS}zk1D@>U;N&7Dst`Ia==Bdljgxxw`oO|NqXPrl$ZonVv3=Arezl`yII& z40u?IzdpLXm#fZ$i&Op%ao*~C5}t(HSe7=Wl3{&@&Et-cbFcu1?oxnba4!kn3~#e z$ag@2!!>f(w~&&fd~g3+8$9NsZ0<{(`xJ2W(q3cYTnOwKcLzaWSx(a@NInjqIQL8P9fK$m@Lm{kQnSgxbVk Tn_rj#tz__Y^>bP0l+XkKtZ7_z literal 0 HcmV?d00001 diff --git a/res/battle/meson.build b/res/battle/meson.build index 0ca6e6ca42..ef190638a5 100644 --- a/res/battle/meson.build +++ b/res/battle/meson.build @@ -1,2 +1,3 @@ subdir('moves') subdir('scripts') +subdir('graphic') \ No newline at end of file diff --git a/res/prebuilt/battle/graphic/meson.build b/res/prebuilt/battle/graphic/meson.build index f44c61a99e..7100a79bec 100644 --- a/res/prebuilt/battle/graphic/meson.build +++ b/res/prebuilt/battle/graphic/meson.build @@ -5,7 +5,6 @@ prebuilt_files = [ 'batt_obj.narc', 'pl_b_plist_gra.narc', 'pl_batt_bg.narc', - 'pl_batt_obj.narc', 'vs_demo_gra.narc' ] diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 4442b89ad3..ff13d30519 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -2800,7 +2800,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ for (v4 = 0; v4 < 4; v4++) { if ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0)) { v5 = MoveTable_LoadParam(param2->unk_00[v4], MOVEATTRIBUTE_TYPE); - v1 = Graphics_GetCharData(sub_0207C944(), sub_0207C908(v5), 1, &v2, 5); + v1 = Graphics_GetCharData(Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(v5), 1, &v2, 5); MI_CpuCopy32(v2->pRawData, v0->unk_18[v4], v3); Heap_FreeToHeap(v1); } diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 8bf73f9afe..209c3c8bd6 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -400,16 +400,16 @@ static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1 { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, sub_0207C944(), sub_0207C908(param3), 1, param2); - sub_0200D41C(param1, sub_0207C92C(param3) + 4); + sub_0200D948(v0, param0->unk_1FB0, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param3), 1, param2); + sub_0200D41C(param1, Battle_Obj_TypeIndexToPaletteIndex(param3) + 4); } static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2) { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, sub_0207CAC0(), sub_0207CA90(param2), 1, 45077); - sub_0200D41C(param1, sub_0207CAA8(param2) + 4); + sub_0200D948(v0, param0->unk_1FB0, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(param2), 1, 45077); + sub_0200D41C(param1, Battle_Obj_MoveTypeIndexToPaletteIndex(param2) + 4); } static void ov13_02224AB0(u16 param0, CellActorData *param1, const int param2, const int param3) diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index e107cfb6b0..ff569c86c8 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -35,12 +35,12 @@ typedef struct { UnkStruct_ov19_021DA9E0 *unk_08; } UnkStruct_ov19_021DAE2C; -u32 sub_0207C908(int param0); -u32 sub_0207C920(void); +u32 Battle_Obj_TypeIndexToIconNARCMember(int param0); +u32 Battle_Obj_GetPaletteNARCMember(void); u32 sub_0207C924(void); u32 sub_0207C928(void); -u8 sub_0207C92C(int param0); -u32 sub_0207C944(void); +u8 Battle_Obj_TypeIndexToPaletteIndex(int param0); +u32 Battle_Obj_GetNARCIndex(void); void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2); static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0); static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0); @@ -78,7 +78,7 @@ BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_30 = NULL; param0->unk_44 = MessageLoader_GetNewStrbuf(param5, 21); param0->unk_48 = MessageLoader_GetNewStrbuf(param5, 22); - param0->unk_34 = Graphics_GetCellBank(sub_0207C944(), sub_0207C924(), 1, &(param0->unk_38), 10); + param0->unk_34 = Graphics_GetCellBank(Battle_Obj_GetNARCIndex(), sub_0207C924(), 1, &(param0->unk_38), 10); for (v0 = 0; v0 < 2; v0++) { param0->unk_3C[v0] = NULL; @@ -215,10 +215,10 @@ static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0) CellActorResourceData v1; u32 v2, v3, v4; - v2 = sub_0207C944(); - v3 = sub_0207C908(2); + v2 = Battle_Obj_GetNARCIndex(); + v3 = Battle_Obj_TypeIndexToIconNARCMember(2); - Graphics_LoadPalette(v2, sub_0207C920(), 1, 10 * 0x20, 0x20 * 3, 10); + Graphics_LoadPalette(v2, Battle_Obj_GetPaletteNARCMember(), 1, 10 * 0x20, 0x20 * 3, 10); for (v4 = 0; v4 < 2; v4++) { NNS_G2dInitImageProxy(&v0); @@ -413,25 +413,25 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p VecFx32 v2; u32 v3, v4; - v3 = sub_0207C944(); - v4 = sub_0207C908(param1->unk_10->unk_4C.unk_0C); + v3 = Battle_Obj_GetNARCIndex(); + v4 = Battle_Obj_TypeIndexToIconNARCMember(param1->unk_10->unk_4C.unk_0C); - Graphics_LoadObjectTiles(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); v2 = *CellActor_GetPosition(param1->unk_3C[0]); v2.y = (176 + (16 * param3)) << FX32_SHIFT; CellActor_SetPosition(param1->unk_3C[0], &v2); - CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0C)); + CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + Battle_Obj_TypeIndexToPaletteIndex(param1->unk_10->unk_4C.unk_0C)); CellActor_SetDrawFlag(param1->unk_3C[0], 1); if (param1->unk_10->unk_4C.unk_0C != param1->unk_10->unk_4C.unk_0D) { - Graphics_LoadObjectTiles(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); v2.x += (36 << FX32_SHIFT); CellActor_SetPosition(param1->unk_3C[1], &v2); - CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0D)); + CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + Battle_Obj_TypeIndexToPaletteIndex(param1->unk_10->unk_4C.unk_0D)); CellActor_SetDrawFlag(param1->unk_3C[1], 1); } else { CellActor_SetDrawFlag(param1->unk_3C[1], 0); diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 29e3002d8f..cb2d300a91 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -2435,7 +2435,7 @@ static void ov70_0225F95C(SysTask *param0, void *param1) } { - Graphics_LoadPalette(sub_0207C944(), sub_0207C920(), 4, 11 * 32, 3 * 32, v0->unk_156); + Graphics_LoadPalette(Battle_Obj_GetNARCIndex(), Battle_Obj_GetPaletteNARCMember(), 4, 11 * 32, 3 * 32, v0->unk_156); } SysTask_Done(param0); @@ -2634,14 +2634,14 @@ static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA if (v0 != 0) { v2 = ov66_022316E8(v0); - v3 = LoadMemberFromNARC(sub_0207C944(), sub_0207C908(v2), 1, param3, 1); + v3 = LoadMemberFromNARC(Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(v2), 1, param3, 1); NNS_G2dGetUnpackedCharacterData(v3, &v4); Bg_LoadTiles(param2->unk_00, Unk_ov70_0226D5CC[3], v4->pRawData, 4 * 2 * 32, Unk_ov70_0226D590[v1]); Heap_FreeToHeap(v3); Bg_CopyToTilemapRect(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, Unk_ov70_0226D624[v1], 0, 0, 4, 2); - Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + sub_0207C92C(v2)); + Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + Battle_Obj_TypeIndexToPaletteIndex(v2)); Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov70_0226D5CC[3]); } } diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index 420723dd12..cfe136882f 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -448,10 +448,10 @@ void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2) v1 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_TYPE); v2 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_D8, param0->unk_DC, sub_0207C944(), sub_0207C908(v1), 1, 49409); - sub_0200D41C(param0->unk_E0[10], sub_0207C92C(v1) + 6); - sub_0200D948(param0->unk_D8, param0->unk_DC, sub_0207CAC0(), sub_0207CA90(v2), 1, 49410); - sub_0200D41C(param0->unk_E0[11], sub_0207CAA8(v2) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(v1), 1, 49409); + sub_0200D41C(param0->unk_E0[10], Battle_Obj_TypeIndexToPaletteIndex(v1) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(v2), 1, 49410); + sub_0200D41C(param0->unk_E0[11], Battle_Obj_MoveTypeIndexToPaletteIndex(v2) + 6); } void ov84_02240E24(UnkStruct_ov84_0223B5A0 *param0, s16 param1, s16 param2) diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 451d5dca17..269ceabea2 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1366,8 +1366,8 @@ static void ov91_021D22A0(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CONTEST_TYPE) + 18; } - sub_0200D948(param0->unk_110, param0->unk_114, sub_0207C944(), sub_0207C908(v0), 1, 47276 + param2); - sub_0200D41C(param0->unk_118[6 + param2], sub_0207C92C(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(v0), 1, 47276 + param2); + sub_0200D41C(param0->unk_118[6 + param2], Battle_Obj_TypeIndexToPaletteIndex(v0) + 2); } static void ov91_021D2314(UnkStruct_ov91_021D0ED8 *param0) @@ -1444,8 +1444,8 @@ static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_110, param0->unk_114, sub_0207CAC0(), sub_0207CA90(v0), 1, 47275); - sub_0200D41C(param0->unk_118[5], sub_0207CAA8(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(v0), 1, 47275); + sub_0200D41C(param0->unk_118[5], Battle_Obj_MoveTypeIndexToPaletteIndex(v0) + 2); } static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) diff --git a/src/unk_0207C908.c b/src/unk_0207C908.c index 8588f4344e..1d414e3e71 100644 --- a/src/unk_0207C908.c +++ b/src/unk_0207C908.c @@ -11,7 +11,12 @@ #include "palette.h" #include "unk_0200C6E4.h" -__attribute__((aligned(4))) static const u32 Unk_020F0AF0[] = { +#include "narc.h" + +/* +* Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. +*/ +__attribute__((aligned(4))) static const u32 Battle_Obj_Type_NARC_Member_Map[] = { 0xEA, 0xE1, 0xE3, @@ -37,7 +42,10 @@ __attribute__((aligned(4))) static const u32 Unk_020F0AF0[] = { 0xEF }; -__attribute__((aligned(4))) static const u8 Unk_020F0B4C[] = { +/* +* Maps a type index (e.g. TYPE_WATER) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. +*/ +__attribute__((aligned(4))) static const u8 Battle_Obj_Type_Palette_Index_Map[] = { 0x0, 0x0, 0x1, @@ -63,27 +71,41 @@ __attribute__((aligned(4))) static const u8 Unk_020F0B4C[] = { 0x0 }; -__attribute__((aligned(4))) static const u32 Unk_020F0AE4[] = { +/* +* Maps move types (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. +*/ +__attribute__((aligned(4))) static const u32 Battle_Obj_MoveType_NARC_Member_Map[] = { 0xF4, 0xF6, 0xF5 }; -__attribute__((aligned(4))) static const u8 Unk_020F0AE0[] = { +/* +* Maps a move type (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. +*/ +__attribute__((aligned(4))) static const u8 Battle_Obj_MoveType_Palette_Member_Map[] = { 0x0, 0x1, 0x0 }; -u32 sub_0207C908(int param0) +/* +* Given a type index, return the corresponding NARC member containing the icon for that type. +* See also Battle_Obj_GetNARCIndex. +*/ +u32 Battle_Obj_TypeIndexToIconNARCMember(int typeIndex) { - GF_ASSERT(param0 < NELEMS(Unk_020F0AF0)); - return Unk_020F0AF0[param0]; + GF_ASSERT(typeIndex < NELEMS(Battle_Obj_Type_NARC_Member_Map)); + return Battle_Obj_Type_NARC_Member_Map[typeIndex]; } -u32 sub_0207C920(void) +/* +* Returns the NARC member within pl_batt_obj containing palettes for battle icons. +* See also Battle_Obj_GetNARCIndex. +*/ +u32 Battle_Obj_GetPaletteNARCMember(void) { - return 74; + return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE; } u32 sub_0207C924(void) @@ -96,36 +118,43 @@ u32 sub_0207C928(void) return 243; } -u8 sub_0207C92C(int param0) +/* +* Given a type index, return the corresponding palette index to use for that type's icon. +* See also Battle_Obj_GetNARCIndex and Battle_Obj_GetPaletteNARCMember. +*/ +u8 Battle_Obj_TypeIndexToPaletteIndex(int param0) { - GF_ASSERT(param0 < NELEMS(Unk_020F0B4C)); - return Unk_020F0B4C[param0]; + GF_ASSERT(param0 < NELEMS(Battle_Obj_Type_Palette_Index_Map)); + return Battle_Obj_Type_Palette_Index_Map[param0]; } -u32 sub_0207C944(void) +/* +* Returns the index of the NARC for pl_batt_obj. +*/ +u32 Battle_Obj_GetNARCIndex(void) { - return 27; + return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { - sub_0200CBDC(param0, param1, sub_0207C944(), sub_0207C908(param3), 1, param2, param4); + sub_0200CBDC(param0, param1, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param3), 1, param2, param4); } void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) { - sub_0200CC9C(param0, param1, sub_0207C944(), sub_0207C920(), 0, 3, param2, param3); + sub_0200CC9C(param0, param1, Battle_Obj_GetNARCIndex(), Battle_Obj_GetPaletteNARCMember(), 0, 3, param2, param3); } void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5) { - sub_0200CD7C(param0, param1, param2, param3, sub_0207C944(), sub_0207C920(), 0, 3, param4, param5); + sub_0200CD7C(param0, param1, param2, param3, Battle_Obj_GetNARCIndex(), Battle_Obj_GetPaletteNARCMember(), 0, 3, param4, param5); } void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3) { - sub_0200CE0C(param0, param1, sub_0207C944(), sub_0207C924(), 1, param2); - sub_0200CE3C(param0, param1, sub_0207C944(), sub_0207C928(), 1, param3); + sub_0200CE0C(param0, param1, Battle_Obj_GetNARCIndex(), sub_0207C924(), 1, param2); + sub_0200CE3C(param0, param1, Battle_Obj_GetNARCIndex(), sub_0207C928(), 1, param3); } void sub_0207CA34(SpriteGfxHandler *param0, u32 param1) @@ -150,7 +179,7 @@ CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, in SpriteTemplate v1; v1 = *param3; - v1.plttIdx = sub_0207C92C(param2); + v1.plttIdx = Battle_Obj_TypeIndexToPaletteIndex(param2); v0 = SpriteActor_LoadResources(param0, param1, &v1); return v0; @@ -161,26 +190,38 @@ void sub_0207CA88(CellActorData *param0) sub_0200D0F4(param0); } -u32 sub_0207CA90(int param0) +/* +* Given a movetype index, return the corresponding NARC member containing the icon for that movetype. +* See also Battle_Obj_GetNARCIndex. +*/ +u32 Battle_Obj_MoveTypeIndexToIconNARCMember(int moveTypeIndex) { - GF_ASSERT(param0 < NELEMS(Unk_020F0AE4)); - return Unk_020F0AE4[param0]; + GF_ASSERT(moveTypeIndex < NELEMS(Battle_Obj_MoveType_NARC_Member_Map)); + return Battle_Obj_MoveType_NARC_Member_Map[moveTypeIndex]; } -u8 sub_0207CAA8(int param0) +/* +* Given a movetype index, return the corresponding palette index to use for that movetype's icon. +* See also Battle_Obj_GetNARCIndex and Battle_Obj_GetPaletteNARCMember. +*/ +u8 Battle_Obj_MoveTypeIndexToPaletteIndex(int moveTypeIndex) { - GF_ASSERT(param0 < NELEMS(Unk_020F0AE0)); - return Unk_020F0AE0[param0]; + GF_ASSERT(moveTypeIndex < NELEMS(Battle_Obj_MoveType_Palette_Member_Map)); + return Battle_Obj_MoveType_Palette_Member_Map[moveTypeIndex]; } -u32 sub_0207CAC0(void) +/* +* Returns the index of the NARC for pl_batt_obj. +* (This is identical to Battle_Obj_GetNARCIndex). +*/ +u32 Battle_Obj_GetMoveTypeNARCIndex(void) { - return 27; + return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } void sub_0207CAC4(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { - sub_0200CBDC(param0, param1, sub_0207CAC0(), sub_0207CA90(param3), 1, param2, param4); + sub_0200CBDC(param0, param1, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(param3), 1, param2, param4); } void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1) diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index aac05b835c..16d48b3f5c 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -429,8 +429,8 @@ void sub_0208F16C(PokemonSummaryApp *param0) static void sub_0208F194(PokemonSummaryApp *param0, u8 param1, u8 param2, u8 param3) { - sub_0200D948(param0->renderer, param0->gfxHandler, sub_0207C944(), sub_0207C908(param3), 1, param2); - sub_0200D414(param0->unk_41C[param1], sub_0207C92C(param3) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param3), 1, param2); + sub_0200D414(param0->unk_41C[param1], Battle_Obj_TypeIndexToPaletteIndex(param3) + 3); } static void sub_0208F1E4(PokemonSummaryApp *param0, u8 *param1, s16 *param2, s16 *param3) @@ -464,8 +464,8 @@ void sub_0208F294(PokemonSummaryApp *param0, u32 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->renderer, param0->gfxHandler, sub_0207CAC0(), sub_0207CA90(v0), 1, 10); - sub_0200D414(param0->unk_41C[18], sub_0207CAA8(v0) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(v0), 1, 10); + sub_0200D414(param0->unk_41C[18], Battle_Obj_MoveTypeIndexToPaletteIndex(v0) + 3); } void sub_0208F2E8(PokemonSummaryApp *param0) diff --git a/tools/scripts/make_pl_batt_obj.py b/tools/scripts/make_pl_batt_obj.py new file mode 100644 index 0000000000..494792b400 --- /dev/null +++ b/tools/scripts/make_pl_batt_obj.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 +import argparse +import json +import pathlib +import subprocess +import os +import shutil + +argparser = argparse.ArgumentParser( + prog='pl_batt_obj.narc packer', + description='Packs the archive containing battle graphics' +) +argparser.add_argument('-k', '--knarc', + required=True, + help='Path to knarc executable') +argparser.add_argument('-n', '--nitrogfx', + required=True, + help='Path to nitrogfx executable') +argparser.add_argument('-p', '--private-dir', + required=True, + help='Path to the private directory (where binaries will be made)') +argparser.add_argument('-o', '--output-dir', + required=True, + help='Path to the output directory (where the NARC will be made)') +argparser.add_argument('order', + nargs=1, + help='File indicating list of files to pack and the order to pack') +args = argparser.parse_args() + +private_dir = pathlib.Path(args.private_dir) +output_dir = pathlib.Path(args.output_dir) +order_list = pathlib.Path(args.order[0]) + +private_dir.mkdir(parents=True, exist_ok=True) + +dest_dir = private_dir / 'pl_batt_obj_work' +dest_dir.mkdir(parents=True, exist_ok=True) + +with open(order_list) as f: + all_lines = f.readlines() + for index in range(len(all_lines)): + line = all_lines[index] + fname = str(private_dir / line.strip()) + dest = str(dest_dir / f"{index:08}_{line.strip()}") + shutil.copy(fname, dest) + +subprocess.run([args.knarc, '-d', dest_dir, '-p', output_dir / 'pl_batt_obj.narc']) + +print(output_dir) \ No newline at end of file diff --git a/tools/scripts/make_pl_batt_obj_palettes.py b/tools/scripts/make_pl_batt_obj_palettes.py new file mode 100644 index 0000000000..fee8ada41f --- /dev/null +++ b/tools/scripts/make_pl_batt_obj_palettes.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python3 +import argparse +import json +import pathlib +import subprocess +import os +import shutil + +argparser = argparse.ArgumentParser( + prog='pl_batt_obj.narc palette builder and size fixer', + description='Builds NCLR palette files and fixes the size field if requested.' +) +argparser.add_argument('--nitrogfx', + required=True, + help='Path to nitrogfx executable') +argparser.add_argument('--input', + required=True, + help='Input NCLR file to make adjustments to.') +argparser.add_argument('--output', + required=True, + help='Output NCLR file to write to.') +args, extra_args = argparser.parse_known_args() + +input_file = pathlib.Path(args.input) +output_file = pathlib.Path(args.output) + +resize = False +ngfx_args = [args.nitrogfx, input_file, output_file] +for arg in extra_args: + if arg == "-fixsize": + resize = True + else: + ngfx_args.append(arg) + +subprocess.run(ngfx_args) + +if resize: + with open(output_file, mode="rb") as f: + data = f.read() + size = int.from_bytes(data[32:36], byteorder='little') + size = 512 - size + data = data[:32] + int.to_bytes(size, byteorder='little', length=4) + data[36:] + + with open(output_file, mode="wb") as f: + f.write(data) \ No newline at end of file diff --git a/tools/scripts/meson.build b/tools/scripts/meson.build index cd93ead08f..0917131a3b 100644 --- a/tools/scripts/meson.build +++ b/tools/scripts/meson.build @@ -9,4 +9,6 @@ make_pl_growtbl_py = find_program('make_pl_growtbl.py', native: true) make_species_tables_py = find_program('make_species_tables.py', native: true) make_tutorable_moves_py = find_program('make_tutorable_moves.py', native: true) make_pokedex_data_py = find_program('make_pokedex_data.py', native: true) -make_pokedex_message_banks_py = find_program('make_pokedex_message_banks.py', native: true) \ No newline at end of file +make_pokedex_message_banks_py = find_program('make_pokedex_message_banks.py', native: true) +make_pl_batt_obj_py = find_program('make_pl_batt_obj.py', native: true) +make_pl_batt_obj_palettes_py = find_program('make_pl_batt_obj_palettes.py', native: true) From 67d9df6320a6a4f6a7483594ca39d1a943253419 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Mon, 14 Oct 2024 15:28:52 -0500 Subject: [PATCH 02/26] fix build process for pl_batt_obj, resolve filesystem diffs --- res/battle/graphic/pl_batt_obj/meson.build | 26 +- res/battle/graphic/pl_batt_obj/order.txt | 456 +++++----- .../graphic/pl_batt_obj/palettes/data.json | 765 +++++++++++++++++ .../graphic/pl_batt_obj/palettes/meson.build | 76 +- .../graphic/pl_batt_obj/prebuilt/data.json | 442 ++++++++++ .../graphic/pl_batt_obj/prebuilt/meson.build | 30 +- .../graphic/pl_batt_obj/sprites/data.json | 783 ++++++++++++++++++ .../graphic/pl_batt_obj/sprites/meson.build | 31 +- tools/scripts/make_pl_batt_obj.py | 49 -- tools/scripts/make_pl_batt_obj_palettes.py | 45 - tools/scripts/meson.build | 4 +- tools/scripts/pl_batt_obj/compress.py | 183 ++++ .../pl_batt_obj/make_pl_batt_obj_palettes.py | 75 ++ .../pl_batt_obj/make_pl_batt_obj_prebuilts.py | 61 ++ .../pl_batt_obj/make_pl_batt_obj_sprites.py | 74 ++ tools/scripts/pl_batt_obj/meson.build | 3 + 16 files changed, 2703 insertions(+), 400 deletions(-) create mode 100644 res/battle/graphic/pl_batt_obj/palettes/data.json create mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/data.json create mode 100644 res/battle/graphic/pl_batt_obj/sprites/data.json delete mode 100644 tools/scripts/make_pl_batt_obj.py delete mode 100644 tools/scripts/make_pl_batt_obj_palettes.py create mode 100644 tools/scripts/pl_batt_obj/compress.py create mode 100644 tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py create mode 100644 tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py create mode 100644 tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py create mode 100644 tools/scripts/pl_batt_obj/meson.build diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index 754592ec09..b1d655be2b 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -1,8 +1,3 @@ -pl_batt_obj_lz_builder = generator(nitrogfx_exe, - output: '@BASENAME@.lz', - arguments: ['@INPUT@', '@OUTPUT@'] -) - subdir('prebuilt') subdir('palettes') subdir('sprites') @@ -14,20 +9,17 @@ pl_batt_obj_narc = custom_target('pl_batt_obj.narc', input: [ pl_batt_order, pl_batt_obj_nclr, - pl_batt_obj_nclr_pcmp, - pl_batt_obj_prebuilt_copy, - pl_batt_obj_prebuilt_compressed, - pl_batt_obj_ncgr, - pl_batt_obj_ncgr_compressed + pl_batt_obj_built, + pl_batt_obj_ncgr ], command: [ - make_pl_batt_obj_py, - '--nitrogfx', nitrogfx_exe, - '--knarc', knarc_exe, - '--private-dir', '@PRIVATE_DIR@', - '--output-dir', '@OUTDIR@', - '@INPUT0@' - ] + knarc_exe, + '-d', '@PRIVATE_DIR@', + '-o', '@INPUT0@', + '-p', + '@OUTPUT@' + ], + build_always_stale: true ) nitrofs_files += pl_batt_obj_narc \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/order.txt index 89be5aca63..d1ba8e7b44 100644 --- a/res/battle/graphic/pl_batt_obj/order.txt +++ b/res/battle/graphic/pl_batt_obj/order.txt @@ -113,231 +113,231 @@ pl_batt_obj_00000111.NCLR pl_batt_obj_00000112.NCGR pl_batt_obj_00000113.NCER pl_batt_obj_00000114.NANR -pl_batt_obj_00000115.lz -pl_batt_obj_00000116.lz -pl_batt_obj_00000117.lz -pl_batt_obj_00000118.lz -pl_batt_obj_00000119.lz -pl_batt_obj_00000120.lz -pl_batt_obj_00000121.lz -pl_batt_obj_00000122.lz -pl_batt_obj_00000123.lz -pl_batt_obj_00000124.lz -pl_batt_obj_00000125.lz -pl_batt_obj_00000126.lz -pl_batt_obj_00000127.lz -pl_batt_obj_00000128.lz -pl_batt_obj_00000129.lz -pl_batt_obj_00000130.lz -pl_batt_obj_00000131.lz -pl_batt_obj_00000132.lz -pl_batt_obj_00000133.lz -pl_batt_obj_00000134.lz -pl_batt_obj_00000135.lz -pl_batt_obj_00000136.lz -pl_batt_obj_00000137.lz -pl_batt_obj_00000138.lz -pl_batt_obj_00000139.lz -pl_batt_obj_00000140.lz -pl_batt_obj_00000141.lz -pl_batt_obj_00000142.lz -pl_batt_obj_00000143.lz -pl_batt_obj_00000144.lz -pl_batt_obj_00000145.lz -pl_batt_obj_00000146.lz -pl_batt_obj_00000147.lz -pl_batt_obj_00000148.lz -pl_batt_obj_00000149.lz -pl_batt_obj_00000150.lz -pl_batt_obj_00000151.lz -pl_batt_obj_00000152.lz -pl_batt_obj_00000153.lz -pl_batt_obj_00000154.lz -pl_batt_obj_00000155.lz -pl_batt_obj_00000156.lz -pl_batt_obj_00000157.lz -pl_batt_obj_00000158.lz -pl_batt_obj_00000159.lz -pl_batt_obj_00000160.lz -pl_batt_obj_00000161.lz -pl_batt_obj_00000162.lz -pl_batt_obj_00000163.lz -pl_batt_obj_00000164.lz -pl_batt_obj_00000165.lz -pl_batt_obj_00000166.lz -pl_batt_obj_00000167.lz -pl_batt_obj_00000168.lz -pl_batt_obj_00000169.lz -pl_batt_obj_00000170.lz -pl_batt_obj_00000171.lz -pl_batt_obj_00000172.lz -pl_batt_obj_00000173.lz -pl_batt_obj_00000174.lz -pl_batt_obj_00000175.lz -pl_batt_obj_00000176.lz -pl_batt_obj_00000177.lz -pl_batt_obj_00000178.lz -pl_batt_obj_00000179.lz -pl_batt_obj_00000180.lz -pl_batt_obj_00000181.lz -pl_batt_obj_00000182.lz -pl_batt_obj_00000183.lz -pl_batt_obj_00000184.lz -pl_batt_obj_00000185.lz -pl_batt_obj_00000186.lz -pl_batt_obj_00000187.lz -pl_batt_obj_00000188.lz -pl_batt_obj_00000189.lz -pl_batt_obj_00000190.lz -pl_batt_obj_00000191.lz -pl_batt_obj_00000192.lz -pl_batt_obj_00000193.lz -pl_batt_obj_00000194.lz -pl_batt_obj_00000195.lz -pl_batt_obj_00000196.lz -pl_batt_obj_00000197.lz -pl_batt_obj_00000198.lz -pl_batt_obj_00000199.lz -pl_batt_obj_00000200.lz -pl_batt_obj_00000201.lz -pl_batt_obj_00000202.lz -pl_batt_obj_00000203.lz -pl_batt_obj_00000204.lz -pl_batt_obj_00000205.lz -pl_batt_obj_00000206.lz -pl_batt_obj_00000207.lz -pl_batt_obj_00000208.lz -pl_batt_obj_00000209.lz -pl_batt_obj_00000210.lz -pl_batt_obj_00000211.lz -pl_batt_obj_00000212.lz -pl_batt_obj_00000213.lz -pl_batt_obj_00000214.lz -pl_batt_obj_00000215.lz -pl_batt_obj_00000216.lz -pl_batt_obj_00000217.lz -pl_batt_obj_00000218.lz -contest_icon_beauty.lz -contest_icon_cute.lz -type_icon_dragon.lz -type_icon_electric.lz -type_icon_psychic.lz -type_icon_dark.lz -type_icon_fighting.lz -type_icon_fire.lz -type_icon_flying.lz -type_icon_ghost.lz -type_icon_ground.lz -type_icon_ice.lz -type_icon_bug.lz -contest_icon_smart.lz -type_icon_grass.lz -type_icon_normal.lz -type_icon_poison.lz -type_icon_mystery.lz -type_icon_rock.lz -type_icon_steel.lz -contest_icon_tough.lz -contest_icon_cool.lz -type_icon_water.lz -pl_batt_obj_00000242.lz -pl_batt_obj_00000243.lz -move_type_physical.lz -move_type_status.lz -move_type_special.lz -pl_batt_obj_00000247.lz -pl_batt_obj_00000248.lz -pl_batt_obj_00000249.lz -pl_batt_obj_00000250.lz -pl_batt_obj_00000251.lz -pl_batt_obj_00000252.lz -pl_batt_obj_00000253.lz -pl_batt_obj_00000254.lz -pl_batt_obj_00000255.lz -pl_batt_obj_00000256.lz -pl_batt_obj_00000257.lz -pl_batt_obj_00000258.lz -pl_batt_obj_00000259.lz -pl_batt_obj_00000260.lz -pl_batt_obj_00000261.lz -pl_batt_obj_00000262.lz -pl_batt_obj_00000263.lz -pl_batt_obj_00000264.lz -pl_batt_obj_00000265.lz -pl_batt_obj_00000266.lz -pl_batt_obj_00000267.lz -pl_batt_obj_00000268.lz -pl_batt_obj_00000269.lz -pl_batt_obj_00000270.lz -pl_batt_obj_00000271.lz -pl_batt_obj_00000272.lz -pl_batt_obj_00000273.lz -pl_batt_obj_00000274.lz -pl_batt_obj_00000275.lz -pl_batt_obj_00000276.lz -pl_batt_obj_00000277.lz -pl_batt_obj_00000278.lz -pl_batt_obj_00000279.lz -pl_batt_obj_00000280.lz -pl_batt_obj_00000281.lz -pl_batt_obj_00000282.lz -pl_batt_obj_00000283.lz -pl_batt_obj_00000284.lz -pl_batt_obj_00000285.lz -pl_batt_obj_00000286.lz -pl_batt_obj_00000287.lz -pl_batt_obj_00000288.lz -pl_batt_obj_00000289.lz -pl_batt_obj_00000290.lz -pl_batt_obj_00000291.lz -pl_batt_obj_00000292.lz -pl_batt_obj_00000293.lz -pl_batt_obj_00000294.lz -pl_batt_obj_00000295.lz -pl_batt_obj_00000296.lz -pl_batt_obj_00000297.lz -pl_batt_obj_00000298.lz -pl_batt_obj_00000299.lz -pl_batt_obj_00000300.lz -pl_batt_obj_00000301.lz -pl_batt_obj_00000302.lz -pl_batt_obj_00000303.lz -pl_batt_obj_00000304.lz -pl_batt_obj_00000305.lz -pl_batt_obj_00000306.lz -pl_batt_obj_00000307.lz -pl_batt_obj_00000308.lz -pl_batt_obj_00000309.lz -pl_batt_obj_00000310.lz -pl_batt_obj_00000311.lz -pl_batt_obj_00000312.lz -pl_batt_obj_00000313.lz -pl_batt_obj_00000314.lz -pl_batt_obj_00000315.lz -pl_batt_obj_00000316.lz -pl_batt_obj_00000317.lz -pl_batt_obj_00000318.lz -pl_batt_obj_00000319.lz -pl_batt_obj_00000320.lz -pl_batt_obj_00000321.lz -pl_batt_obj_00000322.lz -pl_batt_obj_00000323.lz -pl_batt_obj_00000324.lz -pl_batt_obj_00000325.lz -pl_batt_obj_00000326.lz -pl_batt_obj_00000327.lz -pl_batt_obj_00000328.lz -pl_batt_obj_00000329.lz -pl_batt_obj_00000330.lz -pl_batt_obj_00000331.lz -pl_batt_obj_00000332.lz -pl_batt_obj_00000333.lz -pl_batt_obj_00000334.lz -pl_batt_obj_00000335.lz -pl_batt_obj_00000336.lz -pl_batt_obj_00000337.lz -pl_batt_obj_00000338.lz -pl_batt_obj_00000339.lz -pl_batt_obj_00000340.lz -pl_batt_obj_00000341.lz -pl_batt_obj_00000342.lz \ No newline at end of file +pl_batt_obj_00000115.NANR +pl_batt_obj_00000116.NCER +pl_batt_obj_00000117.NCGR +pl_batt_obj_00000118.NANR +pl_batt_obj_00000119.NCER +pl_batt_obj_00000120.NCGR +pl_batt_obj_00000121.NCGR +pl_batt_obj_00000122.NCER +pl_batt_obj_00000123.NANR +pl_batt_obj_00000124.NCGR +pl_batt_obj_00000125.NCER +pl_batt_obj_00000126.NANR +pl_batt_obj_00000127.NCGR +pl_batt_obj_00000128.NCER +pl_batt_obj_00000129.NANR +pl_batt_obj_00000130.NCGR +pl_batt_obj_00000131.NCER +pl_batt_obj_00000132.NANR +pl_batt_obj_00000133.NCGR +pl_batt_obj_00000134.NCGR +pl_batt_obj_00000135.NCGR +pl_batt_obj_00000136.NCGR +pl_batt_obj_00000137.NCGR +pl_batt_obj_00000138.NCGR +pl_batt_obj_00000139.NCGR +pl_batt_obj_00000140.NCGR +pl_batt_obj_00000141.NCGR +pl_batt_obj_00000142.NCGR +pl_batt_obj_00000143.NCGR +pl_batt_obj_00000144.NCGR +pl_batt_obj_00000145.NCGR +pl_batt_obj_00000146.NCGR +pl_batt_obj_00000147.NCGR +pl_batt_obj_00000148.NCGR +pl_batt_obj_00000149.NCGR +pl_batt_obj_00000150.NCGR +pl_batt_obj_00000151.NCGR +pl_batt_obj_00000152.NCGR +pl_batt_obj_00000153.NCGR +pl_batt_obj_00000154.NCGR +pl_batt_obj_00000155.NCGR +pl_batt_obj_00000156.NCGR +pl_batt_obj_00000157.NCGR +pl_batt_obj_00000158.NCGR +pl_batt_obj_00000159.NCGR +pl_batt_obj_00000160.NCGR +pl_batt_obj_00000161.NCGR +pl_batt_obj_00000162.NCGR +pl_batt_obj_00000163.NCGR +pl_batt_obj_00000164.NCGR +pl_batt_obj_00000165.NCGR +pl_batt_obj_00000166.NCGR +pl_batt_obj_00000167.NCGR +pl_batt_obj_00000168.NCGR +pl_batt_obj_00000169.NCGR +pl_batt_obj_00000170.NCGR +pl_batt_obj_00000171.NCGR +pl_batt_obj_00000172.NCGR +pl_batt_obj_00000173.NCGR +pl_batt_obj_00000174.NCGR +pl_batt_obj_00000175.NCGR +pl_batt_obj_00000176.NCGR +pl_batt_obj_00000177.NANR +pl_batt_obj_00000178.NCER +pl_batt_obj_00000179.NCGR +pl_batt_obj_00000180.NANR +pl_batt_obj_00000181.NCER +pl_batt_obj_00000182.NCGR +pl_batt_obj_00000183.NANR +pl_batt_obj_00000184.NCER +pl_batt_obj_00000185.NCGR +pl_batt_obj_00000186.NANR +pl_batt_obj_00000187.NCER +pl_batt_obj_00000188.NCGR +pl_batt_obj_00000189.NANR +pl_batt_obj_00000190.NCER +pl_batt_obj_00000191.NCGR +pl_batt_obj_00000192.NANR +pl_batt_obj_00000193.NCER +pl_batt_obj_00000194.NCGR +pl_batt_obj_00000195.NANR +pl_batt_obj_00000196.NCER +pl_batt_obj_00000197.NCGR +pl_batt_obj_00000198.NANR +pl_batt_obj_00000199.NCER +pl_batt_obj_00000200.NCGR +pl_batt_obj_00000201.NANR +pl_batt_obj_00000202.NCER +pl_batt_obj_00000203.NCGR +pl_batt_obj_00000204.NCER +pl_batt_obj_00000205.NCGR +pl_batt_obj_00000206.NANR +pl_batt_obj_00000207.NCER +pl_batt_obj_00000208.NCGR +pl_batt_obj_00000209.NANR +pl_batt_obj_00000210.NCER +pl_batt_obj_00000211.NCGR +pl_batt_obj_00000212.NANR +pl_batt_obj_00000213.NCER +pl_batt_obj_00000214.NCGR +pl_batt_obj_00000215.NANR +pl_batt_obj_00000216.NCER +pl_batt_obj_00000217.NCGR +pl_batt_obj_00000218.NANR +contest_icon_beauty.NCGR +contest_icon_cute.NCGR +type_icon_dragon.NCGR +type_icon_electric.NCGR +type_icon_psychic.NCGR +type_icon_dark.NCGR +type_icon_fighting.NCGR +type_icon_fire.NCGR +type_icon_flying.NCGR +type_icon_ghost.NCGR +type_icon_ground.NCGR +type_icon_ice.NCGR +type_icon_bug.NCGR +contest_icon_smart.NCGR +type_icon_grass.NCGR +type_icon_normal.NCGR +type_icon_poison.NCGR +type_icon_mystery.NCGR +type_icon_rock.NCGR +type_icon_steel.NCGR +contest_icon_tough.NCGR +contest_icon_cool.NCGR +type_icon_water.NCGR +pl_batt_obj_00000242.NCER +pl_batt_obj_00000243.NANR +move_type_physical.NCGR +move_type_status.NCGR +move_type_special.NCGR +pl_batt_obj_00000247.NCGR +pl_batt_obj_00000248.NCER +pl_batt_obj_00000249.NANR +pl_batt_obj_00000250.NCGR +pl_batt_obj_00000251.NCER +pl_batt_obj_00000252.NANR +pl_batt_obj_00000253.NCGR +pl_batt_obj_00000254.NCER +pl_batt_obj_00000255.NANR +pl_batt_obj_00000256.NCGR +pl_batt_obj_00000257.NCER +pl_batt_obj_00000258.NANR +pl_batt_obj_00000259.NCGR +pl_batt_obj_00000260.NCGR +pl_batt_obj_00000261.NCGR +pl_batt_obj_00000262.NCGR +pl_batt_obj_00000263.NCGR +pl_batt_obj_00000264.NCGR +pl_batt_obj_00000265.NCGR +pl_batt_obj_00000266.NCGR +pl_batt_obj_00000267.NCER +pl_batt_obj_00000268.NCER +pl_batt_obj_00000269.NCER +pl_batt_obj_00000270.NCER +pl_batt_obj_00000271.NCER +pl_batt_obj_00000272.NCER +pl_batt_obj_00000273.NCER +pl_batt_obj_00000274.NCER +pl_batt_obj_00000275.NANR +pl_batt_obj_00000276.NANR +pl_batt_obj_00000277.NANR +pl_batt_obj_00000278.NANR +pl_batt_obj_00000279.NANR +pl_batt_obj_00000280.NANR +pl_batt_obj_00000281.NANR +pl_batt_obj_00000282.NANR +pl_batt_obj_00000283.NANR +pl_batt_obj_00000284.NCER +pl_batt_obj_00000285.NCGR +pl_batt_obj_00000286.NANR +pl_batt_obj_00000287.NCER +pl_batt_obj_00000288.NCGR +pl_batt_obj_00000289.NANR +pl_batt_obj_00000290.NCER +pl_batt_obj_00000291.NCGR +pl_batt_obj_00000292.NANR +pl_batt_obj_00000293.NCER +pl_batt_obj_00000294.NCGR +pl_batt_obj_00000295.NANR +pl_batt_obj_00000296.NCER +pl_batt_obj_00000297.NCGR +pl_batt_obj_00000298.NANR +pl_batt_obj_00000299.NCER +pl_batt_obj_00000300.NCGR +pl_batt_obj_00000301.NANR +pl_batt_obj_00000302.NCER +pl_batt_obj_00000303.NCGR +pl_batt_obj_00000304.NANR +pl_batt_obj_00000305.NCER +pl_batt_obj_00000306.NCGR +pl_batt_obj_00000307.NANR +pl_batt_obj_00000308.NCER +pl_batt_obj_00000309.NCGR +pl_batt_obj_00000310.NANR +pl_batt_obj_00000311.NCER +pl_batt_obj_00000312.NCGR +pl_batt_obj_00000313.NANR +pl_batt_obj_00000314.NCER +pl_batt_obj_00000315.NCGR +pl_batt_obj_00000316.NANR +pl_batt_obj_00000317.NCER +pl_batt_obj_00000318.NCGR +pl_batt_obj_00000319.NANR +pl_batt_obj_00000320.NCER +pl_batt_obj_00000321.NCGR +pl_batt_obj_00000322.NANR +pl_batt_obj_00000323.NCER +pl_batt_obj_00000324.NCGR +pl_batt_obj_00000325.NANR +pl_batt_obj_00000326.NCER +pl_batt_obj_00000327.NCGR +pl_batt_obj_00000328.NANR +pl_batt_obj_00000329.NCER +pl_batt_obj_00000330.NCGR +pl_batt_obj_00000331.NANR +pl_batt_obj_00000332.NCER +pl_batt_obj_00000333.NCGR +pl_batt_obj_00000334.NANR +pl_batt_obj_00000335.NCER +pl_batt_obj_00000336.NCGR +pl_batt_obj_00000337.NANR +pl_batt_obj_00000338.NCER +pl_batt_obj_00000339.NCGR +pl_batt_obj_00000340.NCGR +pl_batt_obj_00000341.NCER +pl_batt_obj_00000342.NANR \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/palettes/data.json b/res/battle/graphic/pl_batt_obj/palettes/data.json new file mode 100644 index 0000000000..2f18b09c22 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/palettes/data.json @@ -0,0 +1,765 @@ +[ + { + "target": "pl_batt_obj_00000000.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000052.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000053.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000054.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000055.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000056.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000057.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000058.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000059.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000060.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000061.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000062.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000063.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000064.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000065.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000066.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000070.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000083.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000084.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000085.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000086.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000087.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000088.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000089.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000090.pal", + "bitdepth": 4, + "pad": false, + "pcmp": false, + "invert_size": false + }, + { + "target": "pl_batt_obj_00000001.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000002.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000003.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000004.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000005.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000006.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000007.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000008.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000009.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000010.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000011.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000012.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000013.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000014.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000015.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000016.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000017.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000018.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000019.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000020.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000021.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000022.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000023.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000024.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000025.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000026.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000027.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000028.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000029.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000030.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000031.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000032.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000033.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000034.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000035.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000036.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000037.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000038.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000039.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000040.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000041.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000042.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000043.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000044.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000045.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000046.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000047.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000048.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000049.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000050.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000051.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000067.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000068.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000069.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000071.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000072.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000073.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "icon_palettes.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000075.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000079.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000080.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000081.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000082.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000091.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000092.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000093.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000094.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000095.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000096.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000097.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000098.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000099.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000100.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000101.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000102.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000103.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000104.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000105.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000106.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000107.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000108.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000109.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000110.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + }, + { + "target": "pl_batt_obj_00000111.pal", + "bitdepth": 4, + "pad": false, + "pcmp": true, + "invert_size": true + } +] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/pl_batt_obj/palettes/meson.build index 241935d347..40e8174d24 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/meson.build +++ b/res/battle/graphic/pl_batt_obj/palettes/meson.build @@ -1,32 +1,5 @@ pl_batt_obj_palettes = files( 'pl_batt_obj_00000000.pal', - 'pl_batt_obj_00000052.pal', - 'pl_batt_obj_00000053.pal', - 'pl_batt_obj_00000054.pal', - 'pl_batt_obj_00000055.pal', - 'pl_batt_obj_00000056.pal', - 'pl_batt_obj_00000057.pal', - 'pl_batt_obj_00000058.pal', - 'pl_batt_obj_00000059.pal', - 'pl_batt_obj_00000060.pal', - 'pl_batt_obj_00000061.pal', - 'pl_batt_obj_00000062.pal', - 'pl_batt_obj_00000063.pal', - 'pl_batt_obj_00000064.pal', - 'pl_batt_obj_00000065.pal', - 'pl_batt_obj_00000066.pal', - 'pl_batt_obj_00000070.pal', - 'pl_batt_obj_00000083.pal', - 'pl_batt_obj_00000084.pal', - 'pl_batt_obj_00000085.pal', - 'pl_batt_obj_00000086.pal', - 'pl_batt_obj_00000087.pal', - 'pl_batt_obj_00000088.pal', - 'pl_batt_obj_00000089.pal', - 'pl_batt_obj_00000090.pal' -) - -pl_batt_obj_palettes_pcmp = files( 'pl_batt_obj_00000001.pal', 'pl_batt_obj_00000002.pal', 'pl_batt_obj_00000003.pal', @@ -78,9 +51,25 @@ pl_batt_obj_palettes_pcmp = files( 'pl_batt_obj_00000049.pal', 'pl_batt_obj_00000050.pal', 'pl_batt_obj_00000051.pal', + 'pl_batt_obj_00000052.pal', + 'pl_batt_obj_00000053.pal', + 'pl_batt_obj_00000054.pal', + 'pl_batt_obj_00000055.pal', + 'pl_batt_obj_00000056.pal', + 'pl_batt_obj_00000057.pal', + 'pl_batt_obj_00000058.pal', + 'pl_batt_obj_00000059.pal', + 'pl_batt_obj_00000060.pal', + 'pl_batt_obj_00000061.pal', + 'pl_batt_obj_00000062.pal', + 'pl_batt_obj_00000063.pal', + 'pl_batt_obj_00000064.pal', + 'pl_batt_obj_00000065.pal', + 'pl_batt_obj_00000066.pal', 'pl_batt_obj_00000067.pal', 'pl_batt_obj_00000068.pal', 'pl_batt_obj_00000069.pal', + 'pl_batt_obj_00000070.pal', 'pl_batt_obj_00000071.pal', 'pl_batt_obj_00000072.pal', 'pl_batt_obj_00000073.pal', @@ -90,6 +79,14 @@ pl_batt_obj_palettes_pcmp = files( 'pl_batt_obj_00000080.pal', 'pl_batt_obj_00000081.pal', 'pl_batt_obj_00000082.pal', + 'pl_batt_obj_00000083.pal', + 'pl_batt_obj_00000084.pal', + 'pl_batt_obj_00000085.pal', + 'pl_batt_obj_00000086.pal', + 'pl_batt_obj_00000087.pal', + 'pl_batt_obj_00000088.pal', + 'pl_batt_obj_00000089.pal', + 'pl_batt_obj_00000090.pal', 'pl_batt_obj_00000091.pal', 'pl_batt_obj_00000092.pal', 'pl_batt_obj_00000093.pal', @@ -116,11 +113,22 @@ pl_batt_obj_palettes_pcmp = files( # for some reason, the pcmp file 'size' field is the real size subtracted from 512 # (e.g., actual numColors=16, size should=32, but real size is 512-32=480) # is this part of the standard? nitrogfx can't currently handle it. -# take a custom build step to fix it. -pl_batt_obj_palette_builder = generator(make_pl_batt_obj_palettes_py, - output: '@BASENAME@.NCLR', - arguments: ['--nitrogfx', nitrogfx_exe.full_path(), '--input', '@INPUT@', '--output', '@OUTPUT@', '@EXTRA_ARGS@'] -) +# requires a Python script for a fix. + +pl_batt_obj_palette_data = files('data.json') -pl_batt_obj_nclr = pl_batt_obj_palette_builder.process(pl_batt_obj_palettes, extra_args: ['-bitdepth', '4', '-nopad']) -pl_batt_obj_nclr_pcmp = pl_batt_obj_palette_builder.process(pl_batt_obj_palettes_pcmp, extra_args: ['-fixsize', '-bitdepth', '4', '-nopad', '-pcmp']) +pl_batt_obj_nclr = [] +foreach infile : pl_batt_obj_palettes + pl_batt_obj_nclr += custom_target( + input: [infile, pl_batt_obj_palette_data], + output: '@BASENAME0@.NCLR', + command: [ + make_pl_batt_obj_palettes_py, + '--nitrogfx', nitrogfx_exe.full_path(), + '--input', '@INPUT0@', + '--output', '@OUTPUT@', + '--datafile', '@INPUT1@', + '--private-dir', '@PRIVATE_DIR@' + ] + ) +endforeach \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/data.json b/res/battle/graphic/pl_batt_obj/prebuilt/data.json new file mode 100644 index 0000000000..02ce6bf974 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/prebuilt/data.json @@ -0,0 +1,442 @@ +[ + { + "target": "pl_batt_obj_00000077.NCER", + "compressed": false + }, + { + "target": "pl_batt_obj_00000078.NANR", + "compressed": false + }, + { + "target": "pl_batt_obj_00000113.NCER", + "compressed": false + }, + { + "target": "pl_batt_obj_00000114.NANR", + "compressed": false + }, + { + "target": "pl_batt_obj_00000115.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000116.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000118.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000119.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000122.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000123.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000125.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000126.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000128.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000129.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000131.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000132.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000177.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000178.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000180.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000181.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000183.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000184.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000186.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000187.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000189.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000190.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000192.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000193.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000195.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000196.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000198.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000199.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000201.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000202.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000204.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000206.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000207.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000209.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000210.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000212.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000213.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000215.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000216.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000218.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000242.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000243.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000248.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000249.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000251.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000252.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000254.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000255.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000257.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000258.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000267.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000268.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000269.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000270.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000271.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000272.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000273.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000274.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000275.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000276.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000277.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000278.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000279.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000280.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000281.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000282.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000283.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000284.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000286.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000287.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000289.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000290.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000292.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000293.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000295.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000296.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000298.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000299.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000301.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000302.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000304.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000305.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000307.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000308.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000310.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000311.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000313.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000314.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000316.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000317.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000319.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000320.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000322.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000323.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000325.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000326.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000328.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000329.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000331.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000332.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000334.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000335.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000337.NANR", + "compressed": true + }, + { + "target": "pl_batt_obj_00000338.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000341.NCER", + "compressed": true + }, + { + "target": "pl_batt_obj_00000342.NANR", + "compressed": true + } +] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/meson.build b/res/battle/graphic/pl_batt_obj/prebuilt/meson.build index b7e1b01519..59217e3f7a 100644 --- a/res/battle/graphic/pl_batt_obj/prebuilt/meson.build +++ b/res/battle/graphic/pl_batt_obj/prebuilt/meson.build @@ -1,11 +1,8 @@ -pl_batt_obj_prebuilt_raw = files( +pl_batt_obj_prebuilt = files( 'pl_batt_obj_00000077.NCER', 'pl_batt_obj_00000078.NANR', 'pl_batt_obj_00000113.NCER', - 'pl_batt_obj_00000114.NANR' -) - -pl_batt_obj_prebuilt_lz = files( + 'pl_batt_obj_00000114.NANR', 'pl_batt_obj_00000115.NANR', 'pl_batt_obj_00000116.NCER', 'pl_batt_obj_00000118.NANR', @@ -114,11 +111,20 @@ pl_batt_obj_prebuilt_lz = files( 'pl_batt_obj_00000342.NANR' ) -copy_prog = find_program('cp') -pl_batt_obj_prebuilt_builder = generator(copy_prog, - output: '@PLAINNAME@', - arguments: ['@INPUT@', '@OUTPUT@'] -) +pl_batt_obj_prebuilts_data = files('data.json') -pl_batt_obj_prebuilt_copy = pl_batt_obj_prebuilt_builder.process(pl_batt_obj_prebuilt_raw) -pl_batt_obj_prebuilt_compressed = pl_batt_obj_lz_builder.process(pl_batt_obj_prebuilt_lz) \ No newline at end of file +pl_batt_obj_built = [] +foreach infile : pl_batt_obj_prebuilt + pl_batt_obj_built += custom_target( + input: [infile, pl_batt_obj_prebuilts_data], + output: '@BASENAME0@', + command: [ + make_pl_batt_obj_prebuilts_py, + '--nitrogfx', nitrogfx_exe.full_path(), + '--input', '@INPUT0@', + '--output', '@OUTPUT@', + '--datafile', '@INPUT1@', + '--private-dir', '@PRIVATE_DIR@' + ] + ) +endforeach \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/sprites/data.json b/res/battle/graphic/pl_batt_obj/sprites/data.json new file mode 100644 index 0000000000..696f24854a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/sprites/data.json @@ -0,0 +1,783 @@ +[ + { + "target": "pl_batt_obj_00000076.png", + "compressed": false, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000112.png", + "compressed": false, + "clobber_size": true, + "mapping_type": 128 + }, + { + "target": "pl_batt_obj_00000117.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000120.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000121.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000124.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000127.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000130.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000133.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000134.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000135.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000136.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000137.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000138.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000139.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000140.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000141.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000142.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000143.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000144.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000145.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000146.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000147.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000148.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000149.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000150.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000151.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000152.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000153.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000154.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000155.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000156.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000157.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000158.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000159.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000160.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000161.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000162.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000163.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000164.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000165.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000166.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000167.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000168.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000169.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000170.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000171.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000172.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000173.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000174.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000175.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000176.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000179.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "pl_batt_obj_00000182.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000185.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000188.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "version101": true + }, + { + "target": "pl_batt_obj_00000191.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "version101": true + }, + { + "target": "pl_batt_obj_00000194.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "version101": true + }, + { + "target": "pl_batt_obj_00000197.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "version101": true + }, + { + "target": "pl_batt_obj_00000200.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "version101": true + }, + { + "target": "pl_batt_obj_00000203.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "version101": true + }, + { + "target": "pl_batt_obj_00000205.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "pl_batt_obj_00000208.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "pl_batt_obj_00000211.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "pl_batt_obj_00000214.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "pl_batt_obj_00000217.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "contest_icon_beauty.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "contest_icon_cute.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_dragon.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_electric.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_psychic.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_dark.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_fighting.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_fire.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_flying.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_ghost.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_ground.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_ice.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_bug.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "contest_icon_smart.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_grass.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_normal.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_poison.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_mystery.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_rock.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_steel.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "contest_icon_tough.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "contest_icon_cool.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "type_icon_water.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32, + "version101": true + }, + { + "target": "move_type_physical.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "move_type_status.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "move_type_special.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "pl_batt_obj_00000247.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000250.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 32 + }, + { + "target": "pl_batt_obj_00000253.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000256.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000259.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "vram": true + }, + { + "target": "pl_batt_obj_00000260.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "vram": true + }, + { + "target": "pl_batt_obj_00000261.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "vram": true + }, + { + "target": "pl_batt_obj_00000262.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "vram": true + }, + { + "target": "pl_batt_obj_00000263.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "vram": true + }, + { + "target": "pl_batt_obj_00000264.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "vram": true + }, + { + "target": "pl_batt_obj_00000265.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "vram": true + }, + { + "target": "pl_batt_obj_00000266.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64, + "vram": true + }, + { + "target": "pl_batt_obj_00000285.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000288.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000291.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000294.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000297.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000300.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000303.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000306.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000309.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000312.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000315.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000318.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000321.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000324.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000327.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000330.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000333.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000336.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000339.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + }, + { + "target": "pl_batt_obj_00000340.png", + "compressed": true, + "clobber_size": true, + "mapping_type": 64 + } +] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/sprites/meson.build b/res/battle/graphic/pl_batt_obj/sprites/meson.build index 4a885ce38e..0ca5952d4e 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/meson.build +++ b/res/battle/graphic/pl_batt_obj/sprites/meson.build @@ -1,9 +1,6 @@ -pl_batt_obj_sprites_raw = files( +pl_batt_obj_sprites = files( 'pl_batt_obj_00000076.png', - 'pl_batt_obj_00000112.png' -) - -pl_batt_obj_sprites_lz = files( + 'pl_batt_obj_00000112.png', 'pl_batt_obj_00000117.png', 'pl_batt_obj_00000120.png', 'pl_batt_obj_00000121.png', @@ -128,12 +125,20 @@ pl_batt_obj_sprites_lz = files( 'pl_batt_obj_00000340.png' ) -pl_batt_obj_ncgr_builder = generator(nitrogfx_exe, - output: '@BASENAME@.NCGR', - arguments: ['@INPUT@', '@OUTPUT@'] -) - -pl_batt_obj_ncgr = pl_batt_obj_ncgr_builder.process(pl_batt_obj_sprites_raw) +pl_batt_obj_sprite_data = files('data.json') -pl_batt_obj_lz_ncgr = pl_batt_obj_ncgr_builder.process(pl_batt_obj_sprites_lz) -pl_batt_obj_ncgr_compressed = pl_batt_obj_lz_builder.process(pl_batt_obj_lz_ncgr) +pl_batt_obj_ncgr = [] +foreach infile : pl_batt_obj_sprites + pl_batt_obj_ncgr += custom_target( + input: [infile, pl_batt_obj_sprite_data], + output: '@BASENAME0@.NCGR', + command: [ + make_pl_batt_obj_sprites_py, + '--nitrogfx', nitrogfx_exe.full_path(), + '--input', '@INPUT0@', + '--output', '@OUTPUT@', + '--datafile', '@INPUT1@', + '--private-dir', '@PRIVATE_DIR@' + ] + ) +endforeach \ No newline at end of file diff --git a/tools/scripts/make_pl_batt_obj.py b/tools/scripts/make_pl_batt_obj.py deleted file mode 100644 index 494792b400..0000000000 --- a/tools/scripts/make_pl_batt_obj.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import json -import pathlib -import subprocess -import os -import shutil - -argparser = argparse.ArgumentParser( - prog='pl_batt_obj.narc packer', - description='Packs the archive containing battle graphics' -) -argparser.add_argument('-k', '--knarc', - required=True, - help='Path to knarc executable') -argparser.add_argument('-n', '--nitrogfx', - required=True, - help='Path to nitrogfx executable') -argparser.add_argument('-p', '--private-dir', - required=True, - help='Path to the private directory (where binaries will be made)') -argparser.add_argument('-o', '--output-dir', - required=True, - help='Path to the output directory (where the NARC will be made)') -argparser.add_argument('order', - nargs=1, - help='File indicating list of files to pack and the order to pack') -args = argparser.parse_args() - -private_dir = pathlib.Path(args.private_dir) -output_dir = pathlib.Path(args.output_dir) -order_list = pathlib.Path(args.order[0]) - -private_dir.mkdir(parents=True, exist_ok=True) - -dest_dir = private_dir / 'pl_batt_obj_work' -dest_dir.mkdir(parents=True, exist_ok=True) - -with open(order_list) as f: - all_lines = f.readlines() - for index in range(len(all_lines)): - line = all_lines[index] - fname = str(private_dir / line.strip()) - dest = str(dest_dir / f"{index:08}_{line.strip()}") - shutil.copy(fname, dest) - -subprocess.run([args.knarc, '-d', dest_dir, '-p', output_dir / 'pl_batt_obj.narc']) - -print(output_dir) \ No newline at end of file diff --git a/tools/scripts/make_pl_batt_obj_palettes.py b/tools/scripts/make_pl_batt_obj_palettes.py deleted file mode 100644 index fee8ada41f..0000000000 --- a/tools/scripts/make_pl_batt_obj_palettes.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import json -import pathlib -import subprocess -import os -import shutil - -argparser = argparse.ArgumentParser( - prog='pl_batt_obj.narc palette builder and size fixer', - description='Builds NCLR palette files and fixes the size field if requested.' -) -argparser.add_argument('--nitrogfx', - required=True, - help='Path to nitrogfx executable') -argparser.add_argument('--input', - required=True, - help='Input NCLR file to make adjustments to.') -argparser.add_argument('--output', - required=True, - help='Output NCLR file to write to.') -args, extra_args = argparser.parse_known_args() - -input_file = pathlib.Path(args.input) -output_file = pathlib.Path(args.output) - -resize = False -ngfx_args = [args.nitrogfx, input_file, output_file] -for arg in extra_args: - if arg == "-fixsize": - resize = True - else: - ngfx_args.append(arg) - -subprocess.run(ngfx_args) - -if resize: - with open(output_file, mode="rb") as f: - data = f.read() - size = int.from_bytes(data[32:36], byteorder='little') - size = 512 - size - data = data[:32] + int.to_bytes(size, byteorder='little', length=4) + data[36:] - - with open(output_file, mode="wb") as f: - f.write(data) \ No newline at end of file diff --git a/tools/scripts/meson.build b/tools/scripts/meson.build index 0917131a3b..63e9bb0d94 100644 --- a/tools/scripts/meson.build +++ b/tools/scripts/meson.build @@ -10,5 +10,5 @@ make_species_tables_py = find_program('make_species_tables.py', native: true) make_tutorable_moves_py = find_program('make_tutorable_moves.py', native: true) make_pokedex_data_py = find_program('make_pokedex_data.py', native: true) make_pokedex_message_banks_py = find_program('make_pokedex_message_banks.py', native: true) -make_pl_batt_obj_py = find_program('make_pl_batt_obj.py', native: true) -make_pl_batt_obj_palettes_py = find_program('make_pl_batt_obj_palettes.py', native: true) + +subdir('pl_batt_obj') diff --git a/tools/scripts/pl_batt_obj/compress.py b/tools/scripts/pl_batt_obj/compress.py new file mode 100644 index 0000000000..a33a07ee35 --- /dev/null +++ b/tools/scripts/pl_batt_obj/compress.py @@ -0,0 +1,183 @@ +#!/usr/bin/python3 +#### from https://raw.githubusercontent.com/magical/nlzss/refs/heads/master/compress.py +#### covers for a nitrogfx issue which I couldn't figure out. remove this once nitrogfx can handle this case + +# used http://code.google.com/p/u-lzss/source/browse/trunk/js/lib/ulzss.js as +# a guide +from sys import stderr + +from collections import defaultdict +from operator import itemgetter +from struct import pack, unpack + +class SlidingWindow: + # The size of the sliding window + size = 4096 + + # The minimum displacement. + disp_min = 2 + + # The hard minimum — a disp less than this can't be represented in the + # compressed stream. + disp_start = 1 + + # The minimum length for a successful match in the window + match_min = 1 + + # The maximum length of a successful match, inclusive. + match_max = None + + def __init__(self, buf): + self.data = buf + self.hash = defaultdict(list) + self.full = False + + self.start = 0 + self.stop = 0 + #self.index = self.disp_min - 1 + self.index = 0 + + assert self.match_max is not None + + def next(self): + if self.index < self.disp_start - 1: + self.index += 1 + return + + if self.full: + olditem = self.data[self.start] + assert self.hash[olditem][0] == self.start + self.hash[olditem].pop(0) + + item = self.data[self.stop] + self.hash[item].append(self.stop) + self.stop += 1 + self.index += 1 + + if self.full: + self.start += 1 + else: + if self.size <= self.stop: + self.full = True + + def advance(self, n=1): + """Advance the window by n bytes""" + for _ in range(n): + self.next() + + def search(self): + match_max = self.match_max + match_min = self.match_min + + counts = [] + indices = self.hash[self.data[self.index]] + for i in indices: + matchlen = self.match(i, self.index) + if matchlen >= match_min: + disp = self.index - i + #assert self.index - disp >= 0 + #assert self.disp_min <= disp < self.size + self.disp_min + if self.disp_min <= disp: + counts.append((matchlen, -disp)) + if matchlen >= match_max: + #assert matchlen == match_max + return counts[-1] + + if counts: + match = max(counts, key=itemgetter(0)) + return match + + return None + + def match(self, start, bufstart): + size = self.index - start + + if size == 0: + return 0 + + matchlen = 0 + it = range(min(len(self.data) - bufstart, self.match_max)) + for i in it: + if self.data[start + (i % size)] == self.data[bufstart + i]: + matchlen += 1 + else: + break + return matchlen + +class NLZ10Window(SlidingWindow): + size = 4096 + + match_min = 3 + match_max = 3 + 0xf + +def _compress(input, windowclass=NLZ10Window): + """Generates a stream of tokens. Either a byte (int) or a tuple of (count, + displacement).""" + + window = windowclass(input) + + i = 0 + while True: + if len(input) <= i: + break + match = window.search() + if match: + yield match + #if match[1] == -283: + # raise Exception(match, i) + window.advance(match[0]) + i += match[0] + else: + yield input[i] + window.next() + i += 1 + +def packflags(flags): + n = 0 + for i in range(8): + n <<= 1 + try: + if flags[i]: + n |= 1 + except IndexError: + pass + return n + +def chunkit(it, n): + buf = [] + for x in it: + buf.append(x) + if n <= len(buf): + yield buf + buf = [] + if buf: + yield buf + +def compress(input, out): + # header + out.write(pack("B", packflags(flags))) + + for t in tokens: + if type(t) == tuple: + count, disp = t + count -= 3 + disp = (-disp) - 1 + assert 0 <= disp < 4096 + sh = (count << 12) | disp + out.write(pack(">H", sh)) + else: + out.write(pack(">B", t)) + + length += 1 + length += sum(2 if f else 1 for f in flags) + + # padding + padding = 4 - (length % 4 or 4) + if padding: + out.write(b'\x00' * padding) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py new file mode 100644 index 0000000000..b66bd33366 --- /dev/null +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py @@ -0,0 +1,75 @@ +#!/usr/bin/env python3 +import argparse +import json +import pathlib +import subprocess +import os +import shutil + +argparser = argparse.ArgumentParser( + prog='pl_batt_obj.narc palette builder and size fixer', + description='Builds NCLR palette files and fixes the size field if requested.' +) +argparser.add_argument('--nitrogfx', + required=True, + help='Path to nitrogfx executable') +argparser.add_argument('--input', + required=True, + help='Input NCLR file to make adjustments to.') +argparser.add_argument('--output', + required=True, + help='Output NCLR file to write to.') +argparser.add_argument('--private-dir', + required=True, + help='Path to the private directory (where binaries will be made)') +argparser.add_argument('--datafile', + required=True, + help='Contains details of how to build each input.') +args = argparser.parse_args() + +input_file = pathlib.Path(args.input) +output_file = pathlib.Path(args.output) +private_dir = pathlib.Path(args.private_dir) +with open(args.datafile) as f: + data_map = json.load(f) + +private_dir.mkdir(parents=True, exist_ok=True) + +dest_dir = private_dir / 'pl_batt_obj_work' +dest_dir.mkdir(parents=True, exist_ok=True) + +# adjust output_file to target the root private_dir for the build (hacky) +output_file = output_file.parent / ".." / "pl_batt_obj.narc.p" / output_file.name + +file_props = None +for props in data_map: + if props['target'] == input_file.name: + file_props = props + +if file_props == None: + raise Exception(f"Input palette file {input_file.name} is not listed in data map {args.datafile}") + +tmp_file = dest_dir / output_file.name + +ngfx_args = [args.nitrogfx, input_file, tmp_file] +if 'bitdepth' in file_props and file_props['bitdepth'] != None: + ngfx_args.append('-bitdepth') + ngfx_args.append(str(file_props['bitdepth'])) +if 'pad' in file_props and file_props['pad'] == False: + ngfx_args.append('-nopad') +if 'pcmp' in file_props and file_props['pcmp'] == True: + ngfx_args.append('-pcmp') + +subprocess.run(ngfx_args) + +if 'invert_size' in file_props and file_props['invert_size'] == True: + with open(tmp_file, mode="rb") as f: + data = f.read() + size = int.from_bytes(data[32:36], byteorder='little') + size = 512 - size + data = data[:32] + int.to_bytes(size, byteorder='little', length=4) + data[36:] + + with open(tmp_file, mode="wb") as f: + f.write(data) + +shutil.copy(tmp_file, output_file) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py new file mode 100644 index 0000000000..3ef319cc5b --- /dev/null +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python3 +import argparse +import json +import pathlib +import subprocess +import os +import shutil +import compress + +argparser = argparse.ArgumentParser( + prog='pl_batt_obj.narc prebuilt file fixer', + description='Copies prebuilt files to NARC build directory and compresses if required.' +) +argparser.add_argument('--nitrogfx', + required=True, + help='Path to nitrogfx executable') +argparser.add_argument('--input', + required=True, + help='Input file to make adjustments to.') +argparser.add_argument('--output', + required=True, + help='Output file to write to.') +argparser.add_argument('--private-dir', + required=True, + help='Path to the private directory (where binaries will be made)') +argparser.add_argument('--datafile', + required=True, + help='Contains details of how to build each input.') +args = argparser.parse_args() + +input_file = pathlib.Path(args.input) +output_file = pathlib.Path(args.output).with_suffix(input_file.suffix) +private_dir = pathlib.Path(args.private_dir) +with open(args.datafile) as f: + data_map = json.load(f) + +private_dir.mkdir(parents=True, exist_ok=True) + +dest_dir = private_dir / 'pl_batt_obj_work' +dest_dir.mkdir(parents=True, exist_ok=True) + +# adjust output_file to target the root private_dir for the build (hacky) +output_file = output_file.parent / ".." / "pl_batt_obj.narc.p" / output_file.name + +file_props = None +for props in data_map: + if props['target'] == input_file.name: + file_props = props + +if file_props == None: + raise Exception(f"Input prebuilt file {input_file.name} is not listed in data map {args.datafile}") + +tmp_file = input_file + +if 'compressed' in file_props and file_props['compressed'] == True: + tmp_file = dest_dir / output_file.with_suffix(".lz").name + with open(input_file, mode="rb") as f: + with open(tmp_file, mode="wb") as f2: + compress.compress(f.read(), f2) + +shutil.copy(tmp_file, output_file) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py new file mode 100644 index 0000000000..e9720fc86a --- /dev/null +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python3 +import argparse +import json +import pathlib +import subprocess +import os +import shutil +import compress + +argparser = argparse.ArgumentParser( + prog='pl_batt_obj.narc sprite builder and compressor', + description='Builds NCGR sprite files and compresses if requested.' +) +argparser.add_argument('--nitrogfx', + required=True, + help='Path to nitrogfx executable') +argparser.add_argument('--input', + required=True, + help='Input NCLR file to make adjustments to.') +argparser.add_argument('--output', + required=True, + help='Output NCLR file to write to.') +argparser.add_argument('--private-dir', + required=True, + help='Path to the private directory (where binaries will be made)') +argparser.add_argument('--datafile', + required=True, + help='Contains details of how to build each input.') +args = argparser.parse_args() + +input_file = pathlib.Path(args.input) +output_file = pathlib.Path(args.output) +private_dir = pathlib.Path(args.private_dir) +with open(args.datafile) as f: + data_map = json.load(f) + +private_dir.mkdir(parents=True, exist_ok=True) + +dest_dir = private_dir / 'pl_batt_obj_work' +dest_dir.mkdir(parents=True, exist_ok=True) + +# adjust output_file to target the root private_dir for the build (hacky) +output_file = output_file.parent / ".." / "pl_batt_obj.narc.p" / output_file.name + +file_props = None +for props in data_map: + if props['target'] == input_file.name: + file_props = props + +if file_props == None: + raise Exception(f"Input sprite file {input_file.name} is not listed in data map {args.datafile}") + +tmp_file = dest_dir / output_file.name + +ngfx_args = [args.nitrogfx, input_file, tmp_file] +if 'clobber_size' in file_props and file_props['clobber_size'] == True: + ngfx_args.append('-clobbersize') +if 'mapping_type' in file_props: + ngfx_args.append('-mappingtype') + ngfx_args.append(str(file_props['mapping_type'])) +if 'version101' in file_props and file_props['version101'] == True: + ngfx_args.append('-version101') +if 'vram' in file_props and file_props['vram'] == True: + ngfx_args.append('-vram') + +subprocess.run(ngfx_args) + +if 'compressed' in file_props and file_props['compressed'] == True: + with open(tmp_file, mode="rb") as f: + with open(tmp_file.with_suffix(".lz"), mode="wb") as f2: + compress.compress(f.read(), f2) + tmp_file = tmp_file.with_suffix(".lz") + +shutil.copy(tmp_file, output_file) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/meson.build b/tools/scripts/pl_batt_obj/meson.build new file mode 100644 index 0000000000..6d415e085b --- /dev/null +++ b/tools/scripts/pl_batt_obj/meson.build @@ -0,0 +1,3 @@ +make_pl_batt_obj_palettes_py = find_program('make_pl_batt_obj_palettes.py', native: true) +make_pl_batt_obj_prebuilts_py = find_program('make_pl_batt_obj_prebuilts.py', native: true) +make_pl_batt_obj_sprites_py = find_program('make_pl_batt_obj_sprites.py', native: true) \ No newline at end of file From d458f650c22f9caa88b586747eec5272eb55bb03 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Mon, 14 Oct 2024 17:38:30 -0500 Subject: [PATCH 03/26] resolve ROM diff - need to keep narc at same filesystem level --- platinum.us/filesys.sha1 | 2 +- platinum.us/rom.rsf | 2 +- res/battle/graphic/meson.build | 14 +++++++++++++- res/battle/graphic/pl_batt_obj/meson.build | 4 +--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index 49b0b6144a..6f81191e58 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -172,7 +172,7 @@ d672202157109fb1bb293070b5d35787b2b2b6d3 *res/prebuilt/battle/graphic/batt_bg.na c9baf056c8646bc0bc826bbc98f5cbd439643f3d *res/prebuilt/battle/graphic/batt_obj.narc 036b81fe61c6347100c73b2c23d28da5abc7626c *res/prebuilt/battle/graphic/pl_b_plist_gra.narc 2fafdda86f7f740e2843c95382f08dfac35fa64f *res/prebuilt/battle/graphic/pl_batt_bg.narc -db5906303178da70f6b6c852990df560fb4dfeba *res/battle/graphic/pl_batt_obj/pl_batt_obj.narc +db5906303178da70f6b6c852990df560fb4dfeba *res/battle/graphic/pl_batt_obj.narc 955ce80b532be2184c62c36a6cb9d6b68c4669dd *res/prebuilt/battle/graphic/vs_demo_gra.narc c7e601f3c145dd3c36c6f1deee1f63d526be3c37 *res/prebuilt/wazaeffect/we.arc 30bb77e76c27874bc8ff923b33492595f1a377e2 *res/prebuilt/wazaeffect/we_sub.narc diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf index 24117dae70..b5c65a5586 100644 --- a/platinum.us/rom.rsf +++ b/platinum.us/rom.rsf @@ -250,7 +250,7 @@ RomSpec Root / HostRoot res - File battle/graphic/pl_batt_obj/pl_batt_obj.narc + File battle/graphic/pl_batt_obj.narc Root / HostRoot res/prebuilt diff --git a/res/battle/graphic/meson.build b/res/battle/graphic/meson.build index f00855949b..3c58919124 100644 --- a/res/battle/graphic/meson.build +++ b/res/battle/graphic/meson.build @@ -1 +1,13 @@ -subdir('pl_batt_obj') \ No newline at end of file +subdir('pl_batt_obj') + +copy_prog = find_program('cp') + +nitrofs_files += custom_target( + input: pl_batt_obj_narc, + output: 'pl_batt_obj.narc', + command: [ + copy_prog, + '@INPUT@', + '@OUTPUT@' + ] +) \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index b1d655be2b..04fb5f5c2a 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -20,6 +20,4 @@ pl_batt_obj_narc = custom_target('pl_batt_obj.narc', '@OUTPUT@' ], build_always_stale: true -) - -nitrofs_files += pl_batt_obj_narc \ No newline at end of file +) \ No newline at end of file From 54f8f91ab4572d755716af7580891017556fc74a Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Mon, 14 Oct 2024 17:44:08 -0500 Subject: [PATCH 04/26] update some naming scheme for BattleObj --- include/unk_0207C908.h | 14 ++++---- src/battle/ov16_0226871C.c | 2 +- src/overlay013/ov13_02224500.c | 8 ++--- src/overlay019/ov19_021DA92C.c | 28 +++++++-------- src/overlay070/ov70_0225D9A4.c | 6 ++-- src/overlay084/ov84_022403F4.c | 8 ++--- src/overlay091/ov91_021D0D80.c | 8 ++--- src/unk_0207C908.c | 64 +++++++++++++++++----------------- src/unk_0208EA44.c | 8 ++--- 9 files changed, 73 insertions(+), 73 deletions(-) diff --git a/include/unk_0207C908.h b/include/unk_0207C908.h index adaf4f9a5b..9c7698711d 100644 --- a/include/unk_0207C908.h +++ b/include/unk_0207C908.h @@ -12,12 +12,12 @@ #define NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE 74 -u32 Battle_Obj_TypeIndexToIconNARCMember(int param0); -u32 Battle_Obj_GetPaletteNARCMember(void); +u32 BattleObj_TypeIDToNARCMember(int param0); +u32 BattleObj_GetPaletteNARCMember(void); u32 sub_0207C924(void); u32 sub_0207C928(void); -u8 Battle_Obj_TypeIndexToPaletteIndex(int param0); -u32 Battle_Obj_GetNARCIndex(void); +u8 BattleObj_TypeIDToPaletteIndex(int param0); +u32 BattleObj_GetNARCIndex(void); void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5); @@ -27,9 +27,9 @@ void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1); void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2); CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); void sub_0207CA88(CellActorData *param0); -u32 Battle_Obj_MoveTypeIndexToIconNARCMember(int param0); -u8 Battle_Obj_MoveTypeIndexToPaletteIndex(int param0); -u32 Battle_Obj_GetMoveTypeNARCIndex(void); +u32 BattleObj_MoveTypeIDToNARCMember(int param0); +u8 BattleObj_MoveTypeIDToPaletteIndex(int param0); +u32 BattleObj_GetMoveTypeNARCIndex(void); void sub_0207CAC4(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); void sub_0207CB00(CellActorData *param0); diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index ff13d30519..971cfbc784 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -2800,7 +2800,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ for (v4 = 0; v4 < 4; v4++) { if ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0)) { v5 = MoveTable_LoadParam(param2->unk_00[v4], MOVEATTRIBUTE_TYPE); - v1 = Graphics_GetCharData(Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(v5), 1, &v2, 5); + v1 = Graphics_GetCharData(BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(v5), 1, &v2, 5); MI_CpuCopy32(v2->pRawData, v0->unk_18[v4], v3); Heap_FreeToHeap(v1); } diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 209c3c8bd6..2c4370d4f9 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -400,16 +400,16 @@ static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1 { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param3), 1, param2); - sub_0200D41C(param1, Battle_Obj_TypeIndexToPaletteIndex(param3) + 4); + sub_0200D948(v0, param0->unk_1FB0, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param3), 1, param2); + sub_0200D41C(param1, BattleObj_TypeIDToPaletteIndex(param3) + 4); } static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2) { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(param2), 1, 45077); - sub_0200D41C(param1, Battle_Obj_MoveTypeIndexToPaletteIndex(param2) + 4); + sub_0200D948(v0, param0->unk_1FB0, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(param2), 1, 45077); + sub_0200D41C(param1, BattleObj_MoveTypeIDToPaletteIndex(param2) + 4); } static void ov13_02224AB0(u16 param0, CellActorData *param1, const int param2, const int param3) diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index ff569c86c8..8025ba6307 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -35,12 +35,12 @@ typedef struct { UnkStruct_ov19_021DA9E0 *unk_08; } UnkStruct_ov19_021DAE2C; -u32 Battle_Obj_TypeIndexToIconNARCMember(int param0); -u32 Battle_Obj_GetPaletteNARCMember(void); +u32 BattleObj_TypeIDToNARCMember(int param0); +u32 BattleObj_GetPaletteNARCMember(void); u32 sub_0207C924(void); u32 sub_0207C928(void); -u8 Battle_Obj_TypeIndexToPaletteIndex(int param0); -u32 Battle_Obj_GetNARCIndex(void); +u8 BattleObj_TypeIDToPaletteIndex(int param0); +u32 BattleObj_GetNARCIndex(void); void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2); static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0); static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0); @@ -78,7 +78,7 @@ BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_30 = NULL; param0->unk_44 = MessageLoader_GetNewStrbuf(param5, 21); param0->unk_48 = MessageLoader_GetNewStrbuf(param5, 22); - param0->unk_34 = Graphics_GetCellBank(Battle_Obj_GetNARCIndex(), sub_0207C924(), 1, &(param0->unk_38), 10); + param0->unk_34 = Graphics_GetCellBank(BattleObj_GetNARCIndex(), sub_0207C924(), 1, &(param0->unk_38), 10); for (v0 = 0; v0 < 2; v0++) { param0->unk_3C[v0] = NULL; @@ -215,10 +215,10 @@ static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0) CellActorResourceData v1; u32 v2, v3, v4; - v2 = Battle_Obj_GetNARCIndex(); - v3 = Battle_Obj_TypeIndexToIconNARCMember(2); + v2 = BattleObj_GetNARCIndex(); + v3 = BattleObj_TypeIDToNARCMember(2); - Graphics_LoadPalette(v2, Battle_Obj_GetPaletteNARCMember(), 1, 10 * 0x20, 0x20 * 3, 10); + Graphics_LoadPalette(v2, BattleObj_GetPaletteNARCMember(), 1, 10 * 0x20, 0x20 * 3, 10); for (v4 = 0; v4 < 2; v4++) { NNS_G2dInitImageProxy(&v0); @@ -413,25 +413,25 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p VecFx32 v2; u32 v3, v4; - v3 = Battle_Obj_GetNARCIndex(); - v4 = Battle_Obj_TypeIndexToIconNARCMember(param1->unk_10->unk_4C.unk_0C); + v3 = BattleObj_GetNARCIndex(); + v4 = BattleObj_TypeIDToNARCMember(param1->unk_10->unk_4C.unk_0C); - Graphics_LoadObjectTiles(Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); v2 = *CellActor_GetPosition(param1->unk_3C[0]); v2.y = (176 + (16 * param3)) << FX32_SHIFT; CellActor_SetPosition(param1->unk_3C[0], &v2); - CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + Battle_Obj_TypeIndexToPaletteIndex(param1->unk_10->unk_4C.unk_0C)); + CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + BattleObj_TypeIDToPaletteIndex(param1->unk_10->unk_4C.unk_0C)); CellActor_SetDrawFlag(param1->unk_3C[0], 1); if (param1->unk_10->unk_4C.unk_0C != param1->unk_10->unk_4C.unk_0D) { - Graphics_LoadObjectTiles(Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); v2.x += (36 << FX32_SHIFT); CellActor_SetPosition(param1->unk_3C[1], &v2); - CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + Battle_Obj_TypeIndexToPaletteIndex(param1->unk_10->unk_4C.unk_0D)); + CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + BattleObj_TypeIDToPaletteIndex(param1->unk_10->unk_4C.unk_0D)); CellActor_SetDrawFlag(param1->unk_3C[1], 1); } else { CellActor_SetDrawFlag(param1->unk_3C[1], 0); diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index cb2d300a91..c1f2def516 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -2435,7 +2435,7 @@ static void ov70_0225F95C(SysTask *param0, void *param1) } { - Graphics_LoadPalette(Battle_Obj_GetNARCIndex(), Battle_Obj_GetPaletteNARCMember(), 4, 11 * 32, 3 * 32, v0->unk_156); + Graphics_LoadPalette(BattleObj_GetNARCIndex(), BattleObj_GetPaletteNARCMember(), 4, 11 * 32, 3 * 32, v0->unk_156); } SysTask_Done(param0); @@ -2634,14 +2634,14 @@ static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA if (v0 != 0) { v2 = ov66_022316E8(v0); - v3 = LoadMemberFromNARC(Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(v2), 1, param3, 1); + v3 = LoadMemberFromNARC(BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(v2), 1, param3, 1); NNS_G2dGetUnpackedCharacterData(v3, &v4); Bg_LoadTiles(param2->unk_00, Unk_ov70_0226D5CC[3], v4->pRawData, 4 * 2 * 32, Unk_ov70_0226D590[v1]); Heap_FreeToHeap(v3); Bg_CopyToTilemapRect(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, Unk_ov70_0226D624[v1], 0, 0, 4, 2); - Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + Battle_Obj_TypeIndexToPaletteIndex(v2)); + Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + BattleObj_TypeIDToPaletteIndex(v2)); Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov70_0226D5CC[3]); } } diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index cfe136882f..6c315ad32c 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -448,10 +448,10 @@ void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2) v1 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_TYPE); v2 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_D8, param0->unk_DC, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(v1), 1, 49409); - sub_0200D41C(param0->unk_E0[10], Battle_Obj_TypeIndexToPaletteIndex(v1) + 6); - sub_0200D948(param0->unk_D8, param0->unk_DC, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(v2), 1, 49410); - sub_0200D41C(param0->unk_E0[11], Battle_Obj_MoveTypeIndexToPaletteIndex(v2) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(v1), 1, 49409); + sub_0200D41C(param0->unk_E0[10], BattleObj_TypeIDToPaletteIndex(v1) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(v2), 1, 49410); + sub_0200D41C(param0->unk_E0[11], BattleObj_MoveTypeIDToPaletteIndex(v2) + 6); } void ov84_02240E24(UnkStruct_ov84_0223B5A0 *param0, s16 param1, s16 param2) diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 269ceabea2..aff7ad48a3 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1366,8 +1366,8 @@ static void ov91_021D22A0(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CONTEST_TYPE) + 18; } - sub_0200D948(param0->unk_110, param0->unk_114, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(v0), 1, 47276 + param2); - sub_0200D41C(param0->unk_118[6 + param2], Battle_Obj_TypeIndexToPaletteIndex(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(v0), 1, 47276 + param2); + sub_0200D41C(param0->unk_118[6 + param2], BattleObj_TypeIDToPaletteIndex(v0) + 2); } static void ov91_021D2314(UnkStruct_ov91_021D0ED8 *param0) @@ -1444,8 +1444,8 @@ static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_110, param0->unk_114, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(v0), 1, 47275); - sub_0200D41C(param0->unk_118[5], Battle_Obj_MoveTypeIndexToPaletteIndex(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(v0), 1, 47275); + sub_0200D41C(param0->unk_118[5], BattleObj_MoveTypeIDToPaletteIndex(v0) + 2); } static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) diff --git a/src/unk_0207C908.c b/src/unk_0207C908.c index 1d414e3e71..dd466ba086 100644 --- a/src/unk_0207C908.c +++ b/src/unk_0207C908.c @@ -16,7 +16,7 @@ /* * Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ -__attribute__((aligned(4))) static const u32 Battle_Obj_Type_NARC_Member_Map[] = { +__attribute__((aligned(4))) static const u32 BattleObj_NARCMemberMap[] = { 0xEA, 0xE1, 0xE3, @@ -45,7 +45,7 @@ __attribute__((aligned(4))) static const u32 Battle_Obj_Type_NARC_Member_Map[] = /* * Maps a type index (e.g. TYPE_WATER) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ -__attribute__((aligned(4))) static const u8 Battle_Obj_Type_Palette_Index_Map[] = { +__attribute__((aligned(4))) static const u8 BattleObj_PaletteIndexMap[] = { 0x0, 0x0, 0x1, @@ -74,7 +74,7 @@ __attribute__((aligned(4))) static const u8 Battle_Obj_Type_Palette_Index_Map[] /* * Maps move types (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ -__attribute__((aligned(4))) static const u32 Battle_Obj_MoveType_NARC_Member_Map[] = { +__attribute__((aligned(4))) static const u32 BattleObj_MoveType_NARCMemberMap[] = { 0xF4, 0xF6, 0xF5 @@ -83,7 +83,7 @@ __attribute__((aligned(4))) static const u32 Battle_Obj_MoveType_NARC_Member_Map /* * Maps a move type (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ -__attribute__((aligned(4))) static const u8 Battle_Obj_MoveType_Palette_Member_Map[] = { +__attribute__((aligned(4))) static const u8 BattleObj_MoveType_PaletteIndexMap[] = { 0x0, 0x1, 0x0 @@ -91,19 +91,19 @@ __attribute__((aligned(4))) static const u8 Battle_Obj_MoveType_Palette_Member_M /* * Given a type index, return the corresponding NARC member containing the icon for that type. -* See also Battle_Obj_GetNARCIndex. +* See also BattleObj_GetNARCIndex. */ -u32 Battle_Obj_TypeIndexToIconNARCMember(int typeIndex) +u32 BattleObj_TypeIDToNARCMember(int typeIndex) { - GF_ASSERT(typeIndex < NELEMS(Battle_Obj_Type_NARC_Member_Map)); - return Battle_Obj_Type_NARC_Member_Map[typeIndex]; + GF_ASSERT(typeIndex < NELEMS(BattleObj_NARCMemberMap)); + return BattleObj_NARCMemberMap[typeIndex]; } /* * Returns the NARC member within pl_batt_obj containing palettes for battle icons. -* See also Battle_Obj_GetNARCIndex. +* See also BattleObj_GetNARCIndex. */ -u32 Battle_Obj_GetPaletteNARCMember(void) +u32 BattleObj_GetPaletteNARCMember(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE; } @@ -120,41 +120,41 @@ u32 sub_0207C928(void) /* * Given a type index, return the corresponding palette index to use for that type's icon. -* See also Battle_Obj_GetNARCIndex and Battle_Obj_GetPaletteNARCMember. +* See also BattleObj_GetNARCIndex and BattleObj_GetPaletteNARCMember. */ -u8 Battle_Obj_TypeIndexToPaletteIndex(int param0) +u8 BattleObj_TypeIDToPaletteIndex(int param0) { - GF_ASSERT(param0 < NELEMS(Battle_Obj_Type_Palette_Index_Map)); - return Battle_Obj_Type_Palette_Index_Map[param0]; + GF_ASSERT(param0 < NELEMS(BattleObj_PaletteIndexMap)); + return BattleObj_PaletteIndexMap[param0]; } /* * Returns the index of the NARC for pl_batt_obj. */ -u32 Battle_Obj_GetNARCIndex(void) +u32 BattleObj_GetNARCIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { - sub_0200CBDC(param0, param1, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param3), 1, param2, param4); + sub_0200CBDC(param0, param1, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param3), 1, param2, param4); } void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) { - sub_0200CC9C(param0, param1, Battle_Obj_GetNARCIndex(), Battle_Obj_GetPaletteNARCMember(), 0, 3, param2, param3); + sub_0200CC9C(param0, param1, BattleObj_GetNARCIndex(), BattleObj_GetPaletteNARCMember(), 0, 3, param2, param3); } void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5) { - sub_0200CD7C(param0, param1, param2, param3, Battle_Obj_GetNARCIndex(), Battle_Obj_GetPaletteNARCMember(), 0, 3, param4, param5); + sub_0200CD7C(param0, param1, param2, param3, BattleObj_GetNARCIndex(), BattleObj_GetPaletteNARCMember(), 0, 3, param4, param5); } void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3) { - sub_0200CE0C(param0, param1, Battle_Obj_GetNARCIndex(), sub_0207C924(), 1, param2); - sub_0200CE3C(param0, param1, Battle_Obj_GetNARCIndex(), sub_0207C928(), 1, param3); + sub_0200CE0C(param0, param1, BattleObj_GetNARCIndex(), sub_0207C924(), 1, param2); + sub_0200CE3C(param0, param1, BattleObj_GetNARCIndex(), sub_0207C928(), 1, param3); } void sub_0207CA34(SpriteGfxHandler *param0, u32 param1) @@ -179,7 +179,7 @@ CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, in SpriteTemplate v1; v1 = *param3; - v1.plttIdx = Battle_Obj_TypeIndexToPaletteIndex(param2); + v1.plttIdx = BattleObj_TypeIDToPaletteIndex(param2); v0 = SpriteActor_LoadResources(param0, param1, &v1); return v0; @@ -192,36 +192,36 @@ void sub_0207CA88(CellActorData *param0) /* * Given a movetype index, return the corresponding NARC member containing the icon for that movetype. -* See also Battle_Obj_GetNARCIndex. +* See also BattleObj_GetNARCIndex. */ -u32 Battle_Obj_MoveTypeIndexToIconNARCMember(int moveTypeIndex) +u32 BattleObj_MoveTypeIDToNARCMember(int moveTypeIndex) { - GF_ASSERT(moveTypeIndex < NELEMS(Battle_Obj_MoveType_NARC_Member_Map)); - return Battle_Obj_MoveType_NARC_Member_Map[moveTypeIndex]; + GF_ASSERT(moveTypeIndex < NELEMS(BattleObj_MoveType_NARCMemberMap)); + return BattleObj_MoveType_NARCMemberMap[moveTypeIndex]; } /* * Given a movetype index, return the corresponding palette index to use for that movetype's icon. -* See also Battle_Obj_GetNARCIndex and Battle_Obj_GetPaletteNARCMember. +* See also BattleObj_GetNARCIndex and BattleObj_GetPaletteNARCMember. */ -u8 Battle_Obj_MoveTypeIndexToPaletteIndex(int moveTypeIndex) +u8 BattleObj_MoveTypeIDToPaletteIndex(int moveTypeIndex) { - GF_ASSERT(moveTypeIndex < NELEMS(Battle_Obj_MoveType_Palette_Member_Map)); - return Battle_Obj_MoveType_Palette_Member_Map[moveTypeIndex]; + GF_ASSERT(moveTypeIndex < NELEMS(BattleObj_MoveType_PaletteIndexMap)); + return BattleObj_MoveType_PaletteIndexMap[moveTypeIndex]; } /* * Returns the index of the NARC for pl_batt_obj. -* (This is identical to Battle_Obj_GetNARCIndex). +* (This is identical to BattleObj_GetNARCIndex). */ -u32 Battle_Obj_GetMoveTypeNARCIndex(void) +u32 BattleObj_GetMoveTypeNARCIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } void sub_0207CAC4(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { - sub_0200CBDC(param0, param1, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(param3), 1, param2, param4); + sub_0200CBDC(param0, param1, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(param3), 1, param2, param4); } void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1) diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index 16d48b3f5c..7305a1f951 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -429,8 +429,8 @@ void sub_0208F16C(PokemonSummaryApp *param0) static void sub_0208F194(PokemonSummaryApp *param0, u8 param1, u8 param2, u8 param3) { - sub_0200D948(param0->renderer, param0->gfxHandler, Battle_Obj_GetNARCIndex(), Battle_Obj_TypeIndexToIconNARCMember(param3), 1, param2); - sub_0200D414(param0->unk_41C[param1], Battle_Obj_TypeIndexToPaletteIndex(param3) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param3), 1, param2); + sub_0200D414(param0->unk_41C[param1], BattleObj_TypeIDToPaletteIndex(param3) + 3); } static void sub_0208F1E4(PokemonSummaryApp *param0, u8 *param1, s16 *param2, s16 *param3) @@ -464,8 +464,8 @@ void sub_0208F294(PokemonSummaryApp *param0, u32 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->renderer, param0->gfxHandler, Battle_Obj_GetMoveTypeNARCIndex(), Battle_Obj_MoveTypeIndexToIconNARCMember(v0), 1, 10); - sub_0200D414(param0->unk_41C[18], Battle_Obj_MoveTypeIndexToPaletteIndex(v0) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(v0), 1, 10); + sub_0200D414(param0->unk_41C[18], BattleObj_MoveTypeIDToPaletteIndex(v0) + 3); } void sub_0208F2E8(PokemonSummaryApp *param0) From fdf3cf9f6f64417fa04fbb069e79f4e2910c68f0 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Mon, 14 Oct 2024 17:48:23 -0500 Subject: [PATCH 05/26] rename a couple of icon rendering functions --- include/unk_0207C908.h | 6 +++--- src/battle/ov16_0226871C.c | 2 +- src/overlay013/ov13_02224500.c | 4 ++-- src/overlay084/ov84_022403F4.c | 6 +++--- src/overlay091/ov91_021D0D80.c | 6 +++--- src/unk_0207C908.c | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/unk_0207C908.h b/include/unk_0207C908.h index 9c7698711d..0ee46588d7 100644 --- a/include/unk_0207C908.h +++ b/include/unk_0207C908.h @@ -18,8 +18,8 @@ u32 sub_0207C924(void); u32 sub_0207C928(void); u8 BattleObj_TypeIDToPaletteIndex(int param0); u32 BattleObj_GetNARCIndex(void); -void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); -void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); +void BattleObj_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); +void BattleObj_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5); void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3); void sub_0207CA34(SpriteGfxHandler *param0, u32 param1); @@ -30,7 +30,7 @@ void sub_0207CA88(CellActorData *param0); u32 BattleObj_MoveTypeIDToNARCMember(int param0); u8 BattleObj_MoveTypeIDToPaletteIndex(int param0); u32 BattleObj_GetMoveTypeNARCIndex(void); -void sub_0207CAC4(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); +void BattleObj_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); void sub_0207CB00(CellActorData *param0); diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 971cfbc784..748467235e 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -1228,7 +1228,7 @@ void ov16_02268A88(UnkStruct_ov16_02268A14 *param0) sub_0207C9B0(BattleSystem_PaletteSys(param0->unk_00), 3, v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 20020); for (v4 = 0; v4 < 4; v4++) { - sub_0207C948(v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 0, 20025 + v4); + BattleObj_MakeTypeSpriteTiles(v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 0, 20025 + v4); } if (BattleSystem_BattleType(param0->unk_00) & 0x400) { diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 2c4370d4f9..5d95bc1efa 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -295,10 +295,10 @@ static void ov13_02224720(UnkStruct_ov13_022213F0 *param0) sub_0207C9EC(v0, param0->unk_1FB0, 45065, 45065); for (v1 = 45070; v1 <= 45076; v1++) { - sub_0207C948(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, v1); + BattleObj_MakeTypeSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, v1); } - sub_0207CAC4(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 45077); + BattleObj_MakeMoveTypeSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 45077); } static void ov13_02224798(UnkStruct_ov13_022213F0 *param0) diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index 6c315ad32c..a05f15ae66 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -237,13 +237,13 @@ static void ov84_022404C0(UnkStruct_ov84_0223B5A0 *param0) SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_D8, param0->unk_DC, param0->unk_D4, 36, 0, NNS_G2D_VRAM_TYPE_2DSUB, 49406); sub_0200CBDC(param0->unk_D8, param0->unk_DC, 62, 4, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49408); sub_0200CBDC(param0->unk_D8, param0->unk_DC, 16, Item_FileID(0, 1), 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49407); - sub_0207C948(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49409); - sub_0207CAC4(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49410); + BattleObj_MakeTypeSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49409); + BattleObj_MakeMoveTypeSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49410); sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, v1, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49401); sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 20, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 49402); sub_0200CC9C(param0->unk_D8, param0->unk_DC, 16, Item_FileID(0, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49404); sub_0200CC9C(param0->unk_D8, param0->unk_DC, 62, 10, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 49405); - sub_0207C97C(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 49406); + BattleObj_MakeTypeSpritePalette(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 49406); sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 37, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 49403); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_D8, param0->unk_DC, param0->unk_D4, 1, 0, 49401); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_D8, param0->unk_DC, param0->unk_D4, 24, 0, 49402); diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index aff7ad48a3..0f8d8ee11a 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1341,12 +1341,12 @@ static void ov91_021D2110(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47274); for (v0 = 47276; v0 <= 47282; v0++) { - sub_0207C948(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, v0); + BattleObj_MakeTypeSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, v0); } - sub_0207CAC4(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 47275); + BattleObj_MakeMoveTypeSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 47275); sub_0200CD0C(param0->unk_110, param0->unk_114, param1, 9, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47272); - sub_0207C97C(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 47273); + BattleObj_MakeTypeSpritePalette(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 47273); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 4, 0, 47272); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 7, 0, 47273); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 1, 0, 47274); diff --git a/src/unk_0207C908.c b/src/unk_0207C908.c index dd466ba086..aec4b89398 100644 --- a/src/unk_0207C908.c +++ b/src/unk_0207C908.c @@ -136,12 +136,12 @@ u32 BattleObj_GetNARCIndex(void) return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } -void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) +void BattleObj_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { sub_0200CBDC(param0, param1, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param3), 1, param2, param4); } -void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) +void BattleObj_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) { sub_0200CC9C(param0, param1, BattleObj_GetNARCIndex(), BattleObj_GetPaletteNARCMember(), 0, 3, param2, param3); } @@ -219,7 +219,7 @@ u32 BattleObj_GetMoveTypeNARCIndex(void) return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } -void sub_0207CAC4(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) +void BattleObj_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { sub_0200CBDC(param0, param1, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(param3), 1, param2, param4); } From 663e2180c2b3fc2020abb336fb937c5361b3ddb3 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Tue, 15 Oct 2024 09:32:44 -0500 Subject: [PATCH 06/26] remove unnecessary copy step --- platinum.us/filesys.sha1 | 2 +- platinum.us/rom.rsf | 6 +++--- res/battle/graphic/meson.build | 14 +------------- res/battle/graphic/pl_batt_obj/meson.build | 2 +- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index 6f81191e58..49b0b6144a 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -172,7 +172,7 @@ d672202157109fb1bb293070b5d35787b2b2b6d3 *res/prebuilt/battle/graphic/batt_bg.na c9baf056c8646bc0bc826bbc98f5cbd439643f3d *res/prebuilt/battle/graphic/batt_obj.narc 036b81fe61c6347100c73b2c23d28da5abc7626c *res/prebuilt/battle/graphic/pl_b_plist_gra.narc 2fafdda86f7f740e2843c95382f08dfac35fa64f *res/prebuilt/battle/graphic/pl_batt_bg.narc -db5906303178da70f6b6c852990df560fb4dfeba *res/battle/graphic/pl_batt_obj.narc +db5906303178da70f6b6c852990df560fb4dfeba *res/battle/graphic/pl_batt_obj/pl_batt_obj.narc 955ce80b532be2184c62c36a6cb9d6b68c4669dd *res/prebuilt/battle/graphic/vs_demo_gra.narc c7e601f3c145dd3c36c6f1deee1f63d526be3c37 *res/prebuilt/wazaeffect/we.arc 30bb77e76c27874bc8ff923b33492595f1a377e2 *res/prebuilt/wazaeffect/we_sub.narc diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf index b5c65a5586..51642a0f97 100644 --- a/platinum.us/rom.rsf +++ b/platinum.us/rom.rsf @@ -248,9 +248,9 @@ RomSpec File battle/graphic/pl_b_plist_gra.narc File battle/graphic/pl_batt_bg.narc - Root / - HostRoot res - File battle/graphic/pl_batt_obj.narc + Root /battle/graphic + HostRoot res/battle/graphic/pl_batt_obj + File pl_batt_obj.narc Root / HostRoot res/prebuilt diff --git a/res/battle/graphic/meson.build b/res/battle/graphic/meson.build index 3c58919124..f00855949b 100644 --- a/res/battle/graphic/meson.build +++ b/res/battle/graphic/meson.build @@ -1,13 +1 @@ -subdir('pl_batt_obj') - -copy_prog = find_program('cp') - -nitrofs_files += custom_target( - input: pl_batt_obj_narc, - output: 'pl_batt_obj.narc', - command: [ - copy_prog, - '@INPUT@', - '@OUTPUT@' - ] -) \ No newline at end of file +subdir('pl_batt_obj') \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index 04fb5f5c2a..c0e0e68386 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -4,7 +4,7 @@ subdir('sprites') pl_batt_order = files('order.txt') -pl_batt_obj_narc = custom_target('pl_batt_obj.narc', +nitrofs_files += custom_target('pl_batt_obj.narc', output: 'pl_batt_obj.narc', input: [ pl_batt_order, From b218cbb621ad4cae5e0561add83c6eeb2e394399 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Tue, 15 Oct 2024 11:05:05 -0500 Subject: [PATCH 07/26] rename to battle_icon --- .../{unk_0207C908.h => battle/battle_icon.h} | 20 +++--- platinum.us/main.lsf | 2 +- src/{unk_0207C908.c => battle/battle_icon.c} | 72 +++++++++---------- src/battle/ov16_0226871C.c | 6 +- src/meson.build | 2 +- src/overlay013/ov13_02224500.c | 14 ++-- src/overlay019/ov19_021DA92C.c | 28 ++++---- src/overlay070/ov70_0225D9A4.c | 10 +-- src/overlay084/ov84_022403F4.c | 16 ++--- src/overlay091/ov91_021D0D80.c | 16 ++--- src/unk_0208EA44.c | 10 +-- 11 files changed, 98 insertions(+), 98 deletions(-) rename include/{unk_0207C908.h => battle/battle_icon.h} (60%) rename src/{unk_0207C908.c => battle/battle_icon.c} (56%) diff --git a/include/unk_0207C908.h b/include/battle/battle_icon.h similarity index 60% rename from include/unk_0207C908.h rename to include/battle/battle_icon.h index 0ee46588d7..7358a28010 100644 --- a/include/unk_0207C908.h +++ b/include/battle/battle_icon.h @@ -12,14 +12,14 @@ #define NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE 74 -u32 BattleObj_TypeIDToNARCMember(int param0); -u32 BattleObj_GetPaletteNARCMember(void); +u32 BattleIcon_TypeIndexToNARCMember(int param0); +u32 BattleIcon_GetPaletteNARCMember(void); u32 sub_0207C924(void); u32 sub_0207C928(void); -u8 BattleObj_TypeIDToPaletteIndex(int param0); -u32 BattleObj_GetNARCIndex(void); -void BattleObj_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); -void BattleObj_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); +u8 BattleIcon_TypeIndexToPaletteIndex(int param0); +u32 BattleIcon_GetNARCIndex(void); +void BattleIcon_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); +void BattleIcon_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5); void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3); void sub_0207CA34(SpriteGfxHandler *param0, u32 param1); @@ -27,10 +27,10 @@ void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1); void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2); CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); void sub_0207CA88(CellActorData *param0); -u32 BattleObj_MoveTypeIDToNARCMember(int param0); -u8 BattleObj_MoveTypeIDToPaletteIndex(int param0); -u32 BattleObj_GetMoveTypeNARCIndex(void); -void BattleObj_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); +u32 BattleIcon_MoveTypeIndexToNARCMember(int param0); +u8 BattleIcon_MoveTypeIndexToPaletteIndex(int param0); +u32 BattleIcon_GetMoveTypeNARCIndex(void); +void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); void sub_0207CB00(CellActorData *param0); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 0e9da79acf..1d571bd218 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -298,7 +298,7 @@ Static main Object main.nef.p/src_unk_0207A6DC.c.o Object main.nef.p/src_unk_0207AE68.c.o Object main.nef.p/src_unk_0207C63C.c.o - Object main.nef.p/src_unk_0207C908.c.o + Object main.nef.p/src_battle_battle_icon.c.o Object main.nef.p/src_unk_0207CB08.c.o Object main.nef.p/src_item.c.o Object main.nef.p/src_bag.c.o diff --git a/src/unk_0207C908.c b/src/battle/battle_icon.c similarity index 56% rename from src/unk_0207C908.c rename to src/battle/battle_icon.c index aec4b89398..d20674feee 100644 --- a/src/unk_0207C908.c +++ b/src/battle/battle_icon.c @@ -1,4 +1,4 @@ -#include "unk_0207C908.h" +#include "battle/battle_icon.h" #include #include @@ -16,7 +16,7 @@ /* * Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ -__attribute__((aligned(4))) static const u32 BattleObj_NARCMemberMap[] = { +__attribute__((aligned(4))) static const u32 BattleIcon_NARCMemberMap[] = { 0xEA, 0xE1, 0xE3, @@ -45,7 +45,7 @@ __attribute__((aligned(4))) static const u32 BattleObj_NARCMemberMap[] = { /* * Maps a type index (e.g. TYPE_WATER) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ -__attribute__((aligned(4))) static const u8 BattleObj_PaletteIndexMap[] = { +__attribute__((aligned(4))) static const u8 BattleIcon_PaletteIndexMap[] = { 0x0, 0x0, 0x1, @@ -74,7 +74,7 @@ __attribute__((aligned(4))) static const u8 BattleObj_PaletteIndexMap[] = { /* * Maps move types (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ -__attribute__((aligned(4))) static const u32 BattleObj_MoveType_NARCMemberMap[] = { +__attribute__((aligned(4))) static const u32 BattleIcon_MoveType_NARCMemberMap[] = { 0xF4, 0xF6, 0xF5 @@ -83,7 +83,7 @@ __attribute__((aligned(4))) static const u32 BattleObj_MoveType_NARCMemberMap[] /* * Maps a move type (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ -__attribute__((aligned(4))) static const u8 BattleObj_MoveType_PaletteIndexMap[] = { +__attribute__((aligned(4))) static const u8 BattleIcon_MoveType_PaletteIndexMap[] = { 0x0, 0x1, 0x0 @@ -91,19 +91,19 @@ __attribute__((aligned(4))) static const u8 BattleObj_MoveType_PaletteIndexMap[] /* * Given a type index, return the corresponding NARC member containing the icon for that type. -* See also BattleObj_GetNARCIndex. +* See also BattleIcon_GetNARCIndex. */ -u32 BattleObj_TypeIDToNARCMember(int typeIndex) +u32 BattleIcon_TypeIndexToNARCMember(int typeIndex) { - GF_ASSERT(typeIndex < NELEMS(BattleObj_NARCMemberMap)); - return BattleObj_NARCMemberMap[typeIndex]; + GF_ASSERT(typeIndex < NELEMS(BattleIcon_NARCMemberMap)); + return BattleIcon_NARCMemberMap[typeIndex]; } /* * Returns the NARC member within pl_batt_obj containing palettes for battle icons. -* See also BattleObj_GetNARCIndex. +* See also BattleIcon_GetNARCIndex. */ -u32 BattleObj_GetPaletteNARCMember(void) +u32 BattleIcon_GetPaletteNARCMember(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE; } @@ -120,41 +120,41 @@ u32 sub_0207C928(void) /* * Given a type index, return the corresponding palette index to use for that type's icon. -* See also BattleObj_GetNARCIndex and BattleObj_GetPaletteNARCMember. +* See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. */ -u8 BattleObj_TypeIDToPaletteIndex(int param0) +u8 BattleIcon_TypeIndexToPaletteIndex(int typeIndex) { - GF_ASSERT(param0 < NELEMS(BattleObj_PaletteIndexMap)); - return BattleObj_PaletteIndexMap[param0]; + GF_ASSERT(typeIndex < NELEMS(BattleIcon_PaletteIndexMap)); + return BattleIcon_PaletteIndexMap[typeIndex]; } /* * Returns the index of the NARC for pl_batt_obj. */ -u32 BattleObj_GetNARCIndex(void) +u32 BattleIcon_GetNARCIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } -void BattleObj_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) +void BattleIcon_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int typeIndex, u32 param4) { - sub_0200CBDC(param0, param1, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param3), 1, param2, param4); + sub_0200CBDC(param0, param1, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(typeIndex), 1, param2, param4); } -void BattleObj_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) +void BattleIcon_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) { - sub_0200CC9C(param0, param1, BattleObj_GetNARCIndex(), BattleObj_GetPaletteNARCMember(), 0, 3, param2, param3); + sub_0200CC9C(param0, param1, BattleIcon_GetNARCIndex(), BattleIcon_GetPaletteNARCMember(), 0, 3, param2, param3); } void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5) { - sub_0200CD7C(param0, param1, param2, param3, BattleObj_GetNARCIndex(), BattleObj_GetPaletteNARCMember(), 0, 3, param4, param5); + sub_0200CD7C(param0, param1, param2, param3, BattleIcon_GetNARCIndex(), BattleIcon_GetPaletteNARCMember(), 0, 3, param4, param5); } void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3) { - sub_0200CE0C(param0, param1, BattleObj_GetNARCIndex(), sub_0207C924(), 1, param2); - sub_0200CE3C(param0, param1, BattleObj_GetNARCIndex(), sub_0207C928(), 1, param3); + sub_0200CE0C(param0, param1, BattleIcon_GetNARCIndex(), sub_0207C924(), 1, param2); + sub_0200CE3C(param0, param1, BattleIcon_GetNARCIndex(), sub_0207C928(), 1, param3); } void sub_0207CA34(SpriteGfxHandler *param0, u32 param1) @@ -179,7 +179,7 @@ CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, in SpriteTemplate v1; v1 = *param3; - v1.plttIdx = BattleObj_TypeIDToPaletteIndex(param2); + v1.plttIdx = BattleIcon_TypeIndexToPaletteIndex(param2); v0 = SpriteActor_LoadResources(param0, param1, &v1); return v0; @@ -192,36 +192,36 @@ void sub_0207CA88(CellActorData *param0) /* * Given a movetype index, return the corresponding NARC member containing the icon for that movetype. -* See also BattleObj_GetNARCIndex. +* See also BattleIcon_GetNARCIndex. */ -u32 BattleObj_MoveTypeIDToNARCMember(int moveTypeIndex) +u32 BattleIcon_MoveTypeIndexToNARCMember(int moveTypeIndex) { - GF_ASSERT(moveTypeIndex < NELEMS(BattleObj_MoveType_NARCMemberMap)); - return BattleObj_MoveType_NARCMemberMap[moveTypeIndex]; + GF_ASSERT(moveTypeIndex < NELEMS(BattleIcon_MoveType_NARCMemberMap)); + return BattleIcon_MoveType_NARCMemberMap[moveTypeIndex]; } /* * Given a movetype index, return the corresponding palette index to use for that movetype's icon. -* See also BattleObj_GetNARCIndex and BattleObj_GetPaletteNARCMember. +* See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. */ -u8 BattleObj_MoveTypeIDToPaletteIndex(int moveTypeIndex) +u8 BattleIcon_MoveTypeIndexToPaletteIndex(int moveTypeIndex) { - GF_ASSERT(moveTypeIndex < NELEMS(BattleObj_MoveType_PaletteIndexMap)); - return BattleObj_MoveType_PaletteIndexMap[moveTypeIndex]; + GF_ASSERT(moveTypeIndex < NELEMS(BattleIcon_MoveType_PaletteIndexMap)); + return BattleIcon_MoveType_PaletteIndexMap[moveTypeIndex]; } /* * Returns the index of the NARC for pl_batt_obj. -* (This is identical to BattleObj_GetNARCIndex). +* (This is identical to BattleIcon_GetNARCIndex). */ -u32 BattleObj_GetMoveTypeNARCIndex(void) +u32 BattleIcon_GetMoveTypeNARCIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } -void BattleObj_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) +void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int moveTypeIndex, u32 param4) { - sub_0200CBDC(param0, param1, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(param3), 1, param2, param4); + sub_0200CBDC(param0, param1, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(moveTypeIndex), 1, param2, param4); } void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1) diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 748467235e..7a7ad1fd9e 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -59,7 +59,7 @@ #include "unk_02017728.h" #include "unk_0201D15C.h" #include "unk_0201E86C.h" -#include "unk_0207C908.h" +#include "battle/battle_icon.h" #include "unk_0208C098.h" typedef struct { @@ -1228,7 +1228,7 @@ void ov16_02268A88(UnkStruct_ov16_02268A14 *param0) sub_0207C9B0(BattleSystem_PaletteSys(param0->unk_00), 3, v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 20020); for (v4 = 0; v4 < 4; v4++) { - BattleObj_MakeTypeSpriteTiles(v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 0, 20025 + v4); + BattleIcon_MakeTypeSpriteTiles(v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 0, 20025 + v4); } if (BattleSystem_BattleType(param0->unk_00) & 0x400) { @@ -2800,7 +2800,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ for (v4 = 0; v4 < 4; v4++) { if ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0)) { v5 = MoveTable_LoadParam(param2->unk_00[v4], MOVEATTRIBUTE_TYPE); - v1 = Graphics_GetCharData(BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(v5), 1, &v2, 5); + v1 = Graphics_GetCharData(BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v5), 1, &v2, 5); MI_CpuCopy32(v2->pRawData, v0->unk_18[v4], v3); Heap_FreeToHeap(v1); } diff --git a/src/meson.build b/src/meson.build index 6ff0eedc11..351391b354 100644 --- a/src/meson.build +++ b/src/meson.build @@ -283,7 +283,7 @@ pokeplatinum_c = files( 'unk_0207A6DC.c', 'unk_0207AE68.c', 'unk_0207C63C.c', - 'unk_0207C908.c', + 'battle/battle_icon.c', 'unk_0207CB08.c', 'bag.c', 'unk_0207DA28.c', diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 5d95bc1efa..7bf5dffe53 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -24,7 +24,7 @@ #include "pokemon_icon.h" #include "pokemon_summary_app.h" #include "unk_0200C6E4.h" -#include "unk_0207C908.h" +#include "battle/battle_icon.h" #include "unk_0207E0B8.h" #include "unk_0208C098.h" @@ -295,10 +295,10 @@ static void ov13_02224720(UnkStruct_ov13_022213F0 *param0) sub_0207C9EC(v0, param0->unk_1FB0, 45065, 45065); for (v1 = 45070; v1 <= 45076; v1++) { - BattleObj_MakeTypeSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, v1); + BattleIcon_MakeTypeSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, v1); } - BattleObj_MakeMoveTypeSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 45077); + BattleIcon_MakeMoveTypeSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 45077); } static void ov13_02224798(UnkStruct_ov13_022213F0 *param0) @@ -400,16 +400,16 @@ static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1 { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param3), 1, param2); - sub_0200D41C(param1, BattleObj_TypeIDToPaletteIndex(param3) + 4); + sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(param3), 1, param2); + sub_0200D41C(param1, BattleIcon_TypeIndexToPaletteIndex(param3) + 4); } static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2) { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(param2), 1, 45077); - sub_0200D41C(param1, BattleObj_MoveTypeIDToPaletteIndex(param2) + 4); + sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(param2), 1, 45077); + sub_0200D41C(param1, BattleIcon_MoveTypeIndexToPaletteIndex(param2) + 4); } static void ov13_02224AB0(u16 param0, CellActorData *param1, const int param2, const int param3) diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 8025ba6307..b79d7d8c00 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -35,12 +35,12 @@ typedef struct { UnkStruct_ov19_021DA9E0 *unk_08; } UnkStruct_ov19_021DAE2C; -u32 BattleObj_TypeIDToNARCMember(int param0); -u32 BattleObj_GetPaletteNARCMember(void); +u32 BattleIcon_TypeIndexToNARCMember(int param0); +u32 BattleIcon_GetPaletteNARCMember(void); u32 sub_0207C924(void); u32 sub_0207C928(void); -u8 BattleObj_TypeIDToPaletteIndex(int param0); -u32 BattleObj_GetNARCIndex(void); +u8 BattleIcon_TypeIndexToPaletteIndex(int param0); +u32 BattleIcon_GetNARCIndex(void); void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2); static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0); static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0); @@ -78,7 +78,7 @@ BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_30 = NULL; param0->unk_44 = MessageLoader_GetNewStrbuf(param5, 21); param0->unk_48 = MessageLoader_GetNewStrbuf(param5, 22); - param0->unk_34 = Graphics_GetCellBank(BattleObj_GetNARCIndex(), sub_0207C924(), 1, &(param0->unk_38), 10); + param0->unk_34 = Graphics_GetCellBank(BattleIcon_GetNARCIndex(), sub_0207C924(), 1, &(param0->unk_38), 10); for (v0 = 0; v0 < 2; v0++) { param0->unk_3C[v0] = NULL; @@ -215,10 +215,10 @@ static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0) CellActorResourceData v1; u32 v2, v3, v4; - v2 = BattleObj_GetNARCIndex(); - v3 = BattleObj_TypeIDToNARCMember(2); + v2 = BattleIcon_GetNARCIndex(); + v3 = BattleIcon_TypeIndexToNARCMember(2); - Graphics_LoadPalette(v2, BattleObj_GetPaletteNARCMember(), 1, 10 * 0x20, 0x20 * 3, 10); + Graphics_LoadPalette(v2, BattleIcon_GetPaletteNARCMember(), 1, 10 * 0x20, 0x20 * 3, 10); for (v4 = 0; v4 < 2; v4++) { NNS_G2dInitImageProxy(&v0); @@ -413,25 +413,25 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p VecFx32 v2; u32 v3, v4; - v3 = BattleObj_GetNARCIndex(); - v4 = BattleObj_TypeIDToNARCMember(param1->unk_10->unk_4C.unk_0C); + v3 = BattleIcon_GetNARCIndex(); + v4 = BattleIcon_TypeIndexToNARCMember(param1->unk_10->unk_4C.unk_0C); - Graphics_LoadObjectTiles(BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); v2 = *CellActor_GetPosition(param1->unk_3C[0]); v2.y = (176 + (16 * param3)) << FX32_SHIFT; CellActor_SetPosition(param1->unk_3C[0], &v2); - CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + BattleObj_TypeIDToPaletteIndex(param1->unk_10->unk_4C.unk_0C)); + CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + BattleIcon_TypeIndexToPaletteIndex(param1->unk_10->unk_4C.unk_0C)); CellActor_SetDrawFlag(param1->unk_3C[0], 1); if (param1->unk_10->unk_4C.unk_0C != param1->unk_10->unk_4C.unk_0D) { - Graphics_LoadObjectTiles(BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); v2.x += (36 << FX32_SHIFT); CellActor_SetPosition(param1->unk_3C[1], &v2); - CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + BattleObj_TypeIDToPaletteIndex(param1->unk_10->unk_4C.unk_0D)); + CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + BattleIcon_TypeIndexToPaletteIndex(param1->unk_10->unk_4C.unk_0D)); CellActor_SetDrawFlag(param1->unk_3C[1], 1); } else { CellActor_SetDrawFlag(param1->unk_3C[1], 0); diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index c1f2def516..9ec42c223a 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -78,7 +78,7 @@ #include "unk_02024220.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "unk_0207C908.h" +#include "battle/battle_icon.h" typedef struct { u16 unk_00; @@ -2435,7 +2435,7 @@ static void ov70_0225F95C(SysTask *param0, void *param1) } { - Graphics_LoadPalette(BattleObj_GetNARCIndex(), BattleObj_GetPaletteNARCMember(), 4, 11 * 32, 3 * 32, v0->unk_156); + Graphics_LoadPalette(BattleIcon_GetNARCIndex(), BattleIcon_GetPaletteNARCMember(), 4, 11 * 32, 3 * 32, v0->unk_156); } SysTask_Done(param0); @@ -2634,16 +2634,16 @@ static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA if (v0 != 0) { v2 = ov66_022316E8(v0); - v3 = LoadMemberFromNARC(BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(v2), 1, param3, 1); + v3 = LoadMemberFromNARC(BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v2), 1, param3, 1); NNS_G2dGetUnpackedCharacterData(v3, &v4); Bg_LoadTiles(param2->unk_00, Unk_ov70_0226D5CC[3], v4->pRawData, 4 * 2 * 32, Unk_ov70_0226D590[v1]); Heap_FreeToHeap(v3); Bg_CopyToTilemapRect(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, Unk_ov70_0226D624[v1], 0, 0, 4, 2); - Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + BattleObj_TypeIDToPaletteIndex(v2)); + Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + BattleIcon_TypeIndexToPaletteIndex(v2)); Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov70_0226D5CC[3]); - } + }sub_0201C3C0 } } diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index a05f15ae66..5e68d8652a 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -18,7 +18,7 @@ #include "move_table.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" -#include "unk_0207C908.h" +#include "battle/battle_icon.h" static void ov84_02240424(UnkStruct_ov84_0223B5A0 *param0); static void ov84_022404C0(UnkStruct_ov84_0223B5A0 *param0); @@ -237,13 +237,13 @@ static void ov84_022404C0(UnkStruct_ov84_0223B5A0 *param0) SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_D8, param0->unk_DC, param0->unk_D4, 36, 0, NNS_G2D_VRAM_TYPE_2DSUB, 49406); sub_0200CBDC(param0->unk_D8, param0->unk_DC, 62, 4, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49408); sub_0200CBDC(param0->unk_D8, param0->unk_DC, 16, Item_FileID(0, 1), 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49407); - BattleObj_MakeTypeSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49409); - BattleObj_MakeMoveTypeSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49410); + BattleIcon_MakeTypeSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49409); + BattleIcon_MakeMoveTypeSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49410); sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, v1, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49401); sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 20, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 49402); sub_0200CC9C(param0->unk_D8, param0->unk_DC, 16, Item_FileID(0, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49404); sub_0200CC9C(param0->unk_D8, param0->unk_DC, 62, 10, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 49405); - BattleObj_MakeTypeSpritePalette(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 49406); + BattleIcon_MakeTypeSpritePalette(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 49406); sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 37, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 49403); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_D8, param0->unk_DC, param0->unk_D4, 1, 0, 49401); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_D8, param0->unk_DC, param0->unk_D4, 24, 0, 49402); @@ -448,10 +448,10 @@ void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2) v1 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_TYPE); v2 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_D8, param0->unk_DC, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(v1), 1, 49409); - sub_0200D41C(param0->unk_E0[10], BattleObj_TypeIDToPaletteIndex(v1) + 6); - sub_0200D948(param0->unk_D8, param0->unk_DC, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(v2), 1, 49410); - sub_0200D41C(param0->unk_E0[11], BattleObj_MoveTypeIDToPaletteIndex(v2) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v1), 1, 49409); + sub_0200D41C(param0->unk_E0[10], BattleIcon_TypeIndexToPaletteIndex(v1) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(v2), 1, 49410); + sub_0200D41C(param0->unk_E0[11], BattleIcon_MoveTypeIndexToPaletteIndex(v2) + 6); } void ov84_02240E24(UnkStruct_ov84_0223B5A0 *param0, s16 param1, s16 param2) diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 0f8d8ee11a..51d6bf8e5d 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -42,7 +42,7 @@ #include "unk_0200F174.h" #include "unk_02017728.h" #include "unk_0201DBEC.h" -#include "unk_0207C908.h" +#include "battle/battle_icon.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" @@ -1341,12 +1341,12 @@ static void ov91_021D2110(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47274); for (v0 = 47276; v0 <= 47282; v0++) { - BattleObj_MakeTypeSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, v0); + BattleIcon_MakeTypeSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, v0); } - BattleObj_MakeMoveTypeSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 47275); + BattleIcon_MakeMoveTypeSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 47275); sub_0200CD0C(param0->unk_110, param0->unk_114, param1, 9, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47272); - BattleObj_MakeTypeSpritePalette(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 47273); + BattleIcon_MakeTypeSpritePalette(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 47273); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 4, 0, 47272); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 7, 0, 47273); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 1, 0, 47274); @@ -1366,8 +1366,8 @@ static void ov91_021D22A0(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CONTEST_TYPE) + 18; } - sub_0200D948(param0->unk_110, param0->unk_114, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(v0), 1, 47276 + param2); - sub_0200D41C(param0->unk_118[6 + param2], BattleObj_TypeIDToPaletteIndex(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v0), 1, 47276 + param2); + sub_0200D41C(param0->unk_118[6 + param2], BattleIcon_TypeIndexToPaletteIndex(v0) + 2); } static void ov91_021D2314(UnkStruct_ov91_021D0ED8 *param0) @@ -1444,8 +1444,8 @@ static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_110, param0->unk_114, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(v0), 1, 47275); - sub_0200D41C(param0->unk_118[5], BattleObj_MoveTypeIDToPaletteIndex(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(v0), 1, 47275); + sub_0200D41C(param0->unk_118[5], BattleIcon_MoveTypeIndexToPaletteIndex(v0) + 2); } static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index 7305a1f951..b705724e0a 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -19,7 +19,7 @@ #include "pokemon_summary_app.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" -#include "unk_0207C908.h" +#include "battle/battle_icon.h" #include "unk_020920C0.h" #include "unk_020923C0.h" @@ -429,8 +429,8 @@ void sub_0208F16C(PokemonSummaryApp *param0) static void sub_0208F194(PokemonSummaryApp *param0, u8 param1, u8 param2, u8 param3) { - sub_0200D948(param0->renderer, param0->gfxHandler, BattleObj_GetNARCIndex(), BattleObj_TypeIDToNARCMember(param3), 1, param2); - sub_0200D414(param0->unk_41C[param1], BattleObj_TypeIDToPaletteIndex(param3) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(param3), 1, param2); + sub_0200D414(param0->unk_41C[param1], BattleIcon_TypeIndexToPaletteIndex(param3) + 3); } static void sub_0208F1E4(PokemonSummaryApp *param0, u8 *param1, s16 *param2, s16 *param3) @@ -464,8 +464,8 @@ void sub_0208F294(PokemonSummaryApp *param0, u32 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->renderer, param0->gfxHandler, BattleObj_GetMoveTypeNARCIndex(), BattleObj_MoveTypeIDToNARCMember(v0), 1, 10); - sub_0200D414(param0->unk_41C[18], BattleObj_MoveTypeIDToPaletteIndex(v0) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(v0), 1, 10); + sub_0200D414(param0->unk_41C[18], BattleIcon_MoveTypeIndexToPaletteIndex(v0) + 3); } void sub_0208F2E8(PokemonSummaryApp *param0) From faae0007dd67a06f3a273f3714b3bd2eaebbaa4a Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Tue, 15 Oct 2024 11:18:28 -0500 Subject: [PATCH 08/26] fix header guards in battle_icon.h --- include/battle/battle_icon.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/battle/battle_icon.h b/include/battle/battle_icon.h index 7358a28010..fc1e74ff89 100644 --- a/include/battle/battle_icon.h +++ b/include/battle/battle_icon.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_0207C908_H -#define POKEPLATINUM_UNK_0207C908_H +#ifndef POKEPLATINUM_BATTLE_ICON_H +#define POKEPLATINUM_BATTLE_ICON_H #include @@ -34,4 +34,4 @@ void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); void sub_0207CB00(CellActorData *param0); -#endif // POKEPLATINUM_UNK_0207C908_H +#endif // POKEPLATINUM_BATTLE_ICON_H From ec50ea9625563167445aac30ac97361da5ec6bca Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Tue, 15 Oct 2024 11:24:17 -0500 Subject: [PATCH 09/26] fix missed renaming after rebase onto main --- src/overlay019/ov19_021DA92C.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index b79d7d8c00..5d7af499c0 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -25,7 +25,8 @@ #include "text.h" #include "unk_0200762C.h" #include "unk_0200C440.h" -#include "unk_0207C908.h" +#include "unk_02018340.h" +#include "battle/battle_icon.h" typedef struct { u16 unk_00; From b8cb5dbe5a5cb061de60c4e163c363e5df1fb89e Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Tue, 15 Oct 2024 15:20:34 -0500 Subject: [PATCH 10/26] update PNG files for balls, healthbars, battle platforms --- res/battle/graphic/pl_batt_obj/order.txt | 58 +++++++++--------- .../graphic/pl_batt_obj/palettes/data.json | 6 +- ..._obj_00000071.pal => healthbar_normal.pal} | 0 ..._obj_00000081.pal => healthbar_safari.pal} | 0 .../graphic/pl_batt_obj/palettes/meson.build | 6 +- ..._batt_obj_00000110.pal => party_gauge.pal} | 0 .../pl_batt_obj/sprites/bait_throw.png | Bin 0 -> 316 bytes .../sprites/cherish_ball_throw.png | Bin 0 -> 605 bytes .../graphic/pl_batt_obj/sprites/data.json | 52 ++++++++-------- .../pl_batt_obj/sprites/dive_ball_throw.png | Bin 0 -> 698 bytes .../pl_batt_obj/sprites/dusk_ball_throw.png | Bin 0 -> 773 bytes .../pl_batt_obj/sprites/great_ball_throw.png | Bin 0 -> 672 bytes .../pl_batt_obj/sprites/heal_ball_throw.png | Bin 0 -> 733 bytes .../sprites/healthbar_enemy_slot_1.png | Bin 0 -> 338 bytes .../sprites/healthbar_enemy_slot_2.png | Bin 0 -> 338 bytes .../sprites/healthbar_player_slot_1.png | Bin 0 -> 342 bytes .../sprites/healthbar_player_slot_2.png | Bin 0 -> 342 bytes .../sprites/healthbar_solo_enemy.png | Bin 0 -> 338 bytes .../sprites/healthbar_solo_player.png | Bin 0 -> 379 bytes .../pl_batt_obj/sprites/luxury_ball_throw.png | Bin 0 -> 584 bytes .../pl_batt_obj/sprites/master_ball_throw.png | Bin 0 -> 681 bytes .../graphic/pl_batt_obj/sprites/meson.build | 52 ++++++++-------- .../graphic/pl_batt_obj/sprites/mud_throw.png | Bin 0 -> 413 bytes .../pl_batt_obj/sprites/nest_ball_throw.png | Bin 0 -> 713 bytes .../pl_batt_obj/sprites/net_ball_throw.png | Bin 0 -> 722 bytes .../pl_batt_obj/sprites/park_ball_throw.png | Bin 0 -> 599 bytes .../pl_batt_obj/sprites/party_gauge.png | Bin 0 -> 892 bytes .../sprites/pl_batt_obj_00000127.png | Bin 1066 -> 1020 bytes .../sprites/pl_batt_obj_00000133.png | Bin 609 -> 680 bytes .../sprites/pl_batt_obj_00000135.png | Bin 843 -> 758 bytes .../sprites/pl_batt_obj_00000137.png | Bin 834 -> 726 bytes .../sprites/pl_batt_obj_00000139.png | Bin 987 -> 934 bytes .../sprites/pl_batt_obj_00000141.png | Bin 588 -> 598 bytes .../sprites/pl_batt_obj_00000143.png | Bin 466 -> 476 bytes .../sprites/pl_batt_obj_00000145.png | Bin 541 -> 572 bytes .../sprites/pl_batt_obj_00000147.png | Bin 566 -> 606 bytes .../sprites/pl_batt_obj_00000149.png | Bin 1030 -> 965 bytes .../sprites/pl_batt_obj_00000151.png | Bin 931 -> 838 bytes .../sprites/pl_batt_obj_00000155.png | Bin 663 -> 630 bytes .../sprites/pl_batt_obj_00000157.png | Bin 663 -> 630 bytes .../sprites/pl_batt_obj_00000159.png | Bin 663 -> 630 bytes .../sprites/pl_batt_obj_00000161.png | Bin 687 -> 643 bytes .../sprites/pl_batt_obj_00000163.png | Bin 830 -> 788 bytes .../sprites/pl_batt_obj_00000167.png | Bin 482 -> 494 bytes .../sprites/pl_batt_obj_00000169.png | Bin 482 -> 494 bytes .../sprites/pl_batt_obj_00000171.png | Bin 482 -> 494 bytes .../sprites/pl_batt_obj_00000173.png | Bin 482 -> 494 bytes .../sprites/pl_batt_obj_00000175.png | Bin 830 -> 788 bytes .../sprites/pl_batt_obj_00000188.png | Bin 315 -> 0 bytes .../sprites/pl_batt_obj_00000191.png | Bin 309 -> 0 bytes .../sprites/pl_batt_obj_00000194.png | Bin 315 -> 0 bytes .../sprites/pl_batt_obj_00000197.png | Bin 315 -> 0 bytes .../sprites/pl_batt_obj_00000200.png | Bin 320 -> 0 bytes .../sprites/pl_batt_obj_00000203.png | Bin 320 -> 0 bytes .../sprites/pl_batt_obj_00000205.png | Bin 260 -> 296 bytes .../sprites/pl_batt_obj_00000208.png | Bin 531 -> 529 bytes .../sprites/pl_batt_obj_00000250.png | Bin 105 -> 162 bytes .../sprites/pl_batt_obj_00000253.png | Bin 281 -> 334 bytes .../sprites/pl_batt_obj_00000285.png | Bin 548 -> 0 bytes .../sprites/pl_batt_obj_00000288.png | Bin 683 -> 0 bytes .../sprites/pl_batt_obj_00000291.png | Bin 581 -> 0 bytes .../sprites/pl_batt_obj_00000294.png | Bin 668 -> 0 bytes .../sprites/pl_batt_obj_00000297.png | Bin 726 -> 0 bytes .../sprites/pl_batt_obj_00000300.png | Bin 736 -> 0 bytes .../sprites/pl_batt_obj_00000303.png | Bin 707 -> 0 bytes .../sprites/pl_batt_obj_00000306.png | Bin 717 -> 0 bytes .../sprites/pl_batt_obj_00000309.png | Bin 692 -> 0 bytes .../sprites/pl_batt_obj_00000312.png | Bin 651 -> 0 bytes .../sprites/pl_batt_obj_00000315.png | Bin 571 -> 0 bytes .../sprites/pl_batt_obj_00000318.png | Bin 496 -> 0 bytes .../sprites/pl_batt_obj_00000321.png | Bin 750 -> 0 bytes .../sprites/pl_batt_obj_00000324.png | Bin 780 -> 0 bytes .../sprites/pl_batt_obj_00000327.png | Bin 758 -> 0 bytes .../sprites/pl_batt_obj_00000330.png | Bin 597 -> 0 bytes .../sprites/pl_batt_obj_00000333.png | Bin 574 -> 0 bytes .../sprites/pl_batt_obj_00000336.png | Bin 266 -> 0 bytes .../sprites/pl_batt_obj_00000339.png | Bin 388 -> 0 bytes .../sprites/pl_batt_obj_00000340.png | Bin 901 -> 0 bytes .../pl_batt_obj/sprites/pokeball_throw.png | Bin 0 -> 569 bytes .../sprites/premier_ball_throw.png | Bin 0 -> 529 bytes .../pl_batt_obj/sprites/quick_ball_throw.png | Bin 0 -> 723 bytes .../pl_batt_obj/sprites/repeat_ball_throw.png | Bin 0 -> 695 bytes .../pl_batt_obj/sprites/safari_ball_throw.png | Bin 0 -> 733 bytes .../pl_batt_obj/sprites/timer_ball_throw.png | Bin 0 -> 644 bytes .../pl_batt_obj/sprites/ultra_ball_throw.png | Bin 0 -> 584 bytes src/battle/healthbar.c | 6 +- src/battle/ov16_02268520.c | 17 +++-- src/overlay012/ov12_02235E94.c | 8 ++- 88 files changed, 108 insertions(+), 97 deletions(-) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000071.pal => healthbar_normal.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000081.pal => healthbar_safari.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000110.pal => party_gauge.pal} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/bait_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/cherish_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/dive_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/dusk_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/great_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/heal_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/healthbar_enemy_slot_1.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/healthbar_enemy_slot_2.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/healthbar_player_slot_1.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/healthbar_player_slot_2.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/healthbar_solo_enemy.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/healthbar_solo_player.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/luxury_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/master_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/mud_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/nest_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/net_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/park_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/party_gauge.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000188.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000191.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000194.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000197.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000200.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000203.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000285.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000288.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000291.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000294.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000297.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000300.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000303.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000306.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000309.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000312.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000315.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000318.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000321.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000324.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000327.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000330.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000333.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000336.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000339.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000340.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/pokeball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/premier_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/quick_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/repeat_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/safari_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/timer_ball_throw.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/ultra_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/order.txt index d1ba8e7b44..e342a85dae 100644 --- a/res/battle/graphic/pl_batt_obj/order.txt +++ b/res/battle/graphic/pl_batt_obj/order.txt @@ -69,7 +69,7 @@ pl_batt_obj_00000067.NCLR pl_batt_obj_00000068.NCLR pl_batt_obj_00000069.NCLR pl_batt_obj_00000070.NCLR -pl_batt_obj_00000071.NCLR +healthbar_normal.NCLR pl_batt_obj_00000072.NCLR pl_batt_obj_00000073.NCLR icon_palettes.NCLR @@ -79,7 +79,7 @@ pl_batt_obj_00000077.NCER pl_batt_obj_00000078.NANR pl_batt_obj_00000079.NCLR pl_batt_obj_00000080.NCLR -pl_batt_obj_00000081.NCLR +healthbar_safari.NCLR pl_batt_obj_00000082.NCLR pl_batt_obj_00000083.NCLR pl_batt_obj_00000084.NCLR @@ -108,7 +108,7 @@ pl_batt_obj_00000106.NCLR pl_batt_obj_00000107.NCLR pl_batt_obj_00000108.NCLR pl_batt_obj_00000109.NCLR -pl_batt_obj_00000110.NCLR +party_gauge.NCLR pl_batt_obj_00000111.NCLR pl_batt_obj_00000112.NCGR pl_batt_obj_00000113.NCER @@ -186,22 +186,22 @@ pl_batt_obj_00000184.NCER pl_batt_obj_00000185.NCGR pl_batt_obj_00000186.NANR pl_batt_obj_00000187.NCER -pl_batt_obj_00000188.NCGR +healthbar_solo_enemy.NCGR pl_batt_obj_00000189.NANR pl_batt_obj_00000190.NCER -pl_batt_obj_00000191.NCGR +healthbar_solo_player.NCGR pl_batt_obj_00000192.NANR pl_batt_obj_00000193.NCER -pl_batt_obj_00000194.NCGR +healthbar_enemy_slot_1.NCGR pl_batt_obj_00000195.NANR pl_batt_obj_00000196.NCER -pl_batt_obj_00000197.NCGR +healthbar_enemy_slot_2.NCGR pl_batt_obj_00000198.NANR pl_batt_obj_00000199.NCER -pl_batt_obj_00000200.NCGR +healthbar_player_slot_1.NCGR pl_batt_obj_00000201.NANR pl_batt_obj_00000202.NCER -pl_batt_obj_00000203.NCGR +healthbar_player_slot_2.NCGR pl_batt_obj_00000204.NCER pl_batt_obj_00000205.NCGR pl_batt_obj_00000206.NANR @@ -283,61 +283,61 @@ pl_batt_obj_00000281.NANR pl_batt_obj_00000282.NANR pl_batt_obj_00000283.NANR pl_batt_obj_00000284.NCER -pl_batt_obj_00000285.NCGR +pokeball_throw.NCGR pl_batt_obj_00000286.NANR pl_batt_obj_00000287.NCER -pl_batt_obj_00000288.NCGR +master_ball_throw.NCGR pl_batt_obj_00000289.NANR pl_batt_obj_00000290.NCER -pl_batt_obj_00000291.NCGR +ultra_ball_throw.NCGR pl_batt_obj_00000292.NANR pl_batt_obj_00000293.NCER -pl_batt_obj_00000294.NCGR +great_ball_throw.NCGR pl_batt_obj_00000295.NANR pl_batt_obj_00000296.NCER -pl_batt_obj_00000297.NCGR +safari_ball_throw.NCGR pl_batt_obj_00000298.NANR pl_batt_obj_00000299.NCER -pl_batt_obj_00000300.NCGR +net_ball_throw.NCGR pl_batt_obj_00000301.NANR pl_batt_obj_00000302.NCER -pl_batt_obj_00000303.NCGR +dive_ball_throw.NCGR pl_batt_obj_00000304.NANR pl_batt_obj_00000305.NCER -pl_batt_obj_00000306.NCGR +nest_ball_throw.NCGR pl_batt_obj_00000307.NANR pl_batt_obj_00000308.NCER -pl_batt_obj_00000309.NCGR +repeat_ball_throw.NCGR pl_batt_obj_00000310.NANR pl_batt_obj_00000311.NCER -pl_batt_obj_00000312.NCGR +timer_ball_throw.NCGR pl_batt_obj_00000313.NANR pl_batt_obj_00000314.NCER -pl_batt_obj_00000315.NCGR +luxury_ball_throw.NCGR pl_batt_obj_00000316.NANR pl_batt_obj_00000317.NCER -pl_batt_obj_00000318.NCGR +premier_ball_throw.NCGR pl_batt_obj_00000319.NANR pl_batt_obj_00000320.NCER -pl_batt_obj_00000321.NCGR +quick_ball_throw.NCGR pl_batt_obj_00000322.NANR pl_batt_obj_00000323.NCER -pl_batt_obj_00000324.NCGR +dusk_ball_throw.NCGR pl_batt_obj_00000325.NANR pl_batt_obj_00000326.NCER -pl_batt_obj_00000327.NCGR +heal_ball_throw.NCGR pl_batt_obj_00000328.NANR pl_batt_obj_00000329.NCER -pl_batt_obj_00000330.NCGR +cherish_ball_throw.NCGR pl_batt_obj_00000331.NANR pl_batt_obj_00000332.NCER -pl_batt_obj_00000333.NCGR +park_ball_throw.NCGR pl_batt_obj_00000334.NANR pl_batt_obj_00000335.NCER -pl_batt_obj_00000336.NCGR +bait_throw.NCGR pl_batt_obj_00000337.NANR pl_batt_obj_00000338.NCER -pl_batt_obj_00000339.NCGR -pl_batt_obj_00000340.NCGR +mud_throw.NCGR +party_gauge.NCGR pl_batt_obj_00000341.NCER pl_batt_obj_00000342.NANR \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/palettes/data.json b/res/battle/graphic/pl_batt_obj/palettes/data.json index 2f18b09c22..ea3892aee6 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/data.json +++ b/res/battle/graphic/pl_batt_obj/palettes/data.json @@ -553,7 +553,7 @@ "invert_size": true }, { - "target": "pl_batt_obj_00000071.pal", + "target": "healthbar_normal.pal", "bitdepth": 4, "pad": false, "pcmp": true, @@ -602,7 +602,7 @@ "invert_size": true }, { - "target": "pl_batt_obj_00000081.pal", + "target": "healthbar_safari.pal", "bitdepth": 4, "pad": false, "pcmp": true, @@ -749,7 +749,7 @@ "invert_size": true }, { - "target": "pl_batt_obj_00000110.pal", + "target": "party_gauge.pal", "bitdepth": 4, "pad": false, "pcmp": true, diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000071.pal b/res/battle/graphic/pl_batt_obj/palettes/healthbar_normal.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000071.pal rename to res/battle/graphic/pl_batt_obj/palettes/healthbar_normal.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000081.pal b/res/battle/graphic/pl_batt_obj/palettes/healthbar_safari.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000081.pal rename to res/battle/graphic/pl_batt_obj/palettes/healthbar_safari.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/pl_batt_obj/palettes/meson.build index 40e8174d24..7bfa61045c 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/meson.build +++ b/res/battle/graphic/pl_batt_obj/palettes/meson.build @@ -70,14 +70,14 @@ pl_batt_obj_palettes = files( 'pl_batt_obj_00000068.pal', 'pl_batt_obj_00000069.pal', 'pl_batt_obj_00000070.pal', - 'pl_batt_obj_00000071.pal', + 'healthbar_normal.pal', 'pl_batt_obj_00000072.pal', 'pl_batt_obj_00000073.pal', 'icon_palettes.pal', 'pl_batt_obj_00000075.pal', 'pl_batt_obj_00000079.pal', 'pl_batt_obj_00000080.pal', - 'pl_batt_obj_00000081.pal', + 'healthbar_safari.pal', 'pl_batt_obj_00000082.pal', 'pl_batt_obj_00000083.pal', 'pl_batt_obj_00000084.pal', @@ -106,7 +106,7 @@ pl_batt_obj_palettes = files( 'pl_batt_obj_00000107.pal', 'pl_batt_obj_00000108.pal', 'pl_batt_obj_00000109.pal', - 'pl_batt_obj_00000110.pal', + 'party_gauge.pal', 'pl_batt_obj_00000111.pal' ) diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000110.pal b/res/battle/graphic/pl_batt_obj/palettes/party_gauge.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000110.pal rename to res/battle/graphic/pl_batt_obj/palettes/party_gauge.pal diff --git a/res/battle/graphic/pl_batt_obj/sprites/bait_throw.png b/res/battle/graphic/pl_batt_obj/sprites/bait_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..44c314e00718ee08f63ec5dbaab9b8d913e73aec GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0ziC$g&9cxG5zxlNErn9gt!Lnof8z4^z7>1clY)h z8XBHGy5?KA=H4Y!42!=_nX+U}mgavTDBc284goQWhxY+lj3q&S!3+-1ZlnP@yF6VS zLo9mVPBi2?Y{27c{6uBZ1IOtGM=vODH)Q4CJN3k})1lLH)ct}pc3-RiczoNEdT1?PE%8$Mep9lgMB8~8ZU zOiudhXN7g&oVpH9T|U#t<5aUWzv;Xbn+bJ~6l*5?w>O$Ss z9rJ$Q`gC%xxYA=soy)~O>wkVwl<(O1VaKV@2lurB!M_Oq*_$TWb9F2T0eQ~T)z4*} HQ$iB}Qi6!N literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/cherish_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/cherish_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..c9a2c3025158d9f6f8e3b514f473d11ed81804ff GIT binary patch literal 605 zcmV-j0;2tiP)zlRZlVF&M{hxGxY0C8hXX8o0_;r^20+%YgDv-blf5na z!C3cstgR2ftP4Q_wmZwB8pF=Kv$t6>s7}y_0CW&405uWfK=n}r#yIitEuT@$r;7Q| zkPmI=6Jdh$!4LU-{k>u=1gOHG41s~~#SIMniX0Z$FZrxA=7jVNuJjBr<|9Glhw^zK z&Zlb(L7x$%U^-B}2Mt8#0CUW#2f*;X|1}-!Ab! znlKA*a)0Gulhh7)HgG$%J9EIbcF+ZgUnv5;2w$kcj3sqTf??bybwyb?O1`tj}0aD%#+r$0Bs)`Zk9nKm&zM5573L@+9n)qJ-yb< r`%FD3`>!KNZ|HkDNt$Sw{PXb&#x_5BEsRNX00000NkvXXu0mjfO{@|+ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/data.json b/res/battle/graphic/pl_batt_obj/sprites/data.json index 696f24854a..8ea9ef08d0 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/data.json +++ b/res/battle/graphic/pl_batt_obj/sprites/data.json @@ -330,42 +330,42 @@ "mapping_type": 64 }, { - "target": "pl_batt_obj_00000188.png", + "target": "healthbar_solo_enemy.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "pl_batt_obj_00000191.png", + "target": "healthbar_solo_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "pl_batt_obj_00000194.png", + "target": "healthbar_enemy_slot_1.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "pl_batt_obj_00000197.png", + "target": "healthbar_enemy_slot_2.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "pl_batt_obj_00000200.png", + "target": "healthbar_player_slot_1.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "pl_batt_obj_00000203.png", + "target": "healthbar_player_slot_2.png", "compressed": true, "clobber_size": true, "mapping_type": 64, @@ -661,121 +661,121 @@ "vram": true }, { - "target": "pl_batt_obj_00000285.png", + "target": "pokeball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000288.png", + "target": "master_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000291.png", + "target": "ultra_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000294.png", + "target": "great_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000297.png", + "target": "safari_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000300.png", + "target": "net_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000303.png", + "target": "dive_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000306.png", + "target": "nest_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000309.png", + "target": "repeat_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000312.png", + "target": "timer_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000315.png", + "target": "luxury_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000318.png", + "target": "premier_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000321.png", + "target": "quick_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000324.png", + "target": "dusk_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000327.png", + "target": "heal_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000330.png", + "target": "cherish_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000333.png", + "target": "park_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000336.png", + "target": "bait_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000339.png", + "target": "mud_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000340.png", + "target": "party_gauge.png", "compressed": true, "clobber_size": true, "mapping_type": 64 diff --git a/res/battle/graphic/pl_batt_obj/sprites/dive_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/dive_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..af3227381b70bd70b23a7904847b5d9c05993113 GIT binary patch literal 698 zcmV;r0!96aP)zmBDJ~S^4q&M*F%0tOqHoxu zM=7VL$w`mM;u`hj-98Q*@I07vX|ADqge69R8R4=4RwAH`1wN{0rXO=-D7-|lnJ=>i zn;3n+fq$%L*`EsNGC`PxAcKhtX^ecvgsqe<>1o@)tS1`4hX?l*88hBMSn(v~4az85 zFstXTZI7hKwdi~Gm>I(>Bc;L4tOBJ106w0SdW^7*Yo!FX@d-Qp5#WeDf0wS!zXC@f zJ)(Yxp6{-oUtW~L@ci3-EgA$&*x303qxk|;Ru35I0b!`8K(PCRE;=t!f8@NDd3Vd% ztds^HJOJQZ2mb`01?nk|q887otw~iYtUlQdhkYhJSGRxG^UAoCHkxOm-jT3-uZOgP z17ACqD{BptbP-8behsoX_;Q9G!~2IOZobfzl+9|}KoEd+*cVtT)Y^u;LlKzLlSM^KBJev1!W0|` z6iW9N$j#7`aVV^BhG4LS3kKm9FX%yh3xotJ&@*&qe-t@wA=Eu|eb9%N+4(dxYtL(~ zIJVC|XkuXqFhGc=A*4P*=S#{FSjutr1_S^aJ_Vyi`VBz@t6eHEED@`nC@?Ciws}dw zYNhIdPEptKe$wA8w-xol*FMwNi`4jF3hmQf?dIe&TF?)(&wBvtE&_0+INGxfsh*L~ z4d+LsF(i#!IesEV58f|RA6&X$=bYc^`61Br zbAEGlXMAw|llj>^o}Y*N-q(Y~AmZHLpC1C6pB!%--(uJaUA=2MPi%9c>qFP`={~h25GYW=~4r!Q??p zA84{Wz*o+YH^s8gW4m?id?Z41Af_6A&SJZ?uaX~`HLR4~ ztCc&pc7g5I%b7iJmK(^v+G?oM8rr+%d39sx{paf^)tE$b4x+ez00000NkvXXu0mjf D%;ju= literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/great_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/great_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..7571dc7fe24a3d20dd14924dd12373b71134394a GIT binary patch literal 672 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 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/luxury_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/luxury_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..7d767edaca0fbceb59228703b3c162b55718dbe1 GIT binary patch literal 584 zcmV-O0=NB%P)KMj0GuFF)mmDVl%)3N0N%6!_U6sBDJlQ|%>V!ZhCowN00001 zbW%=J06^y0W&i*I#z{m$R5*>zltF64Fc3w(&;@*c z-q?jg!JFVy6tc|~dWOzuB-u#_rA=XThdDpBfMcKCWOGKzIOtnI{fz z(E)Tl=fm!j54rzLKInPgJ9PKw#X!gRCujG1iUBbn7BVl7fwBlEhG_oc54 ztXw`TfNPh}iNH62nd4ak><)P@%;&+v%<(*0he7kYUw<~Q5M6>axM$%RhVSs4l=7$5 zt%02c6?m**XyHjmQOb{~NpLY#+o4D9k{LXBaU)o;IF2T)#*^5M2o0qdC_<%~Y$>|s zA~F*3E5o}<=HQJQH)^ULy_g#%Fk-ya@AEanR$$C!@Ev@;p@|qHE#}iJ~~_@P)hcH}wHv W&ev5j(k&GL0000R5*>zl)Z1$Kp2N_@Wkd6Rq+_(g|RgYo3T&ERy*SCmCUP3 zS&>rFDN@v)#ANVtTQ>&Qs708y8-En?MRDj`9U`YwK?H+R1$_a($mN$I|GGW6uO zp~V%$mmduc-vHm|27<*k(c(H20hwahr?#XMhM6i7HOYj?yS$GQ9+k&^9Rq@xD>D&s zEPoBXr|$X$w{OY?h95OWLK}v%%af?(&dH~~e!0)-dnwle!!y7kL(FuD)Ew#7$HCwF zq^b2m1cn!Y7dv1&=xyQA`sDCQGLvajE2OV6p^{QrAEo}Y&$w}`k7@dR%EPLalv8ND zR$T8e;h9pG58@-G^^rspJ_i>>r+elYbKw|Y08SY$an#Rv*yp8E%lGgB{ELr2&rO4? z!^arV0^ZII1Oq~cD~5q+7+B*RaKo@XC%Rd}2kG#sus(LbxE{dg2p1psYrOBH#t0u^ z_?4l;(ycR-X;X8g+w&}CY<(uPKl}Vvfs|%+a6G3C=ok;t20j4RDD6YkipoAjYayp< zU8$86`7A7waFXCw@%sah?L}isvfYTgOXI(dGih22B^3^2ZaZz%TX?0lg@|GNm*lA= z7nG2jtCtSyuCzU^pL*!FT4q91K0*Yc_J-lOSngZ9R_%Q>!#E*F*tQN`LOA|eAE|ps zTK69GJwCxKa#_6C4&vDT$OFGCe&Ej5Z+*In1#FcmyF~_EW;_~-M_xYx6BPoB!_bQz P00000NkvXXu0mjf-NHPW literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/meson.build b/res/battle/graphic/pl_batt_obj/sprites/meson.build index 0ca5952d4e..efad889e41 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/meson.build +++ b/res/battle/graphic/pl_batt_obj/sprites/meson.build @@ -54,12 +54,12 @@ pl_batt_obj_sprites = files( 'pl_batt_obj_00000179.png', 'pl_batt_obj_00000182.png', 'pl_batt_obj_00000185.png', - 'pl_batt_obj_00000188.png', - 'pl_batt_obj_00000191.png', - 'pl_batt_obj_00000194.png', - 'pl_batt_obj_00000197.png', - 'pl_batt_obj_00000200.png', - 'pl_batt_obj_00000203.png', + 'healthbar_solo_enemy.png', + 'healthbar_solo_player.png', + 'healthbar_enemy_slot_1.png', + 'healthbar_enemy_slot_2.png', + 'healthbar_player_slot_1.png', + 'healthbar_player_slot_2.png', 'pl_batt_obj_00000205.png', 'pl_batt_obj_00000208.png', 'pl_batt_obj_00000211.png', @@ -103,26 +103,26 @@ pl_batt_obj_sprites = files( 'pl_batt_obj_00000264.png', 'pl_batt_obj_00000265.png', 'pl_batt_obj_00000266.png', - 'pl_batt_obj_00000285.png', - 'pl_batt_obj_00000288.png', - 'pl_batt_obj_00000291.png', - 'pl_batt_obj_00000294.png', - 'pl_batt_obj_00000297.png', - 'pl_batt_obj_00000300.png', - 'pl_batt_obj_00000303.png', - 'pl_batt_obj_00000306.png', - 'pl_batt_obj_00000309.png', - 'pl_batt_obj_00000312.png', - 'pl_batt_obj_00000315.png', - 'pl_batt_obj_00000318.png', - 'pl_batt_obj_00000321.png', - 'pl_batt_obj_00000324.png', - 'pl_batt_obj_00000327.png', - 'pl_batt_obj_00000330.png', - 'pl_batt_obj_00000333.png', - 'pl_batt_obj_00000336.png', - 'pl_batt_obj_00000339.png', - 'pl_batt_obj_00000340.png' + 'pokeball_throw.png', + 'master_ball_throw.png', + 'ultra_ball_throw.png', + 'great_ball_throw.png', + 'safari_ball_throw.png', + 'net_ball_throw.png', + 'dive_ball_throw.png', + 'nest_ball_throw.png', + 'repeat_ball_throw.png', + 'timer_ball_throw.png', + 'luxury_ball_throw.png', + 'premier_ball_throw.png', + 'quick_ball_throw.png', + 'dusk_ball_throw.png', + 'heal_ball_throw.png', + 'cherish_ball_throw.png', + 'park_ball_throw.png', + 'bait_throw.png', + 'mud_throw.png', + 'party_gauge.png' ) pl_batt_obj_sprite_data = files('data.json') diff --git a/res/battle/graphic/pl_batt_obj/sprites/mud_throw.png b/res/battle/graphic/pl_batt_obj/sprites/mud_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..e9c4a72476b19a5f8748134c1334799d31da2a11 GIT binary patch literal 413 zcmV;O0b>4%P)B3~30Sh+|?m4#qPI7aYmW$fMykRle z67`rh=qvCL)&lD;h`M4H=ZK`YME{ua?jj6}r$-)#M|`Gl0@Jlv;yGD=00000NkvXX Hu0mjfj-jy? literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/nest_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/nest_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..ab8d258f96a760d393ee774c50af329065e19f28 GIT binary patch literal 713 zcmV;)0yh1LP)zl+SA0KoEy@*cXsff_0Rt7f75-Z>qEii`2KeCm$M6 zm%{cX452I(A4GN8_i#mF+hcQyk2wg6-la1;yR!2K3ND4rMPD-B{e2$qDhLjWbN75F zEV0#6bQ!?q>X+=c2p@Jv05H=DAx#!Ai2xsBr=~8=6+oB$8_>> zaIDX4Mm`vU%L{~y1F#+J?cv$_oY)+PrvymAI`~#3&GLn?6VLbPw*H^V>&#>!a%`kW6B6&a0-iFsm)!0u<0$Z zei$}K%x65$OJUD*x!ReoM)+}S44!9+q21yA`i<}tV1T~`PGO;jL0KQr>8%gK5%ak< z?!ND&zwd(X`==WV%*al5c;5}oMId~Ef5`6u3lzJ9WqeR-z>RWDr}NBtLOzrD?>>); zac)<$H#c%?#g_j4gQEkD66ORiqBei9gtq1*t4~rw0mB&s42J1fL0p2Tq v;lWS8_h}{s;UuLN{X`aAW-=NE&%FKsesvWlf!0;700000NkvXXu0mjfc&tI1 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/net_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/net_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..71b39bed9f755ed32c259d83723a54bb959802d7 GIT binary patch literal 722 zcmV;@0xkWCP)zl)sAGKoG`N=mpl<2nkhI)TGS$nsi!uA|za0VM9uT zSseTn0sL`9Z7g~0gvGPARieaS(%kid-u`$MCd@6-NK5ZnZSAA8{_)K=+&9(?(6 zj_8qUE+>$f*>AKyr$rD7skIOY=_u7^L|B@2ZWdTp_T`Y|SXE|2lM#d&M&Tr~44#TU z6SJS4Wg*@Q&aPAw#+&)socNkB7hYvs$qq zlA!W6!Tk-m4CSuyYWYoHAefCcAb)RQN!xIIk2B} ze1V_oe0~1jMpRze?NPYS$xaJ*z97OI)umB*BgDGJn@${ArB$g#-3d28(iryB8WXdh zxP5^iso0PFbWl{Tw%C#y*4u~3phO6dQXK)+492nJ1p_UW3tl1zUNf5=2CqDR0!VYzIbT+TGXMYp07*qoM6N<$ Ef}a*mO8@`> literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/park_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/park_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..b38e0cf2e03bf62f5a231471e214fecefa88e0de GIT binary patch literal 599 zcmV-d0;v6oP)|8uke0000000000_@B}~00001 zbW%=J06^y0W&i*I)k#D_R5*>zl+R1UFcimg=sz$JWq8X3@223uOI?4gW7h==UiTlk z(z7}+!;>)39EJV^GKE3@Ip51my6OZ$C+vI4hh;DC(=;h#tt5#XSHeoYjj7RHbr0ln8-@M7D*L$>*luWZUO0c0SpZd{kB| z^igIuGzz*O8^~*f?ihe89N*Cg=$(8ZfAKNK?+e>Mf=%~r*b^VG5s(Iy<=A}& zRRbkub%G0WRdMp+{GWXua9jiQl`+*dlnr`Sb%q)P4j~`NPJEOiA0>oBpEaK12YZYm z{r17`;do|!VBCq%Z|>K=`7|440WLnv(Fe~@syMIgc`j~_O7b~;`PpYHL6X?&V7w9` z(%6Xw0s%B)@(J01;DqJ3e4g{u8B2@%tggxl-m2Nq-mA?;1DZtb7GJlZU%6PgUTL8mNa_CM0lsCvu=VP-es(@jbV8Ua lCp1N`$b#!B8$-6|`2e%OF*C!McZUD~002ovPDHLkV1g?U4%z?! literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/party_gauge.png b/res/battle/graphic/pl_batt_obj/sprites/party_gauge.png new file mode 100644 index 0000000000000000000000000000000000000000..0eb38564cd48ca7c1ba4fe50fc8f21519b37e677 GIT binary patch literal 892 zcmeAS@N?(olHy`uVBq!ia0vp^0t^g{A6S@ytk`#-Qh<~}fKP~Pb@TrvOV(Vydhh@L z|CWY^nn9Wh#R>vbBsjJRFkIzmZtnh{m37b3@@jGS-l(iONlCBnPM84H%UBZR7tG-B z>_!>`1Jf^07srr@*0<9Pi*5x7w3!OWGAz`JZPA<1!K|<)??8vzH{PavftuzA(nnM! zWgGjZlx*4JwNz|rptRcWu-)2cZ#tKr83{NK>A^C(3N%Nl^g(;^LyA~Nv zFw&d1<@=?(vtQ@VYyNQLkgvIj8E!8dE z&v!%3IzG=v@wcVa_0O#~Uuz;idQ5$_qUie1N5wBa*H*4ree3zT&!sD~=55m9R-W;% zEj6>^5|_NxJnla$FLnKyJpY7!`WYQA9x>Jj_9r&~V9oTisqE|a_!;x%$;uXW(RrIc zTzIGYNyqPP&zi!GEtThND_1pDa$PdCS(0;HIds+HQ`>CPpFMMW&7;iduROs2xFHbaYod3B}WM0+2H5E&| zN<((Ou8B>#H(eI$=&fh7<{eCMxG(;(dIm3#|D1=;hc_Sf-*1s!Utc+6<}V4KkDo6X z+g#=sU_T!V~}i literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000127.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000127.png index 03508acefb15cec3ff5630c69c1c1a251f6eaf23..d609f34f1992f482ac244f640ef6979fa386bc80 100644 GIT binary patch literal 1020 zcmV^J|Ii5#<^kFuJhxrYb{43bJr+lv ziRM#O4KY@CwCVC9*3Whks1Jy3f*$<((tnrCY4i+mkM!Z>=1V|z=kt@bjDZ>(l#tfgEh@NGoX3VSAcbQ4?LDC&Zft|T7V}h z;^V(j)@V(cx5lFRJcSHm%hoX5(L`fd$I%=j8OM%I^cn(O@+HQu z09jFF@X!q>t8hz^F&xKC07xMt=e$<{4DGvc3AkdP0{9}Pifu$!dW{$hSqt^V^`W*( z?NvsakusT%(f3`Oc5N`}BWp_!6m3CyOY57sGg%lIQt+%Klqv#6@_^x}!%vN}br6YU zjigk&5~x(Q%^Z*$_4X;H))7L)wsK!wWLov4%XJ?3nz!TIy~qVF(9^QE&3- ziO8Z`;UWT>a`a~ueb9Z#5+p}?+7-ostFq7_FYSl#V}{4wQ8KE49%uA*fEe%)YKR~J z`i^~IXVKePSx)&1kZT)lFQCK25^6nK&A2bn<1n9$IR^)?xW`WFP9RpzJ z0iRXF%NDHlCT0`Y0Tb;y5S{hc+W#u>W%S{5*vcD1wsLw|vF7*tj8cu-|fN%g~ephv~1fUZEy*FkF5Q9e3!j2Zoopl}U&8ZH_pKk&*qF0nScT literal 1066 zcmV+_1l9YAP)W~j5QXauIY592T;~oW6p3CpNMcsKBAHov8RP)dh*!R20<@47bpw0elVnH!iQAX~ z#@&tf;z1TmMHX50k(3R7@>_n(f00W0Rv}%kvRRk>kuh3pby9B{Cv9WOk1+ZRW!+O2 zl+q)PZgB%CD%HNnyJmnd4FhcCMzxj36)%XiNUO0(eRTy5kj92V987W)EifrNNi8O) zcsqZ0O8)nWSW{lNPisCQ-c3ckYX<$=7?p-g+ca3@8^k3hA#zh3g?}T&#r=3)K8o#O z`B>y>`8+%&yi0mw4jcsyig|Y42C*RozRQy+#VaIxD>jG8Bv7u9Nd4(KeLErD$!`bw zvRU`C+H}2qt+Br-forX2OxBdH-$?B~wCicNnxww1s#G?-u{7RR>|=><>!+`+w5}v+ zEtl4edAc42!}umI%nj3;h}=M`C>BX_K?*GBZ^4nK#w5wD!MY8#kUS)BvjmmaNquQi zJtl!AAv<>IBpoD3EmaC@u*AX~8YLel5(Z?%a8#~^M6dJS-o-?3Fx13yb z0x+q9F8s{FffRLtV`1&v(CJ-L7z^*lG`c9(Ie|F@hxzbReiRM29V1FF<8 zl^r4T0S}ty7IsZbqya%{S(5R{uC6fIW(ls@CHUh0%BC;mxCMM2B#mf^yU3Xlbp_AMUd*3=S8-$K zo`TVzOc08%I47p&4phbg@DM=}JQRl-XCdlGJc#01_8Nf%qayg!i1&T(=aQ)Ngg ze1O%ms5cwp-1u7D_+^E+K-`jWl>CB9hq8A{ z8;mP=&gK?V+z_Bf^^WH?8eQOjYnOOWq`}t2H2TV*mj$2+S za3)M+u@@fMF{fpp)Q=?fvp7ECQadTog?4=jNVU k8&3t0^P?ZVTyg&X0iii4nd0YGJ^%m!07*qoM6N<$f`BsbumAu6 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000133.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000133.png index a8799791d80a38ef9c0de62f30875b24e3616b3e..802dfb43491a38776e0106149d4d921f3b5c10a0 100644 GIT binary patch literal 680 zcmV;Z0$2TsP)h;5osVO6p+O6{@AR?v+GNQ^21yh@jlPO?%PKKaIW7{d5fIyTV&4dvL|E* zkbgdN2cRG4eC>XG?FY2J*RtQ~ljG&%*>$1E38Aa;56PIZVbTP=4>^9B=%V$k(lMa) zb&^;Bq|YXkDW$Wi)>%l!_l0jEy0o5x& zX93ki(o)|D%!qT40N#7t1KxYwgX0>_)TeIvQX zbynQL4jie211O<_G3tZ9Rt*X7#y#PPP040kFe==-}eK1rZsrvqWSC z$Skr|s*=V&B=l4F5aGL24|xkk?2YMY;FRxvx10Jn`TQzTi**Jf&#tv4U1KL?ApTPj^40C5BX2dDcc+V+l2@ z4s8Gprogu3Rq``{bO#Y=6m8rY0vdiR{EDUtBAyH^YoJz8YI6^@nMX+Oau)+f>OqYF zR+;`Fd^7c?{2%MLdXVRQNeEU z!BTA=aI;p*ir{BV7%vdVvjvjba)pO=-YerWj^hauo($$5-cxVb5rMmjDt`DMKSQE- zT<9I>PBe!W$mmJ z7_b{aCkq=HeIE7v^Vo)IrIx1Fc4<~Ap?=E#y@GCBSJ92#6r#|4=Z$)r_m9il)IDW4 v?Vg(0TPrp!%)|7wX%++;ewqu;58l7O_{D_rt@v~-00000NkvXXu0mjf((4_O diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000135.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000135.png index afae3db2a26a06c077bb65d2d10d6f9ba75ef52b..5175192733f063398933215184b9a75f614ceb5a 100644 GIT binary patch literal 758 zcmVBxy>o+$L1I!EnL%dF00001 zbW%=J06^y0W&i*JbV)=(R9J=WmpyLVKoEuZ20Bbyr*nWDz`VjjrhE)Tm}MVf#RCwO z>{^B3&Oi!#ofK{Z`2q>-10-T*_J>@Nvu2S-f&EIoZ)Zl<%PHR&fjRT;{5wcN(sOK{(Q9pSguhkeF%j3=b+YJs{_FM+ZwA2((&KV=g$FJe_clj zev&V3@oa?Owm$de5;eRvO`1-uvw!^1>d@Oin!Z|-@oei`w{K!cVZ+l;mzN@TH~#Z; zYWOSkv2n#ocW{HPM1<`}g<@x$HsVeOVTxMBz#sK%z(sdtvVk2y&4gf2WYw#%&K;rWw0BAidUjf`~>VE)6Q;ZiG z0dGXnDtKXmZWDZbX1T${JFcT>riQYVgI1LtOd8O92q6PdAhDG=7Yk3$VupTAg@OwFc-)YrNHC8Q32q*3-E{Y0PPSplz?rqxu>hrVRbBHytN9>>S{_XKyq`ja zX=rm@u|Rt-qY>~4!T?bXJP?12BiVBAIv$Pu10lq&|Iq2n z+>Ri$MRti5831D*p3_16rb!10yC@k1J?WO|jwf(g)lk_T`oN}fi?6tLX&AzH_l2wE zX-ELQUCxS7>yU7Onk9)aLDIhf2ShYwWzNNL-YGt^PGP}iu|7S*aH|*o_IXMHQ29EV oL<*qYO2oI9KF~?oO24=MU-mNly;ea&hyVZp07*qoM6N<$f>k7AZU6uP literal 843 zcmV-R1GM~!P)SOpP+!3u0BP7|wj72VkXPL{ zZX1J$LI6d0@zkH!pQ`S9U8W5_y1@-j1w@-QH4pR>da3y#=tBr`@$DXl^`4G3TUooK zbsZ+u9Xq&#&_PYK-EoH~0y+hEZrggAL=Y=_94bZM6+m#QG;GQ+j=O?Xs5OP2R2I(U zgF1j<<@yWYld*S=HrVg@Alq&S(1BSZkcBo8FubwRLkcvEmTa$5nZ1FAZN5??QjzDu zR0eNb;DBu`7hel3H3`?S8d#D7c9+rpji? zVYMpox@O}8%okzE9v(uxqvMb?2X=PlUo9X|h9n+M1k55-XCd{p3@Mf>au<*E0Hr8E z*n7Tn(M>hy8E3<+A6V!$;b3}aa6>JJBv~-b(~_#7+~E8$O0~{{saEhjZrEDza? zxOAxH5RD2!$JGj+QBhB30F7pH=viZOx92b_<|WW}#oE3b&d5`kl4|>yA48>{0TXu9 zgsa;(Am7V1xb84`sfU#H)gE3ceH#^XxIH}Idaa5#G#)~V%(Ov@H`tf}DY=a!2|nqSJqfBw6wU zo-8t0Du-tt+?e6T{GZ!Hv18NZy~RF-H(j4PkF|L<;@$HwK5dx`LJZ%`1Yb|?zu#i> V^%r*+kxc*q002ovPDHLkV1jc%f~)`l diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000137.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000137.png index 6b3043fc39deeb6cfb07b4540d8cf9246a9b3828..adebce9fc76ac2b187b645efa90ce87558981499 100644 GIT binary patch literal 726 zcmV;{0xA88P)Sn{k}J{00001 zbW%=J06^y0W&i*JR7pfZR9J=Wm(gw8Fc5}s18qqg9l+KE3gu=1I?Zzs%O0Sx`dqXL zgDz0G69n-9Y1BKCk|^p(q7O|`H1`s~|EDh}nRk!@-s)eeE)#c;nON(1Tu__Z!U^3@qvQR98knV12F0Rakm``{G{C}X=^R|8iBhY@c>lH!*I@LK-*xc z%{VHqmc}TcF~uor>al_=OK=JT6x0a?eGW@bv9>q+p>10b6UCyGUe)v@#Y7>ebxpuj zF$HP^lt~5PKTRrt{-hKJNGS}EQdl6Nus}lLfVko{=kafrw+hZIFb>|s6U)uU*>dMN zFjD6P&_l?Ko8W5CF)+;0FcRDSCyxO!D|cGPoYYv z7{F6hpoZhQUU3Te8VriOSWOh5RY>@Q(lnrF3V%=t$S4pxY zQGm=S{@6gi)$dp42L!+=e9;L@>kL9m;uKkt17LPhtlZ{`OJu!IOYr5{At#Hq)$07*qo IM6N<$f|)Nuy#N3J literal 834 zcmV-I1HJr-P)9Q=Zwfv@ieET^;Q$frEx7@mSsQHZB_RocsEVbG zR@r&W+j;wDZCT@yFZhCEfyjC#*U!ufX64!#F?i0N?%Q{{mL@jSG=jhFK33e|MKjxA z(`O0_>BRdnEpAcOS;1RY-Uu*pTqViHKxK1j;?3?P8yP8At@^5KK(y z$dJNTeA1_tPv_(N&~f2;_kO+3=Xa3*4~Wtb_fgQ0L%#F!h^x<#{b|98({sI=^k9c6 z&aQ>m=T4a5-DjZe^V~Zd<%r3hi=dA$lo88Z&MN={iUPEZ~Nx4T^33+_*M&EgC40Ygy?CB_gsLl@k#VfM+masH+Ej&hoY zPR`KTD`TN7?rDA4E|9VkYq?=P%nw)YOjzEW<|bd@<^IT4`2hX?0aXv}eOE3dU;qFB M07*qoM6N<$f>x)O9smFU diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000139.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000139.png index f75dd2d89f360376cab82aeb91191ab64a7c2154..720f8d3164f856e58c5d9089b1eb52dcc7659f0f 100644 GIT binary patch literal 934 zcmV;X16lluP)wgq?D|bbCi2hgK9Z*VjxmVATb~iJ9V1N00001 zbW%=J06^y0W&i*KBuPX;R9J=WmOpD0K^VsO8|-%&2+>vYVT2eI#mc#>A_(3L38Vun zL1(;9|3=<++5qg<>f}6RLWmOJqdx2rvLXcILcA*Ke^Dn`TrjrTmj&R`J`c4l*oKq^ zAjb8LjwOqLZs2RG-!1{zzz^aWIDnrvnCY@$Fzgld;#*vSiWiK5PicJ71pKCyK5JTl zVu6PrXXP${#h)Z2;ck0B{-gC)r@a~#0kph~)>sD(C>4(#z>lrv8e?GalD1tSTM&RS z6d@Jj(XmR)OVRH*1swLNU@z`vKY9wB?&F+ly8^@b}E4` z0P+BVlYS*25debM=>}-3D*;@S%0)qSxa8(^UdctJn!A)M&Zar)q701ax@!eYmIUg{ z;Ed9#^Ta&%NUl~Pg0{v711F<$`VwSN%VdN4k^(B#@2u(lpM*!Cokm_ZuEYk!r}PH+ zoO#)}LO>vp1qRd#b(#di)ybI)z{1MCo|FK+V9-le2tyYL6!r{%?e#h54xm#3_2kti zu7gRHJ)Iq91@1bi+`Q-;%kbUokChqZ0a#Ob*^Rt`X##R@Kb=jb+z2sx!|?9eq`S$7 z>s1R*PM$Yfbhv^EZ$>b-Mos50x-~UfR136sb-vY_P|l`FpjB2YWLqZIM%4s|+?oAq zAmCKQJL_anOTf7*q^&V|Uq|4fsKa+jEnyE%V;FxOoTaxldZ^<7iJwJ6Y{-2fo|_Cp zVqO4j7TA=+KH@Tv#r55C8`7~LAFz!wkRz~-i!zXFW8hl+0}9wxd<>3@p#T5?07*qo IM6N<$g4Y+X5C8xG literal 987 zcmV<110?*3P)8U0jY!8KIgBOpXJ$hr!=$m0+c+ z%mOaiAiA2f7hAt;K75`Rsk}UDJ2rL?camY{uDl=4nsuh_RokKGBeU(}r zs#WF;&8UhYrPK~1U~G|;a_j0d?=o&Br7o9{Zx69jmy^B~2VMv2tu)p6)p1&eoJYpc z0|S^8_13^^AkHwBDyMr`=W@Bk0+fI!OEr1o5o_W9K-!sMn;j)5mnS8Jj>8q|!! zR;C&685-p>-^JW4`0gO+U;OMxrZUreWSu7-BQEt7%neK_4VT**F2}qKQan_O7B&F0 z2I#bhIt-=t5h>r7q=JCg2bYwTq=Sz{N1ekH3bdB=MjuM@H4Ks`l9WCJul;~NrTDxe z1id}Q43paod1{7Zwh(xR=V>WFygJT8i&pYy`)_I+@thtD_c&{ia)*9t{eiyOq&wQ` z0p}Y?GT|Dpie`Ul2s$ysCHVzwL4NgO*v{EoUX>ixD!HE5&Rrk2bL1ZnOIO^=!rBWrQ zrVpqw3ne_Ua;R7t_@qF*IdGeq_UxX#JJ)Q)y2j{_OkM;~kvM{(Va#<7(elWckA`8- zK3K@Sh|6vM<*>$Rj&%tW#Z;^Z0Dj`32w8Xpy8&8>J`&D#`S?uWt_ zkG^NJdQ~#td-g`#2q9e={>Eo$*c=Ij8bkh}h4hvRUkBJHq8L=ZjmQxj{?`NC3Pp?L*o&hPc8Pb&I@$|9&>!$=VSc4fg`L*HlSFa!$ui>wtZ?x zA#B(^&+d}n8Rl8W&tB8!qw(n3Te9s~yK~NG8W^8t)XF9F-yf-rn`c*o5oZ7Z002ov JPDHLkV1g`(-MIh& diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000141.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000141.png index 5c8f8df765a6497d16c2437ca81d264cc5b738cb..e6a817bb08c7e0e045e37e359451e626442a68ed 100644 GIT binary patch literal 598 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3RWp_Z`2{mLJiCzwWMA=gaSVxQeLFoi?~nn{ z@#5w=_s?>=l{K2ZVOqSQ+{KcyLoQ*_6Kmf`D*84#Ox_})|L4DT+32hAB=`T(X>EIA zq(50qOI`JZYr`G?WY!JuTo3H*XMXVO>d6MilARfq-x)O=-XD}@UXyo6@W8A4VQh`B z_g6)rn%)VEiKV{Cq=v$Z`JHu047O1CCxT3HfFc zdX3?zDffjVq_lI&d1!mi`clsDNV7C_DwjjeRKve-IA7_kef@Rv%cSuMHJ~3+*s1=Me*Dgu(@ITU)k(G zjS5fZ#FYd|A7@*Xc3`K0lI?=@K+zSfjCR+W87!Xk2(L2Oy;hAcLn?T;*$H07oYLD0 z91o=*Y<6f7OSEA8=C$n7f|lKrL^;bN5vpQ0D4((5O3^n9ra`2x+>5kaq9X(?^1k+_rMuZbljf- z6`?>>_@^oYa!Xg(1A(;(Q{><`a=Z!Exaih+?-(dC5aA9O7qOKS+=#8%{PNWoA@u6N zf1t7))Tzf*Svqp`RNj&+OBPn9>HR==8<0{K^i)kL`C`uQxf`e(b*LLVAkVd;a55wq zCG&|JX@YXzRSeo!Ne*mEpeN5T`bW6;Jn+k{o?sl#gIn`}o+>QIak+w^49}NiJd{&| zc{O#eVXX0xXmcpnF={j8p5U0E?jA+ep3}eA#`A*YDX~a`pSS=a9 zHbR%r?(xq{``K;6pO=*zPK)A-CLcBn98=5%*~|KBu_vZB6&KxMJ~*Z^7YGmzY~X$N a_g@c70qX%lLEl7Ul<^ zm<8GN-ghvX*_$3=nEl;_$DxufU>;NNCzccXpX)x`Fxsab*v2q#{gOUb;reBpll7l_ za;cn?nNVZFIAz|h>j6sqV)B!jEKE)tFkP70Fz;pQf(tp0s__S%8`W2)i1G*=>HhwW z_wJ)-QRW{MRxM<(k@CI6@>WptgK6=Jns;Z{F)i~nH8^)Oyg{;9e0de?f7WZe=CAtG zDDcSW|3YK^rCLYcG;nWLVxCbJC^)5Uhwov2#r-|U6lG?VO_XGkPd=abT8_EJ`flEd z=Rqyp8H>ESOn^E86*mDe!I8DupnW#9gzynkDWHl-JgL}D{GJ`F&=rez z*kLXpx|Vbpu@bCwP>K}R>gkR{IbbN6<;Rgq2NWEG2O9_mA$U}GmUu$ISrd$kjg5gJ z%t<9$Q?3D;!L%ltl83>9g*0#g1eWDD;8XaPcnAK51}4>jDf~4&0%nPyA#x6Tcv$oo zgS9(sK|pWP6hC^#PY&T8SM46R(tt!SFKX|)$*x|MC>Uq%b=Wbve&I9w$gVR^nFO6)!sdEilBT4Mp^=oa~RHiQj zt&5A@FC)%r=YQQu8f)KxZ9)-O;-nkM<(*;u3G#lxNIriFDdp3Y@4Py~-9q-uf-wox zu^WG%oxTxK&xlmQ3ZtJPHq)$ diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000145.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000145.png index a8f83eda7bd46aba30a5e4ea0ec07579e36b5e57..5fa7f931c1bd70655f11db30286b89a208ae5524 100644 GIT binary patch literal 572 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3Ip3bGIl85~yE-V!QQ@FQ)?%P)#*!evUW~A2xf>cV43r zyOjA(hqhCFn9&_B#vT8zXzvwX#2&K$z3;Cz%*$Rsc08?_P!c?E6@Srz7ghDFUn~{2 zzH1SB@ax~Uyw{&P^rPqN@@ap%)O1>4#iJ^#%<6gCh6f7IGR+Y)ZCG`EwvL@QSR1mIpS{QUCFh-3eZ-%{PW#Sd@*KzbezyC`J-*>EgkK=cROc)k$dde>RcA;EKHt0u_+P%I1csnHw5*BwjUIQfnPgg&e IbxsLQ0ESWZb^rhX literal 541 zcmV+&0^UbcHMQ1w^}o#z(9KD~*|nu?FAnaVT00g=85q;bMxsJj6iJolEeR_gUgf0FQ=X zWHD9-fn-jc8AEdeFao|cvy_>&g+al7kXhO-y;*C{Rf7mX$g;Qv+-SZlWP*NT6S-G{{d_zyz83D6Nr})uN z{PZO<<9s;dwQay7aKW6L4i`+%y6juqi}W06_w{_}s=Eld88Umm<_*neZiXtpCaM`$ zov+m|;KSL^x<=l(6YtKxCk3G%be^8S$JeVK{5QVe)`Moh(FMq1KhVD(Jj9`29_Ur8 zuGRQZYitsnq5cW!7hlzxrX5)Op4PuNTAhu_gYUZbZCt*-48pfawKz7v>fg}%cZF|) zAWh_-5c7mi`JY!tj4omK=LJs*b0>#+Q*KQOF%3plZO>MWp(o z=aznG7{{X2K#7P?Nntc({rcCJSN*Nsbntmy(3+wbh+U+0zPO>LRV&Kaupe5}SO|*Xf-M zW5DR^M6S<{M^0oSuPn|!yWQ~rw#?c zLMO&=f(6S!^31m}2;4IZ@vusO#3&M!+GVs-K(XQa3n;fNN+>ry_MkjA1BCM6NlXjX z^4UU#ez6Y9@2JC2o=F`p_Is@34+Oxr{X?g1b=`re9k9);NC)U$R0K*v?9R#t@oR0% z6KV#o%}(2}pD{B)LG}zmGcaD|2sZ;S8N!ds9Z&dS>y23=99Ncz2HvC^6Y*Xc86vHN s`%qsKO$!M3g3eHr0V?W&2Ov}#-vVw-y|L%^z%Eq` z0E2WL0#ydDih=U zK!@c( z;XVH`Z#?)}y(q(1g}mm(MX!-0e7bsa3a5!)GMT&#lzI!@_hq57@tm1?Q5yg3zMUI) z9-4R5Dmodr*>yBMZv6~$dB8{={t^v7tF($37?r7$QJ%NCA8}7U-`W8!MwYkoZyXQ3KP@Q zNeDAF57}&G#r1P~nv7y+o1KU0sc#m97`n#6ed+!C28JRsO>x(eP5=M^07*qoM6N<$ Ef<}A*D*ylh diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000149.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000149.png index e4def8176e07971fc1681d82e8897e922a023513..7b6d7e0d0add5ec452f3f54b580b9714f31498a4 100644 GIT binary patch literal 965 zcmV;$13LVPP)Xel}z8@vnrbkH(l!+C;^@Y#tPN-BR~njB>|VHL#G^ofeEljHKND%d=^zhs120HQH%?Da z&j6gRuI}aZ6!2QAXZG+H!sKh38?#9t3Xvr^mdg2lGLl=|V|s!sC3nWal=0}wP1xt< zq_;Ot2fg7C2r;zh&o_qzy)KTqhEPvm0ir(k#f$JO)1VFF+?b!Xq8E6zhMMtsU{~g5 ztAx0@5UrJVHNRf>!fVZ5q!cZ6i;c9z8j1!&+KON62`Cz|Z5(5beZ}DtWE4rMMhg_> z8V^SVUo7*wKy)Ofa)1*jzz>zpzVw;Pm5m@>_WNX2!A^<40W`!RvcRV^ zkq=fjs|Zwx9yp;AP+TA*dUF9*V#fsF}0?TEu? zQuhFOv!L$>AwJUYO7!58QqfXwD*6Ggfe*wsna1iHz-LOe6Y>In{ka;VN2U4- zy+is|*OZs&INzH`D@e$Dq&(T(Wf?LN)?^rtDZ{aT8zoDqQL*fsAJYFTsOXDhwiAuh zr~@2R*Lux2(f+l-d;GyLh4-a&Y?#5fjuS}NP?L*RrQ5Y8_NK|(Dj^5e5QbNc$39AmCeA%nb(RR#=Tw5}YdR5?t8Ieo9^ILY;9pSd=kgz@?+a2kZGBMb zxb-2{jGm#4#bUA8574s0N8a#;mx9QukoS8=1*7ub7%}*~y1DyNJo#C``qhcY1|6Xn zQnWOY*2vjXLBg0D)VfV3jR-B;Vkw+nPtdXq$DaBWqt`_^(GUgKQl z1Ls~7?o(2!QsRH|K?@L^R?!3Ag>x(Lx1wd>1N>~&cQhvEz+AjMY`v zKf(qi>nGg}=-V-R58Qjf*VjB$0Ru}M2oI%>rtJ&kxlyi7+_oE>ctWrFDu$klAa2@n z;{EM|Y2S%?!;%4)d)8&d3ZeuKkiuxT)ilgMmf@;M#k30?+3;OGu7V1BfCjbY8;#7p zpNgh4#K94UisZt}kwaD-CyC{glQ_Xa#TMuj{x)c7uVi6Ai&*=+0c`I96ClL%5%kHi zMWUR-7DL2ZVLSjn@j&4q;`|2F(hG5E>Hq{>PH4J5co>V6Tp(<{1Du^i53A)eW57AC z`wL??Dg(HSlpLuO!`0G0o}9xLAj>F@^g+Z*_Y|WDTStACnv-%Ls#7EL?5mL;l}-ZE zG!;vwnw?Q3SI)2{)b5V#Dl0aEdJ6{4BFKX#kw5RN{BV2a9`k6;;jrI-6H*AiaX?)gN~i&iy+RI`YrjfAFaCpd<4`i9TK6-OGS8odt*JH0 zb$v+(0GfJIc6L1ra&f07+~o~GBQp^FH62LC5~PazM)-_)%lPR1U*gy>^ulA*t!qiB zD)2QLH*}Wz*2O56iOynXV^*dldeRpbN?b%d3TW@QV2ge&r)fZD&Z>?>T=5wH2AUD(ozTDo(e(*3s)fA_bp*ELOb zH&~#G3y{YBXX{Qk>b*_aNt`R6GCqyVzoB`-_*nn z$J_lZVQz;F17tDp9I}P>Yx-}aAn(X{&B{{0(H!n-)9&DLT=3cHvW8;**rM~$8}li> zn{U+d&K94BY17)=&HsZ0pLPfi;VgrK;fwq49~g^ixGYOnumAu607*qoM6N<$g738e Ar2qf` diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000151.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000151.png index cdc6d3d0a658b4cef13897d1d391bf68a04874e2..48bd4e27d2d108a6ffb022f934b1b9b211bfa0e0 100644 GIT binary patch literal 838 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 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000157.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000157.png index a88950a40c8933c1729a65ca1009362ebb551926..433f7c510c7ceb46c03cc9df01439d5d6353d7d3 100644 GIT binary patch literal 630 zcmV-+0*U>JP)_&F>L?63d3XoHt}4$}&=N1z5gbL~>eTtn-^&xdK*2$DQxkUQC zIZLp>o2nS-d>}is2h(-i{+>)BAz#4j-stqIGigiGh*>1UDYUTCUW&@ZT#TgARypofQ8p!W~ zNH2%bNuuszN+to`9 zAN0U4{KB~a;A4cxOcW>zkBETuTs_@9jETT#s=RxKaX}?4oH|SZD8L0i<5VU6tqE!k z6hsp|1_Z&n2W+*5UK3~oPE@oS+OL2I7t&xs0957pL~zgbj`TmO-_gJ=RhSZXdR`@c zTvN{LNF84JA?ykE7zs3>hZ13L4-z{PY{!9)0u4e}&XlY#t>4W6%_f|}gTLYNA!f$W zoe1>PAcjW~Alj)P2?|2p_EX-WVO=W%O zlU#J&XLV)`)VGu$1^?O);=JMp?C?Brem{772zZ?gZduIN_|gTuf|8^?ee%#Xl|KjE znOFv7AdNpSF>+}yXIF+jPo$BTDLJ+$^NiKIb*L_W?IpFsasH;tST1eqnxIy)iSpWh zG9KHWY^KtZMSEyZW6AM!8AP2h)&CPz{F}ssgNQ?1@guP8b{xAhqvZ7+ zj>}U@D6Xj=|KLO8gzTL&B{LquZ-FRy8E)X+{C?K&Wgw>q8(y}VzJTm$whLQcw)Iym xji#igtEtlpdv4ed)^y1O0tQ}rgO{`G_X*u(u)4|5iar1U002ovPDHLkV1hVLINtyO diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000159.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000159.png index a88950a40c8933c1729a65ca1009362ebb551926..8c30cf996f5dd07a30fc3feaa573715756e53e94 100644 GIT binary patch literal 630 zcmV-+0*U>JP)>L?63d3XoHt}4$}&=N1z5gbL~>eTtn-^&xdK*2$DQxkUQC zIZLp>o2nS-d>}is2h(-i{+>)BAz#4j-stqIGigiGh*>1UDYUTCUW&@ZT#TgARypofQ8p!W~ zNH2%bNuuszN+to`9 zAN0U4{KB~a;A4cxOcW>zkBETuTs_@9jETT#s=RxKaX}?4oH|SZD8L0i<5VU6tqE!k z6hsp|1_Z&n2W+*5UK3~oPE@oS+OL2I7t&xs0957pL~zgbj`TmO-_gJ=RhSZXdR`@c zTvN{LNF84JA?ykE7zs3>hZ13L4-z{PY{!9)0u4e}&XlY#t>4W6%_f|}gTLYNA!f$W zoe1>PAcjW~Alj)P2?|2p_EX-WVO=W%O zlU#J&XLV)`)VGu$1^?O);=JMp?C?Brem{772zZ?gZduIN_|gTuf|8^?ee%#Xl|KjE znOFv7AdNpSF>+}yXIF+jPo$BTDLJ+$^NiKIb*L_W?IpFsasH;tST1eqnxIy)iSpWh zG9KHWY^KtZMSEyZW6AM!8AP2h)&CPz{F}ssgNQ?1@guP8b{xAhqvZ7+ zj>}U@D6Xj=|KLO8gzTL&B{LquZ-FRy8E)X+{C?K&Wgw>q8(y}VzJTm$whLQcw)Iym xji#igtEtlpdv4ed)^y1O0tQ}rgO{`G_X*u(u)4|5iar1U002ovPDHLkV1hVLINtyO diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000161.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000161.png index 1ce8c646623be9d3a89f51a17c3859834f2a8730..ae2950af35764d55ff744a4e0e13b5f68cd6e0ad 100644 GIT binary patch literal 643 zcmV-}0(||6P)NEO{lYa@^NCczc0s?*#JfA@>yQP}DlmSm& zDu9I~;|4(=H_Q?*XOW#I?#HM_;NzCmTm_cU?Nq%m@~v10R2jRAV(WMxmhsnR4VW9n zC9uLMj4-&uHui0DIY2M{W2su7D#{-;F~$u89MKShLy0koL|Laq6FiGhgN ds1k2Z{{hjRKB0_uVVeK|002ovPDHLkV1nA*DM|nU literal 687 zcmV;g0#N;lP)=mjdu3s{sFu%rnhuB{DH5R@YRr1)Cbc5~5P-d&6b5_lk= zEqJ2`zTgWk1pse7JS;?kqVRwSNYBm7U50)p(3>t-PtdQag|*X%2>=DS!6zKMq`w_O zp@D*Ef>S^c>{`G|YiKorHsC}>rJ;Hc1aKt{)&xLZ_KyVLxZj>Wqy8NY+*XBY;i&yC z>E9jIyi4>Ev>(HX;Dm`l3A)P>PIe=4B*Bgxs3}k))VZf*ac%wX2Iy?UIXw6q9&fUG zo(@BF&qqc;5g@8@9y1h#qH4#v&21!!9c^RRMmt$DPvwk&!6(h z6x#XQZJ{gkg{bb-`x#H&52n;0-CCmd8I;UDu~idMnno#yB4nYGOG$sJs%axiXVh>M zlJQW6Ej^y}d1G52`6M@8w2L~k2F-_*PX+(l57NBs4(#wUaA`k~^4Ir>SF7ljrF@Mq zUBt`ii<{OA$z5H_@Eq`D5aSBSK+5pEq{z9opgNCdZpwIx%a|%yzULmV^?7ryXRf{Q zWY=9&r?0*8Hdm!wuv}WyH9_5|GRdpj(Rgg7^Zslquw+pU<0&mUT`q$tVpIK(p-F#} z1Tcu$r4^rmWw*z%&KH!ty@Px{FbG@oCWN?!bKdiYjO-q&zb-hoxp+=T@7y{W-NCvo zr**E6X9Scm4dBJ59eAU1W*$SDacbNcZ^z9!Eo8UUkALu?aYFV^Pss(3;I}{&oQ8XN zHNT(rYaYoNz@F3gTDx4pyo82HHx{J6M&zX8d$ VvOFLzVyl diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000163.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000163.png index 103a34a5edb81868412cf5650cba93a191f1fd45..1b6f4ca31da041594664ed5c66cffc16eadf88bb 100644 GIT binary patch literal 788 zcmV+v1MB>WP)l$5lCi=1Ky8EEfQ=e3umxm=Dp)B=138-pk`ot@ zM4163F)-L~xt#1g?6LVjhKpx@X@z);eyJNeKt~aK)1%}FJ~#GX7rTa$Pl&uyZ52y{;~ z0${D*5e-*xE&(_;%o{I3h7Ym?WF%t1rz!)?gsZbrKlk+>q#UdXP?+ngQ{dHQ-%sT^ zgdE7#oqTZ;q3G4Q@uJCP!A0eIkLgr?cY^*laX-p$quL3wK=0qhdFjI7?gWz{C^!!H z_WV2h@lQr(1veHr8t?r#maE!1a7&Y*qX;C-1w zIBI>WOaWG`9C7pVm~epMnvdu!1#n$ruYCc$#orST{(%tUwS3VjV_6;`=mD<{i`;?W zMXg9y(@v6{rkw=);I~&LhS-4Qevv4E5SxDnVr78+1qpZh;Z_5CiXKyZ-1T2>)h$$g ST88BS0000P)l_=b-HqT_)cE?5axdN76zuA7H@84eSMgJk*RnGSbI;V#KT33Rgm#9QV{`BAh9l;BOikkL#VAiT&V_k0790BN5D_b_kiD!e^P@q)up76 z$I~ovyF$#X(-i7_Pt*S_s01vaWPs(HPuLX!vq^LO=skYAiOjf3C&CQFfXBdPNlV|( z^Ms3`%opw4Pi@5TNqVl=z{M;X-LF8a7}!x|vto2N=lq@=h7$A}@-l@zuCsZb?T5|v z@hs_E#;tRR58>G+$cFo8^PEX&%-J5xu)<;8rQr_@XKtY3LM3~E2KX=qMm1o}h#h`& z1xR8UBxcv{rjhnE)o*@!%WJ^SNeUUo9p_XbRKzTG$pKDW@;b znsh$YdK#Mwg+?cpenLb&FsyP~)S}^Pd#g`*_nS;*>*Acf@Qrgi?xaEuv8_tDN6eer z5KH1stBKjEMikv`_HRK3=|ZKV>gqkls@oqJzALellde*s4LP99Z+Cv&UP1mp5Tqyh zCuGbM&H10#thoOQ(O(x5*$lOMyHRMh^C?;3w}3nbL$AWTO*hXdLB-WxQCVJ&L5_xwv)zQOfvOoxg8YIR9G=}s1F~~GT^vIqTHjtj zSlDbJz#3o`aNAo;Aw=MSsDze**CmHznF{j)9FkZSIaz*b#};ik{^slc*cpzuHg3*Y zU#&T{R3w9LXu#VfVtWdYNj3K8^ z<g`|q25KhQ7tL5Q(G+)0;JxcbGl?@l?w z@*Hy_6@C;jIo{fy8ykLposoTZf2d%M?{)S~tY1XW$XGlIV^=!Mrt(Slj%dY%Phkfc z4ic^StJwdue%m$I>rdl}O`pHDpWC*?M_@1WxiejJ4sPk*v1xUie3Ch@eajsqsrG_~ zPtB4{^2z7&GUb_DZ10wxNY{AAeZe4Ur;@7JJ=IgzDq-K>Ft99TQ50l!Tfw35cUitO fi_J^H_r?F%|CjvhFW9!a8x&=pu6{1-oD!M<2|>le literal 482 zcmV<80UiE{P)Dvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000169.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000169.png index 384683036cf1d984c2e63515e908877032617b32..5c42869fdd14a57137f0516d5da0c9bc8bab8a1b 100644 GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3o&6cbw-BHC^j!}+=j^UM3M}evtOM?7@862M7NCUESJY5_^B3j>G zKUmmoAix@66>!^IOCdzyfT)C)f!8I6W0?x`0vwW96**acX~!0AIR57A{@59gw>ECh zSzoO=wd1O)p!dn+PR9iotdlol%Go`ocF*4R9M8qYg_)dYehYRK;INL{uB=eEw~QgD zPUX;nXQGA&p42+>82s$)VAP0bobuaY;T`5j-uv&HeLv7I_d$rUKio-|Rk-@aweLs>GsPVvujk%oRr@ik^5&M+yv+MQuGpn9W7Qj>1eq%; z4RXc8%d6P`vwqt(*XvK?iA|rswV&Iz#7AH+^SLu!a}I9l-mz(Qn|zWvuYJoMBdPX+ zhEL6sO!CR+@-pR_TWs%^ok-Vs#(lvcX{VB^*ge%#)+%A&-!QN&Wlo3^0x*HT_p00i_>zopr05IswDvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000171.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000171.png index 384683036cf1d984c2e63515e908877032617b32..6f8afac963359e48c0d3fc716d9b4e99043f2119 100644 GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3R3w9LXu#VfVtWdYNj3K8^ z<g`|q25KhQ7tL5Q(G+)0;JxcbGl?@l?w z@*Hy_6@C;jIo{fy8ykLposoTZf2d%M?{)S~tY1XW$XGlIV^=!Mrt(Slj%dY%Phkfc z4ic^StJwdue%m$I>rdl}O`pHDpWC*?M_@1WxiejJ4sPk*v1xUie3Ch@eajsqsrG_~ zPtB4{^2z7&GUb_DZ10wxNY{AAeZe4Ur;@7JJ=IgzDq-K>Ft99TQ50l!Tfw35cUitO fi_J^H_r?F%|CjvhFW9!a8x&=pu6{1-oD!M<;AO{v literal 482 zcmV<80UiE{P)Dvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000173.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000173.png index 384683036cf1d984c2e63515e908877032617b32..87414786421288dc15c415ba2a52cbcb17ecf216 100644 GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3;I_AxLWsZtQ3)*ruS*WcG8N_pI3%$uau`?WRZQPu* zzFKo?$5mB9?~})!jteeWCvU`*vwKSIp1tcio{NhMGda!t7VId%VI8+!S)p!k8ADE; z%Ao_#L=6u-sdeNr_}SUPs1eUN<+sDaJIs%~_un`BexP6OgAikXxRWlcaP^C8-<@)V zjq4bF>aiaSPL&%Mp6_G4D%%`K~WnfHHOu}fpdsy9LjGFMa@ zf%VPILxqA1Adwt_?9@3MSn g7MquX?~DJj|1bI1U$AX;Hz>+HUHx3vIVCg!0Q76n3IG5A literal 482 zcmV<80UiE{P)Dvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000175.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000175.png index 103a34a5edb81868412cf5650cba93a191f1fd45..1b6f4ca31da041594664ed5c66cffc16eadf88bb 100644 GIT binary patch literal 788 zcmV+v1MB>WP)l$5lCi=1Ky8EEfQ=e3umxm=Dp)B=138-pk`ot@ zM4163F)-L~xt#1g?6LVjhKpx@X@z);eyJNeKt~aK)1%}FJ~#GX7rTa$Pl&uyZ52y{;~ z0${D*5e-*xE&(_;%o{I3h7Ym?WF%t1rz!)?gsZbrKlk+>q#UdXP?+ngQ{dHQ-%sT^ zgdE7#oqTZ;q3G4Q@uJCP!A0eIkLgr?cY^*laX-p$quL3wK=0qhdFjI7?gWz{C^!!H z_WV2h@lQr(1veHr8t?r#maE!1a7&Y*qX;C-1w zIBI>WOaWG`9C7pVm~epMnvdu!1#n$ruYCc$#orST{(%tUwS3VjV_6;`=mD<{i`;?W zMXg9y(@v6{rkw=);I~&LhS-4Qevv4E5SxDnVr78+1qpZh;Z_5CiXKyZ-1T2>)h$$g ST88BS0000P)l_=b-HqT_)cE?5axdN76zuA7H@84eSMgJk*RnGSbI;V#KT33Rgm#9QV{`BAh9l;BOikkL#VAiT&V_k0790BN5D_b_kiD!e^P@q)up76 z$I~ovyF$#X(-i7_Pt*S_s01vaWPs(HPuLX!vq^LO=skYAiOjf3C&CQFfXBdPNlV|( z^Ms3`%opw4Pi@5TNqVl=z{M;X-LF8a7}!x|vto2N=lq@=h7$A}@-l@zuCsZb?T5|v z@hs_E#;tRR58>G+$cFo8^PEX&%-J5xu)<;8rQr_@XKtY3LM3~E2KX=qMm1o}h#h`& z1xR8UBxcv{rjhnE)o*@!%WJ^SNeUUo9p_XbRKzTG$pKDW@;b znsh$YdK#Mwg+?cpenLb&FsyP~)S}^Pd#g`*_nS;*>*Acf@Qrgi?xaEuv8_tDN6eer z5KH1stBKjEMikv`_HRK3=|ZKV>gqkls@oqJzALellde*s4LP99Z+Cv&UP1mp5Tqyh zCuGbM&H10#thoOQ(O(x5*$lOMyHRMh^C?;3w}3nbL$AWTO*hXds{yW^TG<2P`p7!7M?5lL*^HJIdGxr$`hW~|0 z?N`6z1Goyn7mzrVXEirzI0dl$##NSIcW*)kF%0?rjlHhW*C@o&Ltfp*m)NiGoCk}n zjgk-|q8%QI4>7eaq{&9v*Z^|b#=2i9Pi4o)KNU0R0>Bh~-_ N002ovPDHLkV1k}`j*S2S diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000191.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000191.png deleted file mode 100644 index 3f90fa233a641acee4597a139bcca9223f8ec587..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmV-50m}Y~P)^i&u)TmRC4IUqV7eh<(0_&X<%FTr%h6O68Dege4+jrE}2Q zRBd1M^V-P1Ou&{Kc&lH10kxoKwtKsngkqns!uveZ{5LwTxEa{I-dGan00000NkvXX Hu0mjfz%YpG diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000194.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000194.png deleted file mode 100644 index 159bfdd8d778bf67d0d62c8932a51f96fb847059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)s{yW^TG<2P`p7!7M?5lL*^HJIdGxr$`hW~|0 z?N`6z1Goyn7mzrVXEirzI0dl$##NSIcW*)kF%0?rjlHhW*C@o&Ltfp*m)NiGoCk}n zjgk-|q8%QI4>7eaq{&9v*Z^|b#=2i9Pi4o)KNU0R0>Bh~-_ N002ovPDHLkV1k}`j*S2S diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000197.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000197.png deleted file mode 100644 index 159bfdd8d778bf67d0d62c8932a51f96fb847059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)s{yW^TG<2P`p7!7M?5lL*^HJIdGxr$`hW~|0 z?N`6z1Goyn7mzrVXEirzI0dl$##NSIcW*)kF%0?rjlHhW*C@o&Ltfp*m)NiGoCk}n zjgk-|q8%QI4>7eaq{&9v*Z^|b#=2i9Pi4o)KNU0R0>Bh~-_ N002ovPDHLkV1k}`j*S2S diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000200.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000200.png deleted file mode 100644 index 121525218d8d1ad2bb8b1c88d5a839598e74602a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmV-G0l)rq zt2H@2HRMVIEDmj_PeWv&Gg@fSzD_I-$37UFUPgxrbC&x=SC2El3gK7=D&CXjwV{$R zofTuR^ss(xS3Vr}OF@|8u%~bNJ@*C0^)2&^%r*mdI3Ta)K%>;7ugJ23iX50}4a`+R zN^x_|@4frmUb;?NPx|lPCz56eN08nas4pQQVOaR}_f+5! S9M1Uw0000q zt2H@2HRMVIEDmj_PeWv&Gg@fSzD_I-$37UFUPgxrbC&x=SC2El3gK7=D&CXjwV{$R zofTuR^ss(xS3Vr}OF@|8u%~bNJ@*C0^)2&^%r*mdI3Ta)K%>;7ugJ23iX50}4a`+R zN^x_|@4frmUb;?NPx|lPCz56eN08nas4pQQVOaR}_f+5! S9M1Uw0000p{72SIN z5u(8uA}|Q%1UUl070w`N1U#DNTZX;Q?32&zy|*=x-_UQ3PuMZ+(Ps%ET;U9Ymhc~+ uK_#C-DP?OQrBUhRqmxhG^x@L;)#nXTP;s}i4nQ*i0000HJ78xJBr4ggiSGdXmj{7Acwz_nGXN@2 zLOg`?9^Rnj0$%x~2%_(@{mA3EC<3Ur+^Ud)6NG)T323`}6^YLh>#gk*$aab!6W^g* zc{{s=fO9tI(v?U7xmAI4ygeX3`cYc?MmCQo0Zm)&GvYI*PaxBteY)Z8pc4WP^*-Gw z(3-ag{_k7Zy!Zt4TeZ)N&-*@s{C4)qq6nhz+PB3%SrmbP_I&|+oQzsQVF}9s0000< KMNUMnLSTY=vv8LH diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000208.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000208.png index 5b92816e659e92a3b9a2327472cd7affbf555838..7d898f35556eb1f2cf470bd2997636e5bdd45c3c 100644 GIT binary patch literal 529 zcmV+s0`C2ZP)KQaf_OFc771<0=z}B9sV=YtM%JZ6tA^+l{qs+@exrJ zZ^w$KD2~UM?-I2dpSNu!ZO-zKDm(zFzbg#DTC8B?2p;bQG9;KT7D5P;z`7(>BkK?k zXc6}(k2ez~mX?^Bifb%lE$bz~jM|u3<7+3HchiOm2M9>Php6B~n+$qr81p^_oA5SV za7yYyk8|F4#sy^h&a};aG&c6P@rC=ybym5L=enW%9V*n0?jzj;hD#{etx6zO?tP?6siblr zsmlKEgWyXk>+cF9WxzUe>j*BN7&0V?Hyg$nNn}tGovn4SE3~k|$>T??MAs6rsTg1p zYYDniM%2c{in>lTKkCSsNqJ5RHb4b+X`O0Nu(<3(Nqy7Poux5tb03Y3{WRVI*;VV) T2!aq}00000NkvXXu0mjf7tH1! literal 531 zcmV+u0_^>XP)|Lx2o=MSF^fc=p_ZvY$_nmcu9_@agZC7N8L`HiUE%7>RY z+Ew$Wg)`~H3z*ARtuSqTfbM==to1#0sx?Kfcd=H6s}8W%pBK=Z%S-6M5T9S*I*w!9 z#PN{fnj;?S6kI70dkhV~3}-yX;!4_d1AU3AMv2##9-OI#PjL67x6tH%0-Zl_?>2d& z^E@&8IrN$?4=hBYy5d)I51k}4=--5U$&8rMUiY|cB@bw)@88=K^!=-Cf}ijGwK&V~ zJ?J`8`%h>1_70$7L&dKs$Z^-kzZEUu_f2{{tx9 V444{$X)FK$002ovPDHLkV1m+v`rZHl diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000250.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000250.png index 79023292b06991651b75bf170508e7cf69c8ea95..b16cdadb33e89dc91e8ba98abd753eb0487f0442 100644 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUo$~HKkVy>q4+IPh?_PJr z164DY1o;IsI6S+N2IMGsx;Tb#%uKFeXXD}FdHVviUY`g}}6 TW1sf*fvoX#^>bP0l+XkK-CiZJ literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^96+qV0wfsDXLs`gDFaUz#}JO0$pS1)Y>aFQ2NWb6 zg?j!gwk&w?|38ld8yn-aAOGdu6iOVnaw?sk7 zeJuz79cP*mJcIGK(0--|rkMd2Sv5L!c~KHEmT^%r)jWLe{D)6}JkIox>ygl7sgj*B z_b)MRW^?bpBV}v4_5BB}mH&_2*D{!xUUqj{2a+_y^i66iUyi9ZuJYJ@-+M*R;mP?${zCKCh&CZ7_o(jF1o zS)fOz zv2NQi6h-;9T$Fkx0t5LCgB6fH&Tc_@R=IU4ld+3JjWUA9`T-8=y_6*vv5dMvGgyEQ zKtR0jfZ%&lJsyQu0C`Y-T(4DMCVYKR(ONqoeJ6w!!a5?KVBLWDW^)xAvsHbysDO|m zGz7+nu@C}Ed+$_j_D*GO-K$LiLO^Jcu~7dfj((5yLwt$&cz=_r`0o8jzmk46)#?`5 ze1CJw`xp4V;^P=zJ=MYiGk)GbW5;uFuu5u|_#rgXWjg|^1CD-PQoJL6Oz>{Nb@)~E z6IvCtiYCRIQ@@&iLaQa>4MNQ)`|&cwyD!*L+#$3uhJNPM50}CJ+&LvXs2P)Ru^*OO zL2JC+T3&fO>nBvRLag4|AGq@ImK|lVZBRSsXYC3*R>qBLm-zjU{=Evnf__4)idHeC z`2DHhl72!f^oOuNnt8to5drZDrcaQJ7APmbBgC;r?mqbCs-U0j%u-d2Y|+V_e?t>j z;ShiDTdKm~iq^8PG5@AcuH7Mi-tRop8LWB4IZoGdL<&Y^-eN?4(^|zAm>ZFqa6~Rj zr?mb>EZjdA{~J>Ao*I4ZG)=qlus2w4=%;~H92&jS9sD{O4_jwgYMl}Kll)@S!li1u m^K*CbTj0Od?Jt?TSB~GP=ZP7k2`-KR0000z zv1=PK6o=pc)Xi(JG{$R(ZrN_R)>AF#kr1wk?AHr7w>YUtTYe??H8^+snvPoN#l~R(Qrx;Q( zl0zVP*C1(Y!Zc0xUZ!LxVoa{+7J!M!Sz|cfG#eoxmuH$PG1nALD@P*(7^4BzY~@seE(GpL7rSkEb@oR-rFYr423ieZMm9do-K3;74RqUtOs*iYqQ1QZk z{21)8+QRP(|Dp`X z4j%{=Y-Np)pRfBR@3CUghaZe!h5ArjACv8VD_8{BOPF4w3EBY2xd}d-r!?=;VacG= z_$BR>GH#Y?Ci+xN>M<&r``@C73$u)0+^_6YCh$b7dS0Rbttz?F%lPenyW!7Z$VZ&w z_9eGSg%+7k(IS6@A=xRg)*_{Ek+}Uxaf|Hcn!@l8qpSaW^MAo_?pVXwI%LzjIqVUJ zBlZgczd1A)+(RW`t{sP8LcTrQ5 RTJ-<`002ovPDHLkV1jv_Q6K;S diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000291.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000291.png deleted file mode 100644 index 1978f792741fc1b76c02dfe27cb87cbc2c32fa77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 581 zcmV-L0=oT)P)z z!A|2a6h-~D-ei=m#g`y65_|dqk{sfQ*mD6sga#wH{Rf={&IVXe_!a8EgD$a;*1`bau4Q8)$Tem={5E=sG z!+H?{Iv(!L!KrHOvuXkm0z!kV7v*ylznXr?Yj%il5TD|&N~JgN&-|j4ctrJ7>qnsZ zgWJ4+hTjVgr|{yb78Y#ydH;lOJOu}**)70>mIxzS)m2Ly`miC?r(d^ux>G2XPQ8YG3oio4D7g#`DL1octoy zVkGR_+K-Okkej%ui81suj5lX~bE9tQM>R78q2{xGX!e)5t2g^w`VrZWxYggzTKd^V z?b7_veWxt_jJbM#@BAL9W@lXVvooM(x8~QmKB0H^B8iCV@o3bKrU|$JWWZgNX^+eR}%a?zKa(SjkPEpe| zuETEd*w9Y{<#K3brK4L+%QSR_N3APDf0JJtM!2*?yu5d3zZ$<=@o>%F{o(ir0LiM4 TJwS|100000NkvXXu0mjfG36cW diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000294.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000294.png deleted file mode 100644 index 6547dd1e480b49086b7991420f2de9e1471d3d13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 668 zcmV;N0%QG&P)z zF>e|{5Jva+r9TOrew%Y>*9gfSGL8#Z2v$h$A+*oL#0lFD1x|x!Tecn{W0w zKmlZ2xG)k=TI+V^d2VJ99v^|P0nAYN*U?D$_7~vxWGF~S8qivV=L|y|hQ0>6HO5yU z(iVRM=vfa0&D2!*w2=ZX7M`5r@UBXP026&+j5fT4MRF;rT$zQ?rg6 zXMn$BtGnQ*cKmdgC#rj4VRcpcy;VP+51!xK_55}@Tfe?Lzmcs*w?v(@UE1z zy=ogl6h`lJxHP0ly0A9E2vWowgh{K#81>t1P$R=){1__{CW7>Gszi!}JX%ke#_PPm zdej62!O_0J6qE0cej+O}QVJIq=%9g_JBPb_Kas_U@RfjUlQkC?WIH>Imu)hMcR)t$ zSIF&?3?UhTveXQ!_*HqwI8-DOPm%c*RLP8jA=$K+0y;ubt+~9OUxWgK4v_?@a=NH*!Ec|vqll}S(<-ei4`Sd;_^E=B{{RRT1@}vY5K=1ocMOpR(ez(|c z^lip!dWJQAS$2aHH(J5UscqwjqJ~|Db6_>YU%yPc@``c2K&Ga68h$DJNw(^f@6^MI7-MDo9)$XJz{K%t|Ac7Z#D`eH>fFw;!H?(T1xB~K z%XssgOv69I{ND4M&M(i0@Og9_4oA2x0L+j^r6L=sIk*zTz z@+u6;jDe+yY;r^jJhw=4MAkZr!tjn!Q~!PWCb-KjYgki+Y+B5l-NUlSej(s4hlZuF zfL|f!%?=|h!!TlmkK|`YW4NTF;^Ew#`ql8ig~zrz z!D<^Z5QgXVf?=Pcs0X*cimjDj|KaXlkwupmTtXd(_=3i`DAu+)#wFuQ2$YE z$0Sbb9&(7mKPFI>N2 zQSojvCtbKL8Xfgpt^E>{%=h2p5U=bG&w#P+9M?}#;~yH_e}_qK%npCr@AXJEfN2f{d-H!q+B|BG;02rdeX-|w zoU@-mq|JqZmEhYVHEXJd=;Kj{K8JWGzp!rMf*1Gtz5D1l!2cFr+Zp%n2amr8@}-n$ Sn}2Em0000z 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 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000315.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000315.png deleted file mode 100644 index 467ce7d7cc7e55c491c5f5b174117590c2f1b155..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 571 zcmV-B0>u4^P)z zO={yn5QX~+xk9#voI-eG2n+rv87wcRKz)}G31$R!fnF%@b=%VX z$d0|pA_hMsP`~>0y1Ha~{0#mA5oh}F-I~6(8`Ep+Oijd`VDaS(npEB@S^0joXRwh(s%aZ@` zIfd1-hV#6Dvug_Sp=7A}Mp9#i5Gcw7A6^S9I`IICXjkzi$aDFTPp9(xI($0<)fxFT zqrINsTfjMkOBPK(nUBp7b~*DSm5^#OKQx2p3lA!x>2>+t!1){a8djU=KOtW(M9XQf z<+1KUm1KMV4f18+J++@kl>~Dy zy>7xV6h`mUnjsP+uA0!bEagGkoeWOuks+olm4X>5QYkOs!Tqku4=RMxR;>yWN3oRL zd;B@Mu_{KQm-{N$&Uc5HPXT`GI}}|W_iNx#z-9Y>S>xA2Y3@sFuH219Gaml9JI_wFS6ZR88XbufexbU=9b=V@pQizBle!*|R2J-=2^7)Cm mAw&;;y&>kt@SM4E;dlqhHMPILu>$S@0000y z&1%~~6ov0A7`lk*&g#Y(vXHz9hC=G0AOd*|Z47>gLKn@ljW&ZJ?@-y8m`OShV(20@ z0aMTm%wl@Z$Z`}rKklN78hjXm=H5@|o*D7@3H}CRF2uW|FXCrGPCtv&Du?7s!h43I z4JEgfGcTzMqOGVD;@0_@xa0nf_@capL<1B}5|)qZMkp{#udFPGcUDGa&&xE1BngVf zrf%e$68PFE)p`rG7RoQix8kl8x~)``FK2<7La8Oumf3`lYw#(wbX}E->-1Cc)1PcgvE3Ds~is@ z>~XZc1M=5y`ZwczbEYYOl)rp;zGsxwR#GLl%N-RTt=ssQJj!24Y|R&K{X2ZVA%E(% z{NX{Zr|F{(e5qw-tv1?i!@uaS6KbtqUo%8t%SlEFmX$>mN>IU+JC{ zL^CT~OT}?{gOi*LIAlUjqfPmczZ5Ue)VYymdDoL^f|HzZ$nn5#%0JEbyaW$Un5L2V z>q}md23O?dekATkmWjKEgfG9O2Xm%rc>;Gw1~M-fR9i}xk(T}>x>aExx`s^S~tIG4Y8dU)?@ gI;mgD)&D7f0Pm~lW`eTEKmY&$07*qoM6N<$f?y z!D<>&6o&6B3|L4AWaonjBW)0b21k&9I|o7}tAM*ec2f$4K!sic_Z@^uXt~8%l_E&r zA)vN{<-WjOO#lC0O-!PRU3AeveiUZT`TWm+jwtXa@UJ0yBnmqoi(=TN%#MXs#!#ei z&uNO(6q!NPyb#JjjG1IYQtZ3DFKm(@iXu%Yr7DUBA1oB8y2l!{^97bmkH=%$R9d%m9Y@0|XbD_Td% z*^Ock_(sS#(jcd-=QBCc@-P$1^VPQCbN+F(p6_%mpP#RCeDkM#Erh{d5AM*c+pl=;Q| z;6{bUjaEM7E3MAgeBv9Juk@qU3%<%0^Bws49@9UXc)4l5dvwy7$ocNN{9Tgoa-V#` zGx^&^{%&`{7X(}9?_ilfe_uvG8$Opm?ynEw{62q7Y=awrP05 z`;us$g3Ww)Vo|_;9eGG=uq0{Sn8(lQjF4ALNMj7I#YFRADX!bHFVfc$4pb$qE|1J0 zSd{nsF{z1`oF0jCbXF6Mu$1{D6QHy&zn*WiIE%-$xC8nLkFN$nZPpQXh>fx{i2LQv zgJzv4vd$B!F}&t!nu$1`Q%g0o;7MdL6fKe0000< KMNUMnLSTZs7kIw_ diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000327.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000327.png deleted file mode 100644 index 363456e38dadf5536f2bde969257b688de4e730f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 758 zcmVz zv1;2;6o$_$IIbzBTcHKfDafG|Pesa*F-@FPyArJ^foET4?oV9L95PgbPI8G4s zPQe+x_7$=e@&b3b{m-=|3&&2Hp+gP+k<9fupZ@#bBeM7qz8NGNkTu80WXID9*->{w zMztBjOm1B!!kGwbOR?&UbZ{Fhjo%=q!G~nlpRSQj-wh$5hoa3;$~TKfC~(Hxn!Lk0 zBFlpocGWNO@7%6Ar{l*d5xY8~lTEBH3#iTsT=(EO%| zkD?+r^DBHD?`Vp5d`*E5G=C;2>Oa6I{*A6hx^18-Cu*sG9Cvd6Vg)p%93K{gPZfM( zoe7b{Re`7afjs|(RSl#6l|Csxw zxNdEoC!!($_`VCEk;~t%%iplVmnQ;_hnvqOe|XAdQ-;EFzETVdmYH=3BSaaQz2*8aIEHV9?Ju*L|h|CS7G9txdPa@!Dkkf;)rYQO?a-bjG{2_78 ztzcMO3h8ZO_Bn3Pg)f4*=D@Io3rn|IVRp2S+bG%>iT(lKDZ~f=;2R}2|Vsx#`NdN!<07*qoM6N<$f{MU#A^-pY diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000330.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000330.png deleted file mode 100644 index 52667e285f442c76e02abaf165aef70398632312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 597 zcmV-b0;>IqP)z zF>BjE6vy9Z(a@pv zwUyw!hpm8574ZvuO03?-2gIZ1oY?L9#p0LS7D%U_F49{39Q+ztkvXxVX09;cXKjiZXQm=! zP{8c(x0~PWC%<{fFAe#%Jwko}pX}>*_F#U^zWa+v*fp4;oWm|C1wR=L`K1WkIqa`e zSfH!_z)xE4<0mayjT~mIMJ;hR=Z8C>HWJDDH}ZQ5Y!vZaq1)OG`#Dil4sfc0pBuq% zBrB@#-rsaB`ofmTNIU;=G8BLEtTT8Og5)f)=5l!R8PAQLw>yVYbl=K*StsWtHi2rIXe!K3hsl+&3P2xl=VE7H0ZOsab~ zzYC$c7Y&c0n7S_P1uhqzUuX^uPZ;3ADY~%r7?)a){a^A+#2^v1WzwIk-E*%s{z>!% jFyXzCw6~x8{~SL6-5WY%1SXLW00000NkvXXu0mjfa3>r6 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000333.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000333.png deleted file mode 100644 index cfe109b8464759d1bda7df0e3686734f62ea07fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmV-E0>S->P)z z!D<^Z5QgXB1cAi#1q?YV1w&533dHSsvHJ$O1{UP2vD4MMx)dB($I-1jRDpbB}^^ZiBSWFq~mH%cxp7yFnPa zibAeFQY_9G`U;_1bG&XEA)s`3maZ?ymiohKq+1PWjZkfxM)6l{{Z7~q$t8LOB_nq?^C`&@TfuF$QaKjbF4TIHo_+c4W90SKm?GQgv@87J!rkm*a36tV2 zJAXw*eu)bTr@tBELf7&2{yosbf0*G(Qsip?y({Gz{NCb!ON|e?cV9Vv0#IE@siw>$5dZ)H M07*qoM6N<$f(hOgIRF3v diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000336.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000336.png deleted file mode 100644 index 0f9506db720b718ec1598768c9e6c6be19e3ab33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmV+l0rmcgP)un;%y{k5K;;KbEupBrR%L*!->mev_W} zXVr;8&Ch@3Cx`oG#vr?2;$DCA>c`#wdVckfT7MzHZ}R>79T*rG82Br^0F~_Lj%Xz$ QdjJ3c07*qoM6N<$f?i;9p8x;= diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000339.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000339.png deleted file mode 100644 index 7431212e565c06d5b1210047f6f658299d9f1ad0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmV-~0ek+5P)IhzK z@9(1|P>D5F;zmTk>~${nx#kj~)HUkX85i37>!y*W+D(;`bx7LptK0f3?xt6ormrOL zQJ-(-EmC)`EskSti>tASiz*qW9>uB^HmUou2#J(DOkwFlxvEo5U-@Nkp>0000cXWFC0`kFSAv@>00d6mv!-}lg~%J^yFW-dcVfnuR$+u&Tn*j@lqrF zZ{xYE$?}Yv6S>s(dZxhmA`Z|{P~5mTlgm9+6)(v;csL_Fk7@`@weEiO|k z+5AuYu6Xu(`iHMA`Fb@)Z2sQMx>u~2aEs^mh3di+*M;{vvdV|9a8I?KzapUjl-`eN z&-U%vX}oXW%buzIu?hB7r9U2sTeZs>8f2Z$E7xYCkJaoD%z?^lWWqaeB?PpLaiRk>WaL#za|7ia=#`)@6zVcQ4z7Mk>@aTV0y1MXxRFL7fMzen^HE*|RZ1?-QXXE)N z9<8}6wpergn^|*K$j<+V)5FQe6;bJTI=i@5o(0-G%^4{8hs$mi&;w<5feYoP#(vm( z25hzOWl3%M-3RI_aC#$q`iIWA9|bn@3+qkfZ?wf7R-CV2GndQm_n&zmL_gm)1O|x| zI7sYH|9SWG2J5%QMRsi$Zs&Zc`NzGbvcaI{_kZb*Q*QH?`%6ERKJ~d$?#;jY>p_N- zpMQSS|6y&|qCIt=YvwKWIrh1db!uqSgn1{oYd+*|>3?4jii)&PUWb5wnD^t~_OcV= z9Pv>H-9=vo-aMzSb!G7;?tNQ#>gT`f$xpUQewr+PqkjRP{2!<17o3mz?oyNg8$R7% z#{2!HqhCJntXVB&x9`8L?D^w1wzK$iobz8y&==jer0Klfe)XE8f7IM=vfjUNXS#X$ zvGkeuZ9(A?a?YL4_RloeNkVTw@iCRVvWf;}JE>^78dP5NYpn{gd#J4yv6_4Dnkna7 zbPtKGy`dKMaP?KDYKQe(bQX-b(c5&mU>isFZ)6M`^x{??|(`@e12lh zn##o&|Jokvx8A(z+1}fr7EIv2jW@dkuhstaj`VZPzQk Zm*+7#vV_C(L>(x9dAj=G`P)zl)Y|)Fcd}^cmYUNg%RqdV?vj1)Z8H0OZG_A%4D%^j_rC2?p;Dy-kUZ&SM{h6G`{OXZ2TE(~v7m=PQ_ zL&Y;=?mP@9Eqg&5UlD|n@rKd#u-vh6qsIFfgz17V literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/premier_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/premier_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..674a34fafb23346a99a7bee0fcf3db0875e320bb GIT binary patch literal 529 zcmV+s0`C2ZP)zl(A03Fc5|_d}&q#q`o*`kZv`5pD_A2nuOU zshZN+N8rysznIU(`e^dWa9d631NpQ{wd~Wj=kn=krTbG_0NeZdSo>e|d9v*DhFRoO zQmdb8oD3?_1ndKF_VcdELj_AHNnRr#0O#ow`0OAzHEqe zqmXlB05|d3g(v4b$zl+SA0KoE!bpchyuhT!H<@PoMaqF`j@9SmYGoAl@$ z0(l36FM14v5tLC41(S`$v}DfJvJ}_o5H2*YkPi=Vh$5gmBNP zG!z^jr0OF?1WSU|V+II;1eJm8BPf83pre*iHbHpV414)C9*g;4&bN3fF4yCNAket_ zrbJnY)1t4e#%HgrPyI6j<5LfNq`|`3pqD1NGl69U9jx93T%@ssOu;=uwaHXo;jyu< zD!pbc2neiCRlULI7g(RCgUaZ5NRSY$_6icyA1Q5rJp3T|hENg|mwbxy4L*Ke^@BA1 z2??yvR9YXEsm#vHgUpm9*hv71jbdU0kkc2%LTh2>RSHp9AAIv3K412xQEd&ZF8$yZ zlphYjO@20<=QclD+x(P8S^P_X4$AsG)nMioeVy?x<#~eT7nGll&rf5xBe*v{7$oCE zW7@L6&rg%*^ZrCMFY-|o63o^Snjq~6PJO5?XZ?And99{C&-iaT&CjtvcmrI_Pv_HR zpFdV0ggG7DOl3lJix-jU&uu+5|E5?%z5%&qvC%*fUAhVug2gX<*yGn*w9xCZCXblz zA0sv{i*>(U;=DEf`Rq*e+``S>&_XB%b|<;ATfyfvwQz;d{K`8|BkcwY>K0Xhx8SnVB$5x z?@nW^rTdTvCOoj#=#M_Ljs^bFbwirF(15Ec8$#% literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/repeat_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/repeat_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..68876a77cf454cc22e59df440fb1504f94584cdb GIT binary patch literal 695 zcmV;o0!aOdP)zl)r1+KorL{+&^$m2@#&GYVnw;OE*`#7|G45Oj-iY z5&T~Sj1l!DSIcP*qSj`}V9?qnA%9fgyLTt6X-a8IA#b@4Jl}mkx*v9&UI{_t#Y1(E zBTJteIRTia4^=%!SSW?S*lp7=TRg|aR2*l1$e_gSrdvdAZ&BJ^GKx%yfrACDpZD1bTzc#m)f-~pXsYKZCN zW8k$uK|nqjfzu;|4?WNw>>c3E`h@7?Pjn`w#+bgu1#=;C^2zi6?9(0G?IsAuConDM zn=wa?IOjYkA1Lx^+kf)moP4;H9DPn#Qr;ZlHI`6#jaLXa06DfWHO|{sYsBl_aIbyV zobSnJH~b5qOG!RyD$V->(D(WJQUjB^`tNInFHZY>QR*A{?1toH#Tbf_59hD(G4K66 zv+q6o?R)QhV%&r!OcR)n3x#+(bf1Or$Y(J6v(GQZgwV6u`C~KJ8=UZdPCu5S{5lm%dK!ntp zyCuOVr3hSr?kgKhGiic+ebi8;Fpv~e>M8ZkLUGX23+l2F4&%xi@@})tn3z^#eH1{q zAVg4Gag)HikF}AiG^A8%LA~I^My|;UM@9oS*8Io<{IA%Fy`w+)6axZ2@To;dq`_o* douTu_>jx#C04iG;4UPZ+002ovPDHLkV1mA8NCyA_ literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/safari_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/safari_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..5336b255047ea5f5af81b368ef228114bc543d99 GIT binary patch literal 733 zcmV<30wVp1P)zl)r1+KorL{+&>^U6bxOg>K|y7rJEvML|m(#D(?mN zQEdGgAsobusg~PK2LI0{(+6wLh4m5QKl`)` zceEcxI|D2mEIB_Rjlog~VSMyg;e7PJ`EYK1H~=S~y&7PWV)_69MhGVwVS*rVtAC)> zL#>54qW(-BF!b7{Kh1vrUVz!pgWCdX^QTuoU_$3>QeVL2g3cHED1u{vu{uN0$1pyd zVp)#en9?a|fnDA#olm{o!lx+Ig38|zkWc=8sOaD`>;WhhThMggr`kdO=@iOUOqsRq zLc(tZxBHp%!1{E0fA_gJ80V&%9SmVkbU-%}`IL7UJ0YDayno1JebA7?cr)V9)-=z;nOu)74*Ij)&Pln`z-+B$K4?Z0;W1w}hJM>D_w2i=e&Zt%+7DucotC~!@Y|nlB4y=B z%BlhRfDh|+T~^X_8rWF(QUiFeG=&>WzxJ7REYMP!VVB5&%M4mW?~#vR>ADl^&~oW9 P00000NkvXXu0mjfBHvhl literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/timer_ball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/timer_ball_throw.png new file mode 100644 index 0000000000000000000000000000000000000000..83aacca0984b9c54ad814f8fd31d5b548761615a GIT binary patch literal 644 zcmV-~0(zl)-A_Fc5}w&j>MiJPcm9#&c-zA6QYak?{$MKqUnF@Ji&@omd=8{!{I8BmfdVpXQROE_$ zC!OwPZ1L>N7 z>#y>e4(>5$9*O)H$8E}?mO+n;v z>yEXQ`T&AY(|>AzhUl{=TEXX@q%<8M>E;>mAaFVmt+%qw6^FG8_owOO{n?)4d2LVs z;gi1iy{DD>cu%B0`JiCVUDP;tS(m8~XC1@GVHD{70pLXrwGbIeC@LN{Am~zluJ&;Fbsxgkqfv~NL{w%0#G*Wnv8{%0}Oj4h&T!A zwxXNd7CUy@0>eW*B)p&><4ON-+@!nRrV#ad6Em5^A;y8gG1LtA01O5q0Sqsob{X1n zZ^w$3`N_|XrB%M0L&sn`sv$>o9li`bQj5<7>NC6S6ApWueZu5zlYO4%aK-5-J=HnE z8N&rZM|8odp3}ug;k!P4FFqW>%l8bI8^|5*t?+MsJp0%oXG$t^I)fPzNAW@YW1r>0 zVb%974w9K~iLCLvJ`;#f0s!_o=WTql-OsK7J_0;spQ3>ymH1GJk9_b&pJhKM(DRi* z&)4+c`Erq}&OR}!k81pQJ|FnpMD?K(AB8-h`sjQ-r^|k(tt38G`?=4XGKhJ#xsLHp z#G?8fWGwFV7U1-@UIFP3{ewF%FCxpQirzo$u^u!cJ8UCfkEUFcn#5TkJnRJ=dg;`S zw2VvgWz!HWzY+?Cs6qCz7MM{XOip?!)di+iE8kE;3m8bn5SC%-HE1gopG2_SkRqg= zV0dM?Od`!nDa{4a5g*ewn&n&7puy^w3ebC{EZjW$)n}>%pt91EN0dP`yTx$#&+8eS W+0Q<*-!*vv0000resources[0], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, template->resources[0]); - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, 71, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_MAIN_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, HEALTHBAR_MAIN_PALETTE_NCLR, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_MAIN_PALETTE_RESID); SpriteRenderer_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[2], TRUE, template->resources[2]); SpriteRenderer_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[3], TRUE, template->resources[3]); - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, 71, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_EFFECTS_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, HEALTHBAR_MAIN_PALETTE_NCLR, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_EFFECTS_PALETTE_RESID); if (healthbarType == HEALTHBAR_TYPE_SAFARI_ZONE || healthbarType == HEALTHBAR_TYPE_PAL_PARK) { - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, 81, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_SAFARI_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, HEALTHBAR_SAFARI_PALETTE_NCLR, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_SAFARI_PALETTE_RESID); } } diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 40838eac57..710e07b89c 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -43,7 +43,10 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { }, }; -__attribute__((aligned(4))) static const u16 Unk_ov16_0227009C[] = { +/* +* Maps a battle platform ID to the NARC member in pl_batt_obj containing a sprite for it. +*/ +__attribute__((aligned(4))) static const u16 ov16_BattlePlatformIndexToNARCMember[] = { 0x87, 0x91, 0x7F, @@ -97,7 +100,11 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_0227006C[] = { 0xB0 }; -__attribute__((aligned(4))) static const u16 Unk_ov16_02270134[][3] = { +/* +* Maps a battle platform ID to the NARC member in pl_batt_obj containing a palette for it. +* Each battle platform has 3 palette options for different times of day (?) +*/ +__attribute__((aligned(4))) static const u16 ov16_BattlePlatformIndexToPaletteMember[][3] = { 0x7, 0x8, 0x9, @@ -188,7 +195,7 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) v2 = &Unk_ov16_022700CC[param0->unk_08]; if (param0->unk_08 == 0) { - v3 = Unk_ov16_0227009C[param0->unk_09]; + v3 = ov16_BattlePlatformIndexToNARCMember[param0->unk_09]; v4 = 20013; v5 = 128; v6 = 20005; @@ -204,8 +211,8 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) } SpriteRenderer_LoadCharResObjFromOpenNarc(v0, v1, v10, v3, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v4); - SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, Unk_ov16_02270134[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); - PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, Unk_ov16_02270134[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); + SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, ov16_BattlePlatformIndexToPaletteMember[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); + PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, ov16_BattlePlatformIndexToPaletteMember[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); SpriteRenderer_LoadCellResObjFromOpenNarc(v0, v1, v10, v5, 1, v6); SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, v1, v10, v7, 1, v8); NARC_dtor(v10); diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index a965da98fe..1f6e65f305 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -128,7 +128,11 @@ static BOOL ov12_02236F10(BallRotation *param0); static BOOL ov12_02237694(BallRotation *param0); static BOOL ov12_02237474(BallRotation *param0); -static const int Unk_ov12_0223AF00[][4] = { +/* +* Maps a ball index (produced by ov12_02235E94) to NARC members in pl_batt_obj. +* These NARC members describe the sprite, palette, cell, and anim to use for that ball. +*/ +static const int ov12_BallIndexToNARCMembers[][4] = { { 0x120, 0x5C, 0x11F, 0x11E }, { 0x123, 0x5D, 0x122, 0x121 }, { 0x126, 0x5E, 0x125, 0x124 }, @@ -340,7 +344,7 @@ static int ov12_02235FC8(int param0, int param1) int v0; v0 = ov12_02235E94(param0); - return Unk_ov12_0223AF00[v0][param1]; + return ov12_BallIndexToNARCMembers[v0][param1]; } UnkStruct_ov12_02235FE0 *ov12_02235FE0(int param0) From d597f8ffc7e623a12f1a18ea242b70588e8afca9 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Wed, 16 Oct 2024 09:50:02 -0500 Subject: [PATCH 11/26] update names to align with emerald, add terrain names, rename some palettes --- res/battle/graphic/pl_batt_obj/order.txt | 132 +++++++++--------- ...l_batt_obj_00000108.pal => bait_throw.pal} | 0 ...bj_00000106.pal => cherish_ball_throw.pal} | 0 .../graphic/pl_batt_obj/palettes/data.json | 42 +++--- ...t_obj_00000097.pal => dive_ball_throw.pal} | 0 ...t_obj_00000104.pal => dusk_ball_throw.pal} | 0 ..._obj_00000094.pal => great_ball_throw.pal} | 0 ...t_obj_00000105.pal => heal_ball_throw.pal} | 0 ...lthbar_normal.pal => healthbox_normal.pal} | 0 ...lthbar_safari.pal => healthbox_safari.pal} | 0 ...obj_00000101.pal => luxury_ball_throw.pal} | 0 ...obj_00000092.pal => master_ball_throw.pal} | 0 .../graphic/pl_batt_obj/palettes/meson.build | 42 +++--- ...pl_batt_obj_00000109.pal => mud_throw.pal} | 0 ...t_obj_00000098.pal => nest_ball_throw.pal} | 0 ...tt_obj_00000096.pal => net_ball_throw.pal} | 0 ...t_obj_00000107.pal => park_ball_throw.pal} | 0 ...t_obj_00000091.pal => poke_ball_throw.pal} | 0 ...bj_00000102.pal => premier_ball_throw.pal} | 0 ..._obj_00000103.pal => quick_ball_throw.pal} | 0 ...obj_00000099.pal => repeat_ball_throw.pal} | 0 ...obj_00000095.pal => safari_ball_throw.pal} | 0 ..._obj_00000100.pal => timer_ball_throw.pal} | 0 ..._obj_00000093.pal => ultra_ball_throw.pal} | 0 ...png => ball_status_indicator_opponent.png} | Bin ...8.png => ball_status_indicator_player.png} | Bin ...png => battle_subscreen_cursor_corner.png} | Bin .../sprites/battle_terrain_cave_opponent.png | Bin 0 -> 971 bytes ...149.png => battle_terrain_cave_player.png} | Bin .../battle_terrain_champion_opponent.png | Bin 0 -> 726 bytes ...png => battle_terrain_champion_player.png} | Bin ...ttle_terrain_distortion_world_opponent.png | Bin 0 -> 754 bytes ...attle_terrain_distortion_world_player.png} | Bin .../battle_terrain_elite4_aaron_opponent.png | Bin 0 -> 688 bytes .../battle_terrain_elite4_aaron_player.png | Bin 0 -> 630 bytes .../battle_terrain_elite4_bertha_opponent.png | Bin 0 -> 688 bytes ...> battle_terrain_elite4_bertha_player.png} | Bin .../battle_terrain_elite4_flint_opponent.png | Bin 0 -> 688 bytes ...=> battle_terrain_elite4_flint_player.png} | Bin .../battle_terrain_elite4_lucian_opponent.png | Bin 0 -> 688 bytes ...> battle_terrain_elite4_lucian_player.png} | Bin .../sprites/battle_terrain_grass_opponent.png | Bin 0 -> 887 bytes ...27.png => battle_terrain_grass_player.png} | Bin .../sprites/battle_terrain_ice_opponent.png | Bin 0 -> 697 bytes ...0137.png => battle_terrain_ice_player.png} | Bin .../battle_terrain_indoors_opponent.png | Bin 0 -> 518 bytes ....png => battle_terrain_indoors_player.png} | Bin .../battle_terrain_mountain_opponent.png | Bin 0 -> 919 bytes ...png => battle_terrain_mountain_player.png} | Bin .../sprites/battle_terrain_mud_opponent.png | Bin 0 -> 612 bytes ...0147.png => battle_terrain_mud_player.png} | Bin .../sprites/battle_terrain_path_opponent.png | Bin 0 -> 750 bytes ...135.png => battle_terrain_path_player.png} | Bin .../battle_terrain_puddle_opponent.png | Bin 0 -> 766 bytes ...1.png => battle_terrain_puddle_player.png} | Bin 838 -> 838 bytes .../sprites/battle_terrain_sand_opponent.png | Bin 0 -> 559 bytes ...145.png => battle_terrain_sand_player.png} | Bin .../sprites/battle_terrain_snow_opponent.png | Bin 0 -> 646 bytes ...141.png => battle_terrain_snow_player.png} | Bin .../sprites/battle_terrain_surf_opponent.png | Bin 0 -> 653 bytes ...133.png => battle_terrain_surf_player.png} | Bin .../graphic/pl_batt_obj/sprites/data.json | 90 ++++++------ ...1.png => healthbox_doubles_opponent_1.png} | Bin ...2.png => healthbox_doubles_opponent_2.png} | Bin ...t_1.png => healthbox_doubles_player_1.png} | Bin ...t_2.png => healthbox_doubles_player_2.png} | Bin ..._obj_00000253.png => healthbox_safari.png} | Bin ...emy.png => healthbox_singles_opponent.png} | Bin ...layer.png => healthbox_singles_player.png} | Bin .../graphic/pl_batt_obj/sprites/meson.build | 90 ++++++------ .../sprites/pl_batt_obj_00000130.png | Bin 975 -> 0 bytes .../sprites/pl_batt_obj_00000134.png | Bin 630 -> 0 bytes .../sprites/pl_batt_obj_00000136.png | Bin 845 -> 0 bytes .../sprites/pl_batt_obj_00000138.png | Bin 820 -> 0 bytes .../sprites/pl_batt_obj_00000140.png | Bin 994 -> 0 bytes .../sprites/pl_batt_obj_00000142.png | Bin 690 -> 0 bytes .../sprites/pl_batt_obj_00000144.png | Bin 521 -> 0 bytes .../sprites/pl_batt_obj_00000146.png | Bin 568 -> 0 bytes .../sprites/pl_batt_obj_00000148.png | Bin 594 -> 0 bytes .../sprites/pl_batt_obj_00000150.png | Bin 1040 -> 0 bytes .../sprites/pl_batt_obj_00000152.png | Bin 869 -> 0 bytes .../sprites/pl_batt_obj_00000153.png | Bin 663 -> 0 bytes .../sprites/pl_batt_obj_00000154.png | Bin 774 -> 0 bytes .../sprites/pl_batt_obj_00000156.png | Bin 774 -> 0 bytes .../sprites/pl_batt_obj_00000158.png | Bin 774 -> 0 bytes .../sprites/pl_batt_obj_00000160.png | Bin 774 -> 0 bytes .../sprites/pl_batt_obj_00000162.png | Bin 812 -> 0 bytes .../sprites/pl_batt_obj_00000164.png | Bin 859 -> 0 bytes .../sprites/pl_batt_obj_00000166.png | Bin 524 -> 519 bytes .../sprites/pl_batt_obj_00000168.png | Bin 524 -> 519 bytes .../sprites/pl_batt_obj_00000170.png | Bin 524 -> 519 bytes .../sprites/pl_batt_obj_00000172.png | Bin 524 -> 519 bytes .../sprites/pl_batt_obj_00000174.png | Bin 524 -> 519 bytes .../sprites/pl_batt_obj_00000176.png | Bin 90 -> 96 bytes ...pokeball_throw.png => poke_ball_throw.png} | Bin src/battle/ov16_02268520.c | 20 +-- 96 files changed, 208 insertions(+), 208 deletions(-) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000108.pal => bait_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000106.pal => cherish_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000097.pal => dive_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000104.pal => dusk_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000094.pal => great_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000105.pal => heal_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{healthbar_normal.pal => healthbox_normal.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{healthbar_safari.pal => healthbox_safari.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000101.pal => luxury_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000092.pal => master_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000109.pal => mud_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000098.pal => nest_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000096.pal => net_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000107.pal => park_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000091.pal => poke_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000102.pal => premier_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000103.pal => quick_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000099.pal => repeat_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000095.pal => safari_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000100.pal => timer_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000093.pal => ultra_ball_throw.pal} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000205.png => ball_status_indicator_opponent.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000208.png => ball_status_indicator_player.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000250.png => battle_subscreen_cursor_corner.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_cave_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000149.png => battle_terrain_cave_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_champion_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000161.png => battle_terrain_champion_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000163.png => battle_terrain_distortion_world_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_aaron_opponent.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_aaron_player.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_bertha_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000155.png => battle_terrain_elite4_bertha_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_flint_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000157.png => battle_terrain_elite4_flint_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_lucian_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000159.png => battle_terrain_elite4_lucian_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_grass_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000127.png => battle_terrain_grass_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_ice_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000137.png => battle_terrain_ice_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_indoors_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000143.png => battle_terrain_indoors_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000139.png => battle_terrain_mountain_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000147.png => battle_terrain_mud_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000135.png => battle_terrain_path_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_puddle_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000151.png => battle_terrain_puddle_player.png} (84%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000145.png => battle_terrain_sand_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000141.png => battle_terrain_snow_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000133.png => battle_terrain_surf_player.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{healthbar_enemy_slot_1.png => healthbox_doubles_opponent_1.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{healthbar_enemy_slot_2.png => healthbox_doubles_opponent_2.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{healthbar_player_slot_1.png => healthbox_doubles_player_1.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{healthbar_player_slot_2.png => healthbox_doubles_player_2.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000253.png => healthbox_safari.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{healthbar_solo_enemy.png => healthbox_singles_opponent.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{healthbar_solo_player.png => healthbox_singles_player.png} (100%) delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000130.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000134.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000136.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000138.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000140.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000142.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000144.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000146.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000148.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000150.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000152.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000153.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000154.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000156.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000158.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000160.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000162.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000164.png rename res/battle/graphic/pl_batt_obj/sprites/{pokeball_throw.png => poke_ball_throw.png} (100%) diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/order.txt index e342a85dae..e8faf018e3 100644 --- a/res/battle/graphic/pl_batt_obj/order.txt +++ b/res/battle/graphic/pl_batt_obj/order.txt @@ -69,7 +69,7 @@ pl_batt_obj_00000067.NCLR pl_batt_obj_00000068.NCLR pl_batt_obj_00000069.NCLR pl_batt_obj_00000070.NCLR -healthbar_normal.NCLR +healthbox_normal.NCLR pl_batt_obj_00000072.NCLR pl_batt_obj_00000073.NCLR icon_palettes.NCLR @@ -79,7 +79,7 @@ pl_batt_obj_00000077.NCER pl_batt_obj_00000078.NANR pl_batt_obj_00000079.NCLR pl_batt_obj_00000080.NCLR -healthbar_safari.NCLR +healthbox_safari.NCLR pl_batt_obj_00000082.NCLR pl_batt_obj_00000083.NCLR pl_batt_obj_00000084.NCLR @@ -89,25 +89,25 @@ pl_batt_obj_00000087.NCLR pl_batt_obj_00000088.NCLR pl_batt_obj_00000089.NCLR pl_batt_obj_00000090.NCLR -pl_batt_obj_00000091.NCLR -pl_batt_obj_00000092.NCLR -pl_batt_obj_00000093.NCLR -pl_batt_obj_00000094.NCLR -pl_batt_obj_00000095.NCLR -pl_batt_obj_00000096.NCLR -pl_batt_obj_00000097.NCLR -pl_batt_obj_00000098.NCLR -pl_batt_obj_00000099.NCLR -pl_batt_obj_00000100.NCLR -pl_batt_obj_00000101.NCLR -pl_batt_obj_00000102.NCLR -pl_batt_obj_00000103.NCLR -pl_batt_obj_00000104.NCLR -pl_batt_obj_00000105.NCLR -pl_batt_obj_00000106.NCLR -pl_batt_obj_00000107.NCLR -pl_batt_obj_00000108.NCLR -pl_batt_obj_00000109.NCLR +poke_ball_throw.NCLR +master_ball_throw.NCLR +ultra_ball_throw.NCLR +great_ball_throw.NCLR +safari_ball_throw.NCLR +net_ball_throw.NCLR +dive_ball_throw.NCLR +nest_ball_throw.NCLR +repeat_ball_throw.NCLR +timer_ball_throw.NCLR +luxury_ball_throw.NCLR +premier_ball_throw.NCLR +quick_ball_throw.NCLR +dusk_ball_throw.NCLR +heal_ball_throw.NCLR +cherish_ball_throw.NCLR +park_ball_throw.NCLR +bait_throw.NCLR +mud_throw.NCLR party_gauge.NCLR pl_batt_obj_00000111.NCLR pl_batt_obj_00000112.NCGR @@ -125,44 +125,44 @@ pl_batt_obj_00000123.NANR pl_batt_obj_00000124.NCGR pl_batt_obj_00000125.NCER pl_batt_obj_00000126.NANR -pl_batt_obj_00000127.NCGR +battle_terrain_grass_player.NCGR pl_batt_obj_00000128.NCER pl_batt_obj_00000129.NANR -pl_batt_obj_00000130.NCGR +battle_terrain_grass_opponent.NCGR pl_batt_obj_00000131.NCER pl_batt_obj_00000132.NANR -pl_batt_obj_00000133.NCGR -pl_batt_obj_00000134.NCGR -pl_batt_obj_00000135.NCGR -pl_batt_obj_00000136.NCGR -pl_batt_obj_00000137.NCGR -pl_batt_obj_00000138.NCGR -pl_batt_obj_00000139.NCGR -pl_batt_obj_00000140.NCGR -pl_batt_obj_00000141.NCGR -pl_batt_obj_00000142.NCGR -pl_batt_obj_00000143.NCGR -pl_batt_obj_00000144.NCGR -pl_batt_obj_00000145.NCGR -pl_batt_obj_00000146.NCGR -pl_batt_obj_00000147.NCGR -pl_batt_obj_00000148.NCGR -pl_batt_obj_00000149.NCGR -pl_batt_obj_00000150.NCGR -pl_batt_obj_00000151.NCGR -pl_batt_obj_00000152.NCGR -pl_batt_obj_00000153.NCGR -pl_batt_obj_00000154.NCGR -pl_batt_obj_00000155.NCGR -pl_batt_obj_00000156.NCGR -pl_batt_obj_00000157.NCGR -pl_batt_obj_00000158.NCGR -pl_batt_obj_00000159.NCGR -pl_batt_obj_00000160.NCGR -pl_batt_obj_00000161.NCGR -pl_batt_obj_00000162.NCGR -pl_batt_obj_00000163.NCGR -pl_batt_obj_00000164.NCGR +battle_terrain_surf_player.NCGR +battle_terrain_surf_opponent.NCGR +battle_terrain_path_player.NCGR +battle_terrain_path_opponent.NCGR +battle_terrain_ice_player.NCGR +battle_terrain_ice_opponent.NCGR +battle_terrain_mountain_player.NCGR +battle_terrain_mountain_opponent.NCGR +battle_terrain_snow_player.NCGR +battle_terrain_snow_opponent.NCGR +battle_terrain_indoors_player.NCGR +battle_terrain_indoors_opponent.NCGR +battle_terrain_sand_player.NCGR +battle_terrain_sand_opponent.NCGR +battle_terrain_mud_player.NCGR +battle_terrain_mud_opponent.NCGR +battle_terrain_cave_player.NCGR +battle_terrain_cave_opponent.NCGR +battle_terrain_puddle_player.NCGR +battle_terrain_puddle_opponent.NCGR +battle_terrain_elite4_aaron_player.NCGR +battle_terrain_elite4_aaron_opponent.NCGR +battle_terrain_elite4_bertha_player.NCGR +battle_terrain_elite4_bertha_opponent.NCGR +battle_terrain_elite4_flint_player.NCGR +battle_terrain_elite4_flint_opponent.NCGR +battle_terrain_elite4_lucian_player.NCGR +battle_terrain_elite4_lucian_opponent.NCGR +battle_terrain_champion_player.NCGR +battle_terrain_champion_opponent.NCGR +battle_terrain_distortion_world_player.NCGR +battle_terrain_distortion_world_opponent.NCGR pl_batt_obj_00000165.NCGR pl_batt_obj_00000166.NCGR pl_batt_obj_00000167.NCGR @@ -186,27 +186,27 @@ pl_batt_obj_00000184.NCER pl_batt_obj_00000185.NCGR pl_batt_obj_00000186.NANR pl_batt_obj_00000187.NCER -healthbar_solo_enemy.NCGR +healthbox_singles_opponent.NCGR pl_batt_obj_00000189.NANR pl_batt_obj_00000190.NCER -healthbar_solo_player.NCGR +healthbox_singles_player.NCGR pl_batt_obj_00000192.NANR pl_batt_obj_00000193.NCER -healthbar_enemy_slot_1.NCGR +healthbox_doubles_opponent_1.NCGR pl_batt_obj_00000195.NANR pl_batt_obj_00000196.NCER -healthbar_enemy_slot_2.NCGR +healthbox_doubles_opponent_2.NCGR pl_batt_obj_00000198.NANR pl_batt_obj_00000199.NCER -healthbar_player_slot_1.NCGR +healthbox_doubles_player_1.NCGR pl_batt_obj_00000201.NANR pl_batt_obj_00000202.NCER -healthbar_player_slot_2.NCGR +healthbox_doubles_player_2.NCGR pl_batt_obj_00000204.NCER -pl_batt_obj_00000205.NCGR +ball_status_indicator_opponent.NCGR pl_batt_obj_00000206.NANR pl_batt_obj_00000207.NCER -pl_batt_obj_00000208.NCGR +ball_status_indicator_player.NCGR pl_batt_obj_00000209.NANR pl_batt_obj_00000210.NCER pl_batt_obj_00000211.NCGR @@ -248,10 +248,10 @@ move_type_special.NCGR pl_batt_obj_00000247.NCGR pl_batt_obj_00000248.NCER pl_batt_obj_00000249.NANR -pl_batt_obj_00000250.NCGR +battle_subscreen_cursor_corner.NCGR pl_batt_obj_00000251.NCER pl_batt_obj_00000252.NANR -pl_batt_obj_00000253.NCGR +healthbox_safari.NCGR pl_batt_obj_00000254.NCER pl_batt_obj_00000255.NANR pl_batt_obj_00000256.NCGR @@ -283,7 +283,7 @@ pl_batt_obj_00000281.NANR pl_batt_obj_00000282.NANR pl_batt_obj_00000283.NANR pl_batt_obj_00000284.NCER -pokeball_throw.NCGR +poke_ball_throw.NCGR pl_batt_obj_00000286.NANR pl_batt_obj_00000287.NCER master_ball_throw.NCGR diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000108.pal b/res/battle/graphic/pl_batt_obj/palettes/bait_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000108.pal rename to res/battle/graphic/pl_batt_obj/palettes/bait_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000106.pal b/res/battle/graphic/pl_batt_obj/palettes/cherish_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000106.pal rename to res/battle/graphic/pl_batt_obj/palettes/cherish_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/data.json b/res/battle/graphic/pl_batt_obj/palettes/data.json index ea3892aee6..071d93f8ff 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/data.json +++ b/res/battle/graphic/pl_batt_obj/palettes/data.json @@ -553,7 +553,7 @@ "invert_size": true }, { - "target": "healthbar_normal.pal", + "target": "healthbox_normal.pal", "bitdepth": 4, "pad": false, "pcmp": true, @@ -602,7 +602,7 @@ "invert_size": true }, { - "target": "healthbar_safari.pal", + "target": "healthbox_safari.pal", "bitdepth": 4, "pad": false, "pcmp": true, @@ -616,133 +616,133 @@ "invert_size": true }, { - "target": "pl_batt_obj_00000091.pal", + "target": "poke_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000092.pal", + "target": "master_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000093.pal", + "target": "ultra_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000094.pal", + "target": "great_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000095.pal", + "target": "safari_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000096.pal", + "target": "net_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000097.pal", + "target": "dive_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000098.pal", + "target": "nest_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000099.pal", + "target": "repeat_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000100.pal", + "target": "timer_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000101.pal", + "target": "luxury_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000102.pal", + "target": "premier_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000103.pal", + "target": "quick_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000104.pal", + "target": "dusk_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000105.pal", + "target": "heal_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000106.pal", + "target": "cherish_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000107.pal", + "target": "park_ball_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000108.pal", + "target": "bait_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000109.pal", + "target": "mud_throw.pal", "bitdepth": 4, "pad": false, "pcmp": true, diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000097.pal b/res/battle/graphic/pl_batt_obj/palettes/dive_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000097.pal rename to res/battle/graphic/pl_batt_obj/palettes/dive_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000104.pal b/res/battle/graphic/pl_batt_obj/palettes/dusk_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000104.pal rename to res/battle/graphic/pl_batt_obj/palettes/dusk_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000094.pal b/res/battle/graphic/pl_batt_obj/palettes/great_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000094.pal rename to res/battle/graphic/pl_batt_obj/palettes/great_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000105.pal b/res/battle/graphic/pl_batt_obj/palettes/heal_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000105.pal rename to res/battle/graphic/pl_batt_obj/palettes/heal_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/healthbar_normal.pal b/res/battle/graphic/pl_batt_obj/palettes/healthbox_normal.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/healthbar_normal.pal rename to res/battle/graphic/pl_batt_obj/palettes/healthbox_normal.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/healthbar_safari.pal b/res/battle/graphic/pl_batt_obj/palettes/healthbox_safari.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/healthbar_safari.pal rename to res/battle/graphic/pl_batt_obj/palettes/healthbox_safari.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000101.pal b/res/battle/graphic/pl_batt_obj/palettes/luxury_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000101.pal rename to res/battle/graphic/pl_batt_obj/palettes/luxury_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000092.pal b/res/battle/graphic/pl_batt_obj/palettes/master_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000092.pal rename to res/battle/graphic/pl_batt_obj/palettes/master_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/pl_batt_obj/palettes/meson.build index 7bfa61045c..65a6e1bdb4 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/meson.build +++ b/res/battle/graphic/pl_batt_obj/palettes/meson.build @@ -70,14 +70,14 @@ pl_batt_obj_palettes = files( 'pl_batt_obj_00000068.pal', 'pl_batt_obj_00000069.pal', 'pl_batt_obj_00000070.pal', - 'healthbar_normal.pal', + 'healthbox_normal.pal', 'pl_batt_obj_00000072.pal', 'pl_batt_obj_00000073.pal', 'icon_palettes.pal', 'pl_batt_obj_00000075.pal', 'pl_batt_obj_00000079.pal', 'pl_batt_obj_00000080.pal', - 'healthbar_safari.pal', + 'healthbox_safari.pal', 'pl_batt_obj_00000082.pal', 'pl_batt_obj_00000083.pal', 'pl_batt_obj_00000084.pal', @@ -87,25 +87,25 @@ pl_batt_obj_palettes = files( 'pl_batt_obj_00000088.pal', 'pl_batt_obj_00000089.pal', 'pl_batt_obj_00000090.pal', - 'pl_batt_obj_00000091.pal', - 'pl_batt_obj_00000092.pal', - 'pl_batt_obj_00000093.pal', - 'pl_batt_obj_00000094.pal', - 'pl_batt_obj_00000095.pal', - 'pl_batt_obj_00000096.pal', - 'pl_batt_obj_00000097.pal', - 'pl_batt_obj_00000098.pal', - 'pl_batt_obj_00000099.pal', - 'pl_batt_obj_00000100.pal', - 'pl_batt_obj_00000101.pal', - 'pl_batt_obj_00000102.pal', - 'pl_batt_obj_00000103.pal', - 'pl_batt_obj_00000104.pal', - 'pl_batt_obj_00000105.pal', - 'pl_batt_obj_00000106.pal', - 'pl_batt_obj_00000107.pal', - 'pl_batt_obj_00000108.pal', - 'pl_batt_obj_00000109.pal', + 'poke_ball_throw.pal', + 'master_ball_throw.pal', + 'ultra_ball_throw.pal', + 'great_ball_throw.pal', + 'safari_ball_throw.pal', + 'net_ball_throw.pal', + 'dive_ball_throw.pal', + 'nest_ball_throw.pal', + 'repeat_ball_throw.pal', + 'timer_ball_throw.pal', + 'luxury_ball_throw.pal', + 'premier_ball_throw.pal', + 'quick_ball_throw.pal', + 'dusk_ball_throw.pal', + 'heal_ball_throw.pal', + 'cherish_ball_throw.pal', + 'park_ball_throw.pal', + 'bait_throw.pal', + 'mud_throw.pal', 'party_gauge.pal', 'pl_batt_obj_00000111.pal' ) diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000109.pal b/res/battle/graphic/pl_batt_obj/palettes/mud_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000109.pal rename to res/battle/graphic/pl_batt_obj/palettes/mud_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000098.pal b/res/battle/graphic/pl_batt_obj/palettes/nest_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000098.pal rename to res/battle/graphic/pl_batt_obj/palettes/nest_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000096.pal b/res/battle/graphic/pl_batt_obj/palettes/net_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000096.pal rename to res/battle/graphic/pl_batt_obj/palettes/net_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000107.pal b/res/battle/graphic/pl_batt_obj/palettes/park_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000107.pal rename to res/battle/graphic/pl_batt_obj/palettes/park_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000091.pal b/res/battle/graphic/pl_batt_obj/palettes/poke_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000091.pal rename to res/battle/graphic/pl_batt_obj/palettes/poke_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000102.pal b/res/battle/graphic/pl_batt_obj/palettes/premier_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000102.pal rename to res/battle/graphic/pl_batt_obj/palettes/premier_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000103.pal b/res/battle/graphic/pl_batt_obj/palettes/quick_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000103.pal rename to res/battle/graphic/pl_batt_obj/palettes/quick_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000099.pal b/res/battle/graphic/pl_batt_obj/palettes/repeat_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000099.pal rename to res/battle/graphic/pl_batt_obj/palettes/repeat_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000095.pal b/res/battle/graphic/pl_batt_obj/palettes/safari_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000095.pal rename to res/battle/graphic/pl_batt_obj/palettes/safari_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000100.pal b/res/battle/graphic/pl_batt_obj/palettes/timer_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000100.pal rename to res/battle/graphic/pl_batt_obj/palettes/timer_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000093.pal b/res/battle/graphic/pl_batt_obj/palettes/ultra_ball_throw.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000093.pal rename to res/battle/graphic/pl_batt_obj/palettes/ultra_ball_throw.pal diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000205.png b/res/battle/graphic/pl_batt_obj/sprites/ball_status_indicator_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000205.png rename to res/battle/graphic/pl_batt_obj/sprites/ball_status_indicator_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000208.png b/res/battle/graphic/pl_batt_obj/sprites/ball_status_indicator_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000208.png rename to res/battle/graphic/pl_batt_obj/sprites/ball_status_indicator_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000250.png b/res/battle/graphic/pl_batt_obj/sprites/battle_subscreen_cursor_corner.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000250.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_subscreen_cursor_corner.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_cave_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_cave_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..19a91d3f0ef82354ad5ee5e44d72b3829967ba2d GIT binary patch literal 971 zcmV;+12p`JP)U##BplhKD`BaZTih8t3gg6=p zRU8w>LEJFd;S4ImM?j?88Lu7Nu?g2o%^!jA&Tn^SKW8*;tN%c{{Gj1kN#Shj9=vFaW0yFd&-+!BG@O>sAH40N6JS_>K1Au27;7ZUAsh zz^O8QABv_3nE5WAaSUwT6>HM8B?cJUpLaO^j+ucs3?i_93X}SG?FtAWxE99X9bkzx z$1!dH**h+DLH&BVcb8g|M9}#N zA)y}+cCvMVi7Ai5fSZAPUs;LODuQ)BW={YWKx?-sk6dw*i_^$JToN?5)v4CyV|k#F z4&Ph>eD>?RC2Iun_LMf)oYLHz_ff7KDHR{>8_bvP5nIwaBBnV~7pO)m)emg7)mHzC zKDwp4W#k)yS0Ro!0+hNBH~5j#w+uVi!DT4l6@!O`{88rMasCrQu!)Tnle8inBOh19&KAO!~)76TlvT5Xxp$xZ!U~X?J~q z*rUZ24gtvX=$Nww1J&krfp0F}QxXT2ka}EPBhG7JJ;>pnX%KMZbG^Y;W8PV)PYh5| z1C4Ji*e{cP#@lFf*Ll%jov3>d z69rK0qnQe>Vb`YAR239t^hc%ruDWFml;wh5r}RaAy^y0yz&@HZ&5cW{{59%^_^Ew| t+tmW~UBA1no_+Vft`s&uFxQz63E$Q{DkCfQUucHa$noajPGOj zGAH<9^wuPv1%j~t+DGA@P7)Jaw-M7kPCEmxbK}Z*`$=9l^S2?gG*?T@Qd3_8ij03@8_nQ9@)+SR`>H zy_!(QF3&7oE6`pyWHu^<7z-?I7z5~qW+|EkjTR^NL(yF4uSFinC&x+ZV zK9ilmz=|`wAngEtUDUJ^g%3IG5A literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000161.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_champion_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000161.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_champion_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..ba578848190daf32df7f675a180a6517d403bb7e GIT binary patch literal 754 zcmVl$5lCi=1|=n56Cn0pwL zlI>mcj18`d!1b9%+OM~$74U^`?X3(aTV7{=0B&&jUJoL(8!d1WGcTFG=G27bjBwr>@H9a%eK-=_$Pq@9!nVy!L za&nS1hH(h~u1f$F%M^2c50tl%XSGM>MN!m6sGR9NAk<|RsRm+!zEQl37A;!z@AO`) zz)GFMiJ(gbl>hV&PZdN>0Qi0YzDMX%07!&>0W1g;5#JHmtTk8}igdmvV1>tm?-@)0 z36UVw0)!)9rPe?pa%N%#D}4i<)_Ln7L>R%_$bmsQ_k=)p=--V{HUaK%DFEy!9zth< z(LT5LZVr6Fw|wD71i+n}raTCZPJeOX?sokZuL--j5bb@Mq2bv4VjTb<1APk6L?7FSY`65W4*bQVk2kTu zAY1%w7hPCB+wLS8ll=^e7NIzwDCwFCSi=aC-KUh3vA>m^_I6f8Rl`78|90V=>f$Pk k>XrITwOg0vqD6E41rs3awd&fxy#N3J07*qoM6N<$f?a7+QUCw| literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000163.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000163.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_aaron_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_aaron_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..ff3a8be0639516068e0eb01ac0da2089a6300b07 GIT binary patch literal 688 zcmV;h0#E&kP)gT2LCq^vn}VjxO6nH!A&00001 zbW%=J06^y0W&i*JE=fc|R9J=WmQR+`Fbu|hfxO<51sC8wxIh^=04c0tn#>+ZH~>)P zO%G6~Cx|l#n8rwsW6OWSjurWK$@jA&xmGP9Hf{R%(q4(Tqql=}O3dj3fdbc>r?&F) z_Uv+x1NufQo6j#2+2v$sTnp@Q`RQ2ZW&I|6TUG5M1SSB!ylSH|cNaLmTJ+kvORWgN zFXz`VmwGJsi-frO0BYRPP$=9;P7qX9wcE*}#}F~WlN3_v3uV6w6ulwV5d5(u5(BIu!V>d=J2eR- zEHTbO%uiJ&fRIut?GW0fCOWhQ22p8K@V=0QjGD)Z8V3>l5XA{11+7;|6K9UJ(!7P~ zSml-NekoVFd();(o4EcqDj50ylAfTa1PK51x-o&+B+&kF&{GzeDa$w{9SC056zQs0 z0b&TTK~~0w10q*LxIv++LZr4tP-V-Z1HkC2uoV*X#SIGw=rDx4d&+~oa~nr|0uIb~ zE+zNXhq%T7>LX9;@tlkBZF#zb$05wYq}sSw@8LS6Rowe{0Miif10PTxpqr%I$)+l! z>E!{pQpHJzem4!P09DgzB{Tc5*yLk?9AIqd(Wgr>am{(6LpS>Y;77$?Pu6#bw)T64 zwpMDnbd!OBPQAkA=WOFpcTHsbJ3DMDO&5N6rTgBU$fT+MEV$UHU|KkI#WpMaU-|=+ WiIBMmoo2EC0000JP)gT2LCq^vn}VjxO6nH!A&00001 zbW%=J06^y0W&i*I^hrcPR9J=Wm)%vwAP|Mq0d2!pU}6IsvJDtg!GhX=XKlberT{fU z_=kbKxE?*b^LoD-;AVy-O>>L?63d3XoHt}4$}&=N1z5gbL~>eTtn-^&xdK*2$DQxkUQC zIZLp>o2nS-d>}is2h(-i{+>)BAz#4j-stqIGigiGh*>1UDYUTCUW&@ZT#TgARypofQ8p!W~ zNH2%bN+ZH~>)P zO%G6~Cx|l#n8rwsW6OWSjurWK$@jA&xmGP9Hf{R%(q4(Tqql=}O3dj3fdbc>r?&F) z_Uv+x1NufQo6j#2+2v$sTnp@Q`RQ2ZW&I|6TUG5M1SSB!ylSH|cNaLmTJ+kvORWgN zFXz`VmwGJsi-frO0BYRPP$=9;P7qX9wcE*}#}F~WlN3_v3uV6w6ulwV5d5(u5(BIu!V>d=J2eR- zEHTbO%uiJ&fRIut?GW0fCOWhQ22p8K@V=0QjGD)Z8V3>l5XA{11+7;|6K9UJ(!7P~ zSml-NekoVFd();(o4EcqDj50ylAfTa1PK51x-o&+B+&kF&{GzeDa$w{9SC056zQs0 z0b&TTK~~0w10q*LxIv++LZr4tP-V-Z1HkC2uoV*X#SIGw=rDx4d&+~oa~nr|0uIb~ zE+zNXhq%T7>LX9;@tlkBZF#zb$05wYq}sSw@8LS6Rowe{0Miif10PTxpqr%I$)+l! z>E!{pQpHJzem4!P09DgzB{Tc5*yLk?9AIqd(Wgr>am{(6LpS>Y;77$?Pu6#bw)T64 zwpMDnbd!OBPQAkA=WOFpcTHsbJ3DMDO&5N6rTgBU$fT+MEV$UHU|KkI#WpMaU-|=+ WiIBMmoo2EC0000_&F+ZH~>)P zO%G6~Cx|l#n8rwsW6OWSjurWK$@jA&xmGP9Hf{R%(q4(Tqql=}O3dj3fdbc>r?&F) z_Uv+x1NufQo6j#2+2v$sTnp@Q`RQ2ZW&I|6TUG5M1SSB!ylSH|cNaLmTJ+kvORWgN zFXz`VmwGJsi-frO0BYRPP$=9;P7qX9wcE*}#}F~WlN3_v3uV6w6ulwV5d5(u5(BIu!V>d=J2eR- zEHTbO%uiJ&fRIut?GW0fCOWhQ22p8K@V=0QjGD)Z8V3>l5XA{11+7;|6K9UJ(!7P~ zSml-NekoVFd();(o4EcqDj50ylAfTa1PK51x-o&+B+&kF&{GzeDa$w{9SC056zQs0 z0b&TTK~~0w10q*LxIv++LZr4tP-V-Z1HkC2uoV*X#SIGw=rDx4d&+~oa~nr|0uIb~ zE+zNXhq%T7>LX9;@tlkBZF#zb$05wYq}sSw@8LS6Rowe{0Miif10PTxpqr%I$)+l! z>E!{pQpHJzem4!P09DgzB{Tc5*yLk?9AIqd(Wgr>am{(6LpS>Y;77$?Pu6#bw)T64 zwpMDnbd!OBPQAkA=WOFpcTHsbJ3DMDO&5N6rTgBU$fT+MEV$UHU|KkI#WpMaU-|=+ WiIBMmoo2EC0000+ZH~>)P zO%G6~Cx|l#n8rwsW6OWSjurWK$@jA&xmGP9Hf{R%(q4(Tqql=}O3dj3fdbc>r?&F) z_Uv+x1NufQo6j#2+2v$sTnp@Q`RQ2ZW&I|6TUG5M1SSB!ylSH|cNaLmTJ+kvORWgN zFXz`VmwGJsi-frO0BYRPP$=9;P7qX9wcE*}#}F~WlN3_v3uV6w6ulwV5d5(u5(BIu!V>d=J2eR- zEHTbO%uiJ&fRIut?GW0fCOWhQ22p8K@V=0QjGD)Z8V3>l5XA{11+7;|6K9UJ(!7P~ zSml-NekoVFd();(o4EcqDj50ylAfTa1PK51x-o&+B+&kF&{GzeDa$w{9SC056zQs0 z0b&TTK~~0w10q*LxIv++LZr4tP-V-Z1HkC2uoV*X#SIGw=rDx4d&+~oa~nr|0uIb~ zE+zNXhq%T7>LX9;@tlkBZF#zb$05wYq}sSw@8LS6Rowe{0Miif10PTxpqr%I$)+l! z>E!{pQpHJzem4!P09DgzB{Tc5*yLk?9AIqd(Wgr>am{(6LpS>Y;77$?Pu6#bw)T64 zwpMDnbd!OBPQAkA=WOFpcTHsbJ3DMDO&5N6rTgBU$fT+MEV$UHU|KkI#WpMaU-|=+ WiIBMmoo2EC0000IP)Dn zECu<;q(D5|i)|VX6b=z&yVoR!bZZPJlUTflHqyt10w`W zVaw%`Wt4m`zeEip#2xq7c|0V7X~XzU6N0R&83i0vl5||1Ni5$&A6^URDmh((;KS#+@5C(LIu2-Q{7)D+s z{jbVsM=zmNUw}5=P-t%-yphlicBTK!vJnVgq2V$^l)*=E@1kIfz+QmMCvJjcn515M z<|KZ4@>oY(QH>&+tj@XZ2f>JnD)L4mgmAx>0`U((;;6i-plh)Z3?ic7DWJV2U{LTq z*t(knYWTj?zJ?nqc;s`>!G`@<7isGY#U9|~Txc`81#6pQb1-J&U&4*L$T|*;Xp$Sr z{I!=`EjjB8=S^-hSn{k}J{00001 zbW%=J06^y0W&i*JH%UZ6R9J=WmP=CGKoEwN6PR2e$Fs-cqa$)4$-<3I2G7NKsUS z&3a|5wmz#wHFh#(9hbVAvtF-)n8--{-9@K~jye7Y@K75wm$b3N#;=)dD%5I$k7sk; zB^r=ln={$c24x~;+2k44E7@3XwoTL2sR8b)3b8p+OWf^!Vt4~eoZFUJB$_v=Dp$Ab^G}WBKlNfpswBhMbHS{1z zi>0Pe#5S3Lz;4nb;vwo%U(+LkDS|urK2w85#OvYl;0cChvCKcRFg=euzS^>8wRtem8adxK(9VnH!MQJqr=00001 zbW%=J06^y0W&i*Igh@m}R9J=WmQ7B>Fc5`(gWQq@7pS;FDzT@DSR=LJ1StmqIuREL z=?S9d0JO#9_$TRjCL7rKE&D#(t^8g+N+l)zzpg>V%kb0w+l!c&7G|2c);!d^pkR;g z)SCj=vvKdJ>~h@rC1Q_2rk5YKMO@ae8QTCC0B*SfvKF>0UK)T8!PmeU3K{r;rzK#M z3&JDbWgr7s09yDI0eyx-L}2v{3qS!! z8F+v%rTAAn&(}-9BOW0EfL~JZU(L^yd^~{%w2vEb0A5yOGQrx`j{znyIx#8=ls=e> z0_)19y9=@PY2AnLcheG)fnl0x3Ustw^HN3n8M;ernUr*^UlvBdH@q=z9RL6T07*qo IM6N<$g8YEmcK`qY literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000143.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_indoors_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000143.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_indoors_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..14e4c492e855e6876ecc84d372ae2293a5048e43 GIT binary patch literal 919 zcmV;I18Dq-P)wgq?D|bbCi2hgK9Z*VjxmVATb~iJ9V1N00001 zbW%=J06^y0W&i*K6-h)vR9J=WmcMV)KorOQ7c}yKgrEfJq)0dsQwIKlNQkkB)P%Bf z8JXNm7q&K6WwVM>hly@=#n4EVXp^OL)d5C?(^iPFNm;tJ=Dqvjo}IRU#OUwj`1`r{ z?q1G%&$4pm`a8{x$F~DNs@3Bgtg%qFT75SiV+O4+Ht0pI`h)dUCO{!Z zSDCX1At9AD0GI{}=gs&e@ub$CtpPAEfpbc|IeT`G7;=bHV;&QJyhv%&+YCrXLEs7? zb{PPyUia~B7#f7zLjNaYl(pF+ZJ@sypoAX=!8&a4y0q`R zjC0=N^i5z$1VG@I{l1L=h&2qLCxbzTdt8exz(OZT$tpzOUTUB{z|_tZ;Go$dpLu6j zmM9IJMkGKV$`Y(Es{$E-brF4qH$E=(SLk!_AJyx++~Sx~)K|ZVOFbY~sNiHQ3v(!f z5SO<-QleCFa*-uMD5Au8dx^k5)8xxK1YU*!O`>b>U z;C#8SPAe}IW{INjB2jm#3&5bSPOGovsX#Cc+$6?3eO)kpp<@{Y7TRGeu*#z{rG{^O0WbUlzOSFT+DMdK@757>zwAar~SAT%0}KnRIhr@kD?o#?THqy~XLP%;J8hyPOUnYR}Dm4<6pvkxRoL$t3piA}S+AxGz6<73= z*O03iD_|+W-Xl6SA-kd>@dYvjL=b${=%PL}lK_Cu0AlS+BGsrNlTW%WJ`hQ_?c!M) z@O8UY8{W1jX&^h~5c}aDfRB*F1jIq5%3>D!6r};Z3-ra~jX)U6jL|3ysQGDA!jGe) zOdWUwUYE6BiK5Ig*Kv~Sg(@5PqohzWx4YP^C-jF%1h5Rh1pfk#QmEb#{G&4k`1&fq zthJli(zlGmJ1{PZ;D@5;PUMY2J}GUo81|=c6fQ{$ymhEs_9W@afeKL`8ZCcf-2CZ@ tVU+$bGVWxm;ipz+J}RMnRLJ!&`VCMi6H`tr+4}$h002ovPDHLkV1kBwrL_P6 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000139.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000139.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..c4323ebff613c1fd8d899093d1593c772ebdc42f GIT binary patch literal 612 zcmV-q0-ODbP)k7R9J=WR!eTeFckC+a?A8{079j%i-Wpv!~rTOy+DBjpyoj@ zfZzf}BU#;7QUW>;syE-D^C4;L&B9lB$!Aj9GHRIaF>I<@8(oaYis;M6F%08BX_ z-u4AmgIJ!8}lR6P2E#wa1s1L8iMVI7~`_>cj_ zw`Y97*Zjod3EwU51FnIJ5$yxZzERQR1Ac2%)HBittuT_%2dPk9`oUew_@ETJ9nCae zKj@}vTOAwE?}s)lP8#Yr13ypQP;`SMlXL77m|QwDg@QJqM0gVt5)%FneOCnu`#;+Y zQPU$3*qj1U`|H1(EUn1V`2Y7(sf4C0uqfwhM~xA5j}W6dDFty}j#mH&si4kFKGzEB z-Z04TaTOF$=Oxx-*x(e@c`52=XdI&=TP@+xHOj9`_#%AJ^@9`;_Xbfv$|WctumG`1 z+K1bB^_r9q$cq(dACTWRjPzlGA8UIJ8%9IWnveM~*FDUl{U8U+rZX+)Y)>_t*Kmxr y7loCV5Gog)jt&L;FkF79BKfr04P%**(8VwIk(e94o>EKz0000 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000147.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000147.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..35d40ab98ace1dea966cb5bceb61563bdb692acc GIT binary patch literal 750 zcmVBxy>o+$L1I!EnL%dF00001 zbW%=J06^y0W&i*JY)M2xR9J=Wma%TrP!xtQynx{aP?a5)Y($Ke`T(`W6I>C;d&FLl z-5CYjE0R^;bgPu1%ABD&6bV+;s?1c)1JJtX9AEp|&UIK|^FP$L`M-OPujAXMAb6g-O;(#c^^re68ZremZznZjEE5vKW=nMf-!7MOjqb z6x&YDyU$zRC)Yh>z_|xlD_z$DkbkZ|Pp1j~Nsz;(5dseYUPfyK61t152{^w2F3Nwc z09>e(Kr5scQBac*_mBm_zIzzhCBz?C{S6p*cvXwVJ6s&?!l})nL6uOA(J_HSgJO)C zUxPgZG{g~tsP6+iz?yTFd}9F;olTTl0$ejOZHYnz>b;t4q65H13UFruj7|YAv4njX z1|QxA$LbWi0agOny8$1*?FMF@K*DqN9yyTg<1>oi=^eeyBf;Z#DM*m9B)cWaC83i++C-T?3a^~XZ zRC4f0963yfM+6X#w||;w^x7+R}hY g3Y%@SSFe^H0ZHy+wUl>=I{*Lx07*qoM6N<$g06#KjQ{`u literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000135.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000135.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_puddle_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_puddle_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..729bfa4952fa2b58623986b2389e7dab026c07e0 GIT binary patch literal 766 zcmVBxy>o+$L1I!E7jMlA00001 zbW%=J06^y0W&i*Jd`Uz>R9J=WmOF0SKoEv`17TIzHDf?U%J2*Za)1cP2?jRBMxEOL z4z$z>WOYUW!dj_TVW?JNO`Hn^)&*i%2Z&71E|>e@BWaS3e?wvCo0(l|hC4yfsnh>g zFE?toz5c{fHKVregxIKuXDy7(doTab$2@2PP5{DwV(d0W zBvYu|bYqkKDX$dFSSAkHASsK^RMbrda(blLX_QDurbV9ID_c%3 wG?4)QCW^&j+%x`tc86y#=c|% E0QKV&3jhEB diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..c5bd2cc38ececaf2e6d31161c0ed4a2120f48698 GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3Ip3bGIl85~yE-V!QQ@FQ)?%P)#*!evUkF zPE6*M_;1{nBi#K@u;|f*BTNkc#4DoAzlA0#9$-8apYdatq7K6=Ub$SSL$7$G=L(3= zk5t?@#Zi^db1j=$>Vq|Lr!~X8rmAzEmgzn%Ql|W~_mbkNXx+3}SKImsj~UE~uN)IB zd!_jV_C-`1xoTL6tItab+Ey5QJa=NL>m`e2>-|(2q%$Nn*=yP_osA9+4gK04^+(G` zMPOh0Z~sYNcHM1V4Ih?oD868rbf>;)>)mt4d>;1ybBnDbQXVmEP&;?Lg`raPZgtb{ zGfx^=%4JV|6%~+5&>?b{ZFS{fpryUgMp00i_>zopr0EH>%b^rhX literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000145.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000145.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..7bd91651a6ea06594c9a44924bb18c52b4445733 GIT binary patch literal 646 zcmV;10(t$3P)cZn)`Uk4kc+|0`Wbl?5mZ66eE=WaU?HHQEF z$ZXHvjJ^?n;l9xJjxZ>}>fnz6ZAZV*n^il1rVC`Cm40y~1QzZNFwh?lk^q1K4&t-g zexgUvfPIda?J&_JC}6R1a_uyAG>7QpG(Rn9nHZok40Ng8_$A;L0gHW7u3sV}ZF)!> zeT~+BnzJAM+6P&vS?{lhgm!|QZviNdb2{G! zz-$6h^yve-b3{|om+KKB>(vgD8zZRg)i7|fV*!VDpK3n}ONrU}Pc%?dfKQ&tK`i7F$nEY&x!E!DGh g8u+btSFK9*4Xw@)0wi0e2><{907*qoM6N<$f{zy;ZU6uP literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000141.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000141.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..d770ace75317cfab6b53a40c6eb12b8f8df9bd49 GIT binary patch literal 653 zcmV;80&@L{P)tL_t_jaI_Go?4Z zld@c4PRD~@?>v#p?42;NZ4jd*F_1pDpBQf)FalI8yRQIlBgVoWDq>-$8>yK4*nJ)* zNz`tIag4v6BkYu8FAriBl30xLdC&kSU@>v?kO9H|bEQvQmInjCL$wjdc`;%Uh{ZrAmLN>|?X_1KIcN)laDpW|~npWWG_uR6z#g zzES;DFk2IF->Z}(5^&!r5uX7pAKUq{aU@VqdR5!4&FE*;EZfG9@JkwSe)eXlp zSo4hg^Kdl-=?A_%+@r1hAeVO|RF$NTc``b=h(LON47WNkj#xq<-)w_bGH nUFR>C)zeoEe0zB-RWkGiBE4DV|EY5L00000NkvXXu0mjfx)dR& literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000133.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000133.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/data.json b/res/battle/graphic/pl_batt_obj/sprites/data.json index 8ea9ef08d0..0588baa3c7 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/data.json +++ b/res/battle/graphic/pl_batt_obj/sprites/data.json @@ -36,205 +36,205 @@ "mapping_type": 64 }, { - "target": "pl_batt_obj_00000127.png", + "target": "battle_terrain_grass_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000130.png", + "target": "battle_terrain_grass_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000133.png", + "target": "battle_terrain_surf_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000134.png", + "target": "battle_terrain_surf_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000135.png", + "target": "battle_terrain_path_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000136.png", + "target": "battle_terrain_path_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000137.png", + "target": "battle_terrain_ice_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000138.png", + "target": "battle_terrain_ice_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000139.png", + "target": "battle_terrain_mountain_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000140.png", + "target": "battle_terrain_mountain_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000141.png", + "target": "battle_terrain_snow_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000142.png", + "target": "battle_terrain_snow_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000143.png", + "target": "battle_terrain_indoors_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000144.png", + "target": "battle_terrain_indoors_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000145.png", + "target": "battle_terrain_sand_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000146.png", + "target": "battle_terrain_sand_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000147.png", + "target": "battle_terrain_mud_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000148.png", + "target": "battle_terrain_mud_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000149.png", + "target": "battle_terrain_cave_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000150.png", + "target": "battle_terrain_cave_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000151.png", + "target": "battle_terrain_puddle_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000152.png", + "target": "battle_terrain_puddle_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000153.png", + "target": "battle_terrain_elite4_aaron_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000154.png", + "target": "battle_terrain_elite4_aaron_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000155.png", + "target": "battle_terrain_elite4_bertha_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000156.png", + "target": "battle_terrain_elite4_bertha_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000157.png", + "target": "battle_terrain_elite4_flint_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000158.png", + "target": "battle_terrain_elite4_flint_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000159.png", + "target": "battle_terrain_elite4_lucian_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000160.png", + "target": "battle_terrain_elite4_lucian_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000161.png", + "target": "battle_terrain_champion_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000162.png", + "target": "battle_terrain_champion_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000163.png", + "target": "battle_terrain_distortion_world_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000164.png", + "target": "battle_terrain_distortion_world_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64 @@ -330,55 +330,55 @@ "mapping_type": 64 }, { - "target": "healthbar_solo_enemy.png", + "target": "healthbox_singles_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "healthbar_solo_player.png", + "target": "healthbox_singles_player.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "healthbar_enemy_slot_1.png", + "target": "healthbox_doubles_opponent_1.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "healthbar_enemy_slot_2.png", + "target": "healthbox_doubles_opponent_2.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "healthbar_player_slot_1.png", + "target": "healthbox_doubles_player_1.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "healthbar_player_slot_2.png", + "target": "healthbox_doubles_player_2.png", "compressed": true, "clobber_size": true, "mapping_type": 64, "version101": true }, { - "target": "pl_batt_obj_00000205.png", + "target": "ball_status_indicator_opponent.png", "compressed": true, "clobber_size": true, "mapping_type": 32 }, { - "target": "pl_batt_obj_00000208.png", + "target": "ball_status_indicator_player.png", "compressed": true, "clobber_size": true, "mapping_type": 32 @@ -587,13 +587,13 @@ "mapping_type": 64 }, { - "target": "pl_batt_obj_00000250.png", + "target": "battle_subscreen_cursor_corner.png", "compressed": true, "clobber_size": true, "mapping_type": 32 }, { - "target": "pl_batt_obj_00000253.png", + "target": "healthbox_safari.png", "compressed": true, "clobber_size": true, "mapping_type": 64 @@ -661,7 +661,7 @@ "vram": true }, { - "target": "pokeball_throw.png", + "target": "poke_ball_throw.png", "compressed": true, "clobber_size": true, "mapping_type": 64 diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbar_enemy_slot_1.png b/res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_opponent_1.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbar_enemy_slot_1.png rename to res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_opponent_1.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbar_enemy_slot_2.png b/res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_opponent_2.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbar_enemy_slot_2.png rename to res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_opponent_2.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbar_player_slot_1.png b/res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_player_1.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbar_player_slot_1.png rename to res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_player_1.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbar_player_slot_2.png b/res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_player_2.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbar_player_slot_2.png rename to res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_player_2.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000253.png b/res/battle/graphic/pl_batt_obj/sprites/healthbox_safari.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000253.png rename to res/battle/graphic/pl_batt_obj/sprites/healthbox_safari.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbar_solo_enemy.png b/res/battle/graphic/pl_batt_obj/sprites/healthbox_singles_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbar_solo_enemy.png rename to res/battle/graphic/pl_batt_obj/sprites/healthbox_singles_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbar_solo_player.png b/res/battle/graphic/pl_batt_obj/sprites/healthbox_singles_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbar_solo_player.png rename to res/battle/graphic/pl_batt_obj/sprites/healthbox_singles_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/meson.build b/res/battle/graphic/pl_batt_obj/sprites/meson.build index efad889e41..3a880430b1 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/meson.build +++ b/res/battle/graphic/pl_batt_obj/sprites/meson.build @@ -5,40 +5,40 @@ pl_batt_obj_sprites = files( 'pl_batt_obj_00000120.png', 'pl_batt_obj_00000121.png', 'pl_batt_obj_00000124.png', - 'pl_batt_obj_00000127.png', - 'pl_batt_obj_00000130.png', - 'pl_batt_obj_00000133.png', - 'pl_batt_obj_00000134.png', - 'pl_batt_obj_00000135.png', - 'pl_batt_obj_00000136.png', - 'pl_batt_obj_00000137.png', - 'pl_batt_obj_00000138.png', - 'pl_batt_obj_00000139.png', - 'pl_batt_obj_00000140.png', - 'pl_batt_obj_00000141.png', - 'pl_batt_obj_00000142.png', - 'pl_batt_obj_00000143.png', - 'pl_batt_obj_00000144.png', - 'pl_batt_obj_00000145.png', - 'pl_batt_obj_00000146.png', - 'pl_batt_obj_00000147.png', - 'pl_batt_obj_00000148.png', - 'pl_batt_obj_00000149.png', - 'pl_batt_obj_00000150.png', - 'pl_batt_obj_00000151.png', - 'pl_batt_obj_00000152.png', - 'pl_batt_obj_00000153.png', - 'pl_batt_obj_00000154.png', - 'pl_batt_obj_00000155.png', - 'pl_batt_obj_00000156.png', - 'pl_batt_obj_00000157.png', - 'pl_batt_obj_00000158.png', - 'pl_batt_obj_00000159.png', - 'pl_batt_obj_00000160.png', - 'pl_batt_obj_00000161.png', - 'pl_batt_obj_00000162.png', - 'pl_batt_obj_00000163.png', - 'pl_batt_obj_00000164.png', + 'battle_terrain_grass_player.png', + 'battle_terrain_grass_opponent.png', + 'battle_terrain_surf_player.png', + 'battle_terrain_surf_opponent.png', + 'battle_terrain_path_player.png', + 'battle_terrain_path_opponent.png', + 'battle_terrain_ice_player.png', + 'battle_terrain_ice_opponent.png', + 'battle_terrain_mountain_player.png', + 'battle_terrain_mountain_opponent.png', + 'battle_terrain_snow_player.png', + 'battle_terrain_snow_opponent.png', + 'battle_terrain_indoors_player.png', + 'battle_terrain_indoors_opponent.png', + 'battle_terrain_sand_player.png', + 'battle_terrain_sand_opponent.png', + 'battle_terrain_mud_player.png', + 'battle_terrain_mud_opponent.png', + 'battle_terrain_cave_player.png', + 'battle_terrain_cave_opponent.png', + 'battle_terrain_puddle_player.png', + 'battle_terrain_puddle_opponent.png', + 'battle_terrain_elite4_aaron_player.png', + 'battle_terrain_elite4_aaron_opponent.png', + 'battle_terrain_elite4_bertha_player.png', + 'battle_terrain_elite4_bertha_opponent.png', + 'battle_terrain_elite4_flint_player.png', + 'battle_terrain_elite4_flint_opponent.png', + 'battle_terrain_elite4_lucian_player.png', + 'battle_terrain_elite4_lucian_opponent.png', + 'battle_terrain_champion_player.png', + 'battle_terrain_champion_opponent.png', + 'battle_terrain_distortion_world_player.png', + 'battle_terrain_distortion_world_opponent.png', 'pl_batt_obj_00000165.png', 'pl_batt_obj_00000166.png', 'pl_batt_obj_00000167.png', @@ -54,14 +54,14 @@ pl_batt_obj_sprites = files( 'pl_batt_obj_00000179.png', 'pl_batt_obj_00000182.png', 'pl_batt_obj_00000185.png', - 'healthbar_solo_enemy.png', - 'healthbar_solo_player.png', - 'healthbar_enemy_slot_1.png', - 'healthbar_enemy_slot_2.png', - 'healthbar_player_slot_1.png', - 'healthbar_player_slot_2.png', - 'pl_batt_obj_00000205.png', - 'pl_batt_obj_00000208.png', + 'healthbox_singles_opponent.png', + 'healthbox_singles_player.png', + 'healthbox_doubles_opponent_1.png', + 'healthbox_doubles_opponent_2.png', + 'healthbox_doubles_player_1.png', + 'healthbox_doubles_player_2.png', + 'ball_status_indicator_opponent.png', + 'ball_status_indicator_player.png', 'pl_batt_obj_00000211.png', 'pl_batt_obj_00000214.png', 'pl_batt_obj_00000217.png', @@ -92,8 +92,8 @@ pl_batt_obj_sprites = files( 'move_type_status.png', 'move_type_special.png', 'pl_batt_obj_00000247.png', - 'pl_batt_obj_00000250.png', - 'pl_batt_obj_00000253.png', + 'battle_subscreen_cursor_corner.png', + 'healthbox_safari.png', 'pl_batt_obj_00000256.png', 'pl_batt_obj_00000259.png', 'pl_batt_obj_00000260.png', @@ -103,7 +103,7 @@ pl_batt_obj_sprites = files( 'pl_batt_obj_00000264.png', 'pl_batt_obj_00000265.png', 'pl_batt_obj_00000266.png', - 'pokeball_throw.png', + 'poke_ball_throw.png', 'master_ball_throw.png', 'ultra_ball_throw.png', 'great_ball_throw.png', diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000130.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000130.png deleted file mode 100644 index 33cb9a8530fc4085c4b75c51bb7fc90647d84d14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 975 zcmV;=12FuFP)lL~0T!FBT)4>j7C~URqHdtgJW^Wi zM~;Iuaj^nCkj>%Kydf!#X^V@_aE4b6-HVhiQJXeuM+S7Qz`ejaQI{5;ekl{l)PPo| z-3bKTQfyHm-fb!}u{Hp2sEILBC!>!&fRfT%iZv*aL5V`iFltG-NGVnXT1~+Zlsz7* zQhE}eL6s`{eM;d81?r{VDp6gnYl3c1-W=D<{U$&{``ufn?WS7M_NOw`T{2pzz`MVI zpml9D84+X-pB7w$JLe)bK1At!Edz@~RZI}-(K&1RHI#u>KZ=1M5IGP>tI2BTiis}9 zrl&Lj6O1Dc7|j%iYj}pph#L9=gmbW_jE;b3fa1Y}bDr31k1E!k@J3Y(;o3s;5hX*X zDzOP(!LawRPKk*ZvXM5IvadG9;-Ow&`GV3c!4t5smkfImRJ8bMo_3aa3GhoNJf7xhf#s-K zgZHq#b=Y3fh$hME{TYxG>@IB`}-ULj|m|2y9QezTt83}-mQe}kNJo+J+~@H#}ykqG81dC{KctDKwC zeL@QIiXyVwNp9LzE;)?xqOE)-^-OcX>so<3N&+`2MFI_Acq(5#3b~=wc9H7YqmWA& z^Cb%9JXt_Qwz;DuYvjms9ySBCJCBqmR`=g!_%_JoaPX7A|dA3$!~XwR>AbS z$ymeWv^@z$rSlxJtN=IYQa3!o3lt;|nW6x((fLM#LnaTEoBick3}k3&7YSNdgK;e1oM})Uz#l^%1V|H5Mh- z?W9-u$tKPv8R4G+w$u4ai*W7cj374`-ZME2G`N8vhGtB^S|>b2HEowxw$yIlhh|6N zqGc`~tc*Fy7LM7FmGxy=imBWg#1F`6N_wNJU838gKEJP)INDHWdn$I11KA)Qq+pSs=l-f2xb9!*#A{!^WP7`4)9{w0iBr( z@x{3&41Su=#v?IRr-^902h zGh`U1WkOvH!*GO%kAo4T>Ys4A67ocQ68PYj|v8*c^lHBONj6Fc{OkS1Y>$ux;D$>#U?HOn%Xc*bDHk;4l^ zju*v~Deh<46j{c)nMXId8^_>V<2~!DIo2jMOs!KBmy35$|J7n8|4h?cqHwT41X9s&zU4ADGphwP+`SHHC3R;(-4Ft^g>iWo6LiX*6rD<&U zpf1qB3tT(Y-n4t&YkH0@wb=X5;-?9;s)3d^DC#)Z}Ju!kVKtsbOlJns_F5;-UWvwJhCpUcEQ&POxsS1AHeds903?`!od~7ENNa+O)8vO70N*LYMNWP87F#5ckK$0ZG zxe`*0;eIzUk^}_3>LfHe6iNYYsyfm5KA)(Y3s^T{xOjZdi2lfrpT;q66tOJc0?(f>sd^0P$D=MotKL7=|ET1px%XO>9B) z9P^nw&??q7zQfI%jaaxjHjjfkKk&-dNP@ z;`mBg)axjmOOC0-f#uQBKF7Ji!Gew0h(9no`ZAypj~J2pq+tW;Sf_V|Uh_(?a+uv>X_^kHF8Al)i)D1edxGiGPbjQ&rm&LVtP6CAI)WV&=Q>{x zdMjOp0&R+tv%e(J#Y1z%$_`&aD2we%eKOVB-29}&viQaGN8J>qNB@z~zgRp)Xz zQiJaf5cFwoYQ_925{meU1I^1l$o&f4AOD_g(4awse-5QS)FmkK+LR(u(}#v!!MF-J zs@jKG_mDzzyE&!`W=)4=DrWq0(+4uW-K1W^lPh7$*i8Sch!^(6nPog5*=5vc@P+YW z^n}!&(3^gTPC85bNh*pK^K_>ij^re1@cm=IcO_kN3oZKb$1M>2s~bv}5S}1>49-Qh zm$VpLM8Gx1UMqzYBuLy!p^q=qAGDk0pz>-}*RSZ*l)Y69=IbtE3sXeAMON{34*R!r zt+P)QAo#{!7IU2Qs6_Dme%4RP`7JnSdH`OZJF833ecMa+fHyefa0VO`a$qJp+Dl=N zuynhxBFJpNB)rVp8zNX8AB+EUf0I|&Xl&O5*+SoB308$=6kP|2eaB=hktGU1`$J+~#oIv(<4+^3rY;9`) zR6&)mKz=jR^9GnlDGq9+k^fy1O7}_k4P>7rl>E43VjLF{5D9@$#HFXum^Troi6F*2 z$3;$%qOE)|J|CD0RhCYRTnmHOJ!Qoy?cy6@vZU!Ybr4(W%19!mB|o zeeS6U=au5Q4~uZteFm3&&bd<0XFlV(FT-+_Z1VjI?vH;b8)>AGM*cY|Jv zC2kmDS9_2hkw;O9lkMa-gUw>1u0@Vi;Au2)q!v%3fn#%`MgzP1!6H;Jie%H&KrpgT@x#X~~7z7a4Q|qh4&3NQ|jOx&Hwfnvyn!AQ+@)IbvH{9c0IHJ0000@VEii$Ia zfd7FGo{Fr3;XvG^6gnJ~zd(In9bJ9gUde_IX+c8zai#Oz_v(G#`|+U97ZzCH|BD{b z@7-#me=AAm=sp&Uz^eC%U;FpD5-N%)c}l#0zk!F&xp@*+Q6g~}ok)uJg2ZD(rIJ+l zQSdn^JE!F5Gx$emXXxw`ZvV|bT-SBE%2Ma&cLd)TasG>qarRbV16~oa9UYe*^l_U; ztp0`mlK+7IXZ}0%R{t>QMPK{`9MPPXC9F*>(J=gK3=Rawq-e%F8co}7bKxkF)dZ#? zFjKlgGd01<02QV1LTe3sA~+@vHg(#$QVwc|zwL-bkKnoja>610?j|G|jCCn4pq*3D z6}2-ZZdo|pYCvhdmp$$nG^dMRDdJ?7qc3S)6w$;I!A&{2mc`v(Xj&UnXHi|lwj4a# z7LY`=fn^eP_m!A4ZfmNy-N9}fyAJg&X?5>8O?;M|!nKl^FbBA_gsYmTVoptV>y8Ti zhEwOBA$FGu4jmh;J+c;^DlzV;-KIE6P6hEPlBRhMPMa{qJSPPgioJDnW;8J<4W-m@ z^`@6;FBpqbda};Y(Zjof2up$x)eXhGar-}+rOK~}O9@JOx`N;b@NYER zS3twO_Sbl@B)H;^H+Ib-OD!#tf4amG)3KDO0tNzjR85Y^`EIGv6JuPyL#*_Ewf z92{G$6o=QcR??uSU2~$bm%Pwu9W~pM z*Q`Vmo9(S80gX|2SoB!170PqLNi56D+5A+vTR95jAkX25QY}Ef1X7>Vo9AFDvpuyY#UpqHQ=Z$R)4rHlXbz2EbJYmiAc>L_K zhi=?xgAM+7Ai7=Y@PI;S2c<}Ho1t7`e*(i%(njl;C+$2?3Q)A3@T{M+r>LT?EhXYf zQ-iCz2Cp-k`1_Ejb;r<|QS|)n7lvV4iF*y*z9>!C9gp2vFR3O~@*L$5RRE<5 zF|_EG4AmV)psgECjcyxsg^Z|Lfr@mS=d;5aK<=PJ*Ra7b7zSB+*LyGlFrwG~Z_e`_ zbUprhuT@Mj5ZgeU1~R=tFfW~m$iMDf0V4;gXqAd!sj(*lI3Eip;`Q}Z3=#)}EIKSO z8rvB=c43vyYNiHvHoUOCb>O^oW^n4F5{Vg&?5%1;YjJNh3P=Domqt0h|dv=vP`?{%8%kP$-Jh5b3#LV#afM-WO z4dm?Mvhb>%XsPa;kO3#2WwmN?xu6${r&T4>Ujbj22ymzjFjS(Xx!4+*%MyKGm$Z08 zkJwdpB%R5Ki|p!U#H)sVlifNpk~#ts7WTVhXt_^XeY?|d9jq;m%OSKC#j)YCnIHHDyg*uVrc^q?PC9X@vmqVt~8Zw4VSvg$>B*Y4_I6okhf?y(@h?wmCIh{Ly zzg-VSylP58HY2ac^S0TPf>e{FbMbLqrqzb|I0>0E z19O=NgOUv$I@~%60{s(80k&Q!5H_b$8&;WPp6B^VWsD^o@|LFx2BT4Rqq!5W7mevr1FNIswZ<93=5Hfjv+ZD_kcomssKF}RUJHpGHcn0`H-@t-6a&o^y?V1A z@$4QC6&xU1OoN@b&|q$pWR%qi3tQc`&Ks|JQttbgU3oLT`~8Z{md=@5o-M@2t7Lq` z`}OZ+hYlS&TpccZ9;&|V^a57}9_>A|^9!|@bD65=Z&2Ky|8kzt8t z|6in7r&HJYbU`fGv0$7GHqxC9tTdcAjY-7YM8~TVkyr0i8}X&jLv3%ir`S5O71b!K zcwdpAI#_L=F9sLxo~5ayx;LsO2y_BC>W!TxeAJuk55AKfI$R8&O1Lnr3eGNy00000 LNkvXXu0mjfhTiiS diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000146.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000146.png deleted file mode 100644 index 3876938c4be98bfb4e8b1c41983c619add353b09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmV-80>}M{P)uasX6(+}xnduJf)_Dp9FLia$n4Jf7I& zoy4?9qY*~XdX%-{WroWDa*{5K2O`CrX(*rLmRto^PJA2qHvOB zWY8S+q_~#KGU3@nJumM-uK*Mizyxb676N=vxLeWwmJJmXjGZ`@r6GRA*eCl9mE7(i zWi24L=uM;p)4-!GnRo3ldFz!vz?1*>^VlE>H4)7#Ybaw)x&6N+Hr3IQvNb%3We?(CGT z!v1+{7aCZu)O$`^(U8=U=D6WC^@5FBwaKM?y}zAh4J!BQPt(}&99ddVZ;*GHkL3s> zj4;AA!FkU^%A0}`%_?5XUcHWJdIK=-k;M3xs&f z$*x`d`RZi7)E%DQe$itNWLG&L6U&JAFCF&bJ(uWi1wi6JAcC>a3|Qly4Bs96_pk1J zbvC`Uwz#JkLoa4$XPJPA;1JAt6`NQLQ|r{kXj;{&um1jg9_s0(U5cbxa^2pyb=;*$ z)HHPE{1DDTl_p13Z{!3*5gL0000&?^#J|YTXF;X&IkfqP}4N_BW%KJ za35xvmmOG&F{qYW{<=gEYVJWI!f14v7^4(P2}LF}T?D~iglV=khJv8T2}0*7GMO!c zE#h!G6j8zC`WVh)(At==$VvH;l;1#YQCEaV6gPQ6@fjq-)zoAj;CC7j-{RUkW9&BG zMkJ7+JY5>PUCU`QVaUD%wvsK}-Jc2NKO2fzoLc*iiH((6>lWjP-Q~>}vxbwW&#UIZ zrjZzyT8DG7^McfWwb%(Y6yYJVF%K>v4eY=@#Fq(d9& zVy)nGjdw+~g<$`A?kQw)rB1@iTx)1|YoBLacK2BKi#(i!-#y=ge~5fj8rkvh1|!F9 zVHu8fmE6hSleN@ROD(@noPADMe1TSS`}R%pIq4*@eVtEA_Dvb=f$O)@psRT)=fIN$ z_V<lp_NJp+X*0rDd?tgpUm9Nk8;Xq#ImPcdeHU&QH+}IbEybo?(HOCWa zLy21=eHeSskQKK@F8`5#hw@@Q&&T{Z@7p!ufQi?z6UO#P4tf@Ip2Q|*FR>11G4;H3 zotCY?%6-mP_f6vhqJ5+tmE~ReMMOGYdtdJld3~B!MalXoo$YS}bR+OD*3fABO5!$lP6b=>Px#07*qoM6N<$g7RA&a{vGU diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000150.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000150.png deleted file mode 100644 index f969b19c961ebc37db8d504b19bc26313b29974d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1040 zcmV+r1n>KaP)pOO$U$;boZTOjx-xr7`bY(W zu65H;is&tQ%uPsqA-=m;Nx#sI&8LjS#16g&=h`ZNjcfg_uaMkH+nK)nKorDnrl1GB z?_DqHmiZ%1xNm!IfHR9JP{VKOrJ^&W?1V$gPJzc0e@G+tLlUcsXp~VB*0t|sW(cgq#mVlW6@McNDQer$NMc)cM%}M6Q(31gV`(MS=!eC@f z8N0g0wxmiouaH#fsw5WH9N5%>VHnUX#pq}FuEu($sTWFkMPZ1swCIFO46P0T^R?)3 zWAb>ITxNjytov( z67BO~QSzX^&xrY-F|4F}apmwuOx9Sep4CdJ*4bs{Dd;;L4}5HH00nODMV;ik(rTnP z`VL)zrFvb}S+ESs;-Y*Zw&wVC)wQkoeRbt6o3JP*D)Gun&qb z_b+eAM;vj)e;2v|q+{T%9^f@osk6eVW)SnE;_QSPrt7l zEzxjHMmji|rV;C1gb<_YE0PsdH%*)r3D2paO6ychvBn++e$=Giw4 z8@UK=P4hEN#^&=r-SZ*&YO&LOcSpCFP4ti7XykrC!i#REn4MkJa~m`ICE_|=F}Kmd z6-4K$MPl#Z1md90gutby^$^pO-i7xrwcjDXaNEvoznnp$%}9da<*S5pb2zsNhOt^_ zP4u1Bj$~(IT}%(@CgL2tFXzSg?**bPX=5G-6kJg2vS#&6XXTwjiHir1k(KafYy*MWvE; zSv2AXo$uLk6KGmG67we|QeNZu<;8xs>ld2IK^0W+zr(WtZLXj^lN=i#nV2~!rFe#= zFey1!QKU9dX-aaY%U=|7phW5-rSv7w9@&dRCav2cT?>Azy z47EHl#Cz>M3vn_X3yfnaT9{@}=o?RQy!aszh#x#iF|S<@CX`O}m0UT{8B73hZKAy| zgTXKZJ-=55V$LmWs=+XCos?ncE?NJr#g=>rsF}VNn~nkQ%Fr%`2k3ZL_k#h+nSm`D z_{?>{aVrwujoA4eEggEW#k^_8++{wm?t*sXas3uW>qxC5rCM)N3jVFTLTLw{(uSX` zOL)wtFH;qE?qEFRr!WdRgnVngzr~ELx%FWeon3x8&$ToXQDf}n_p95>&&OBHX<6I* z7^7MX@(uG^xoA$)P}Jx#nKLiy$T)I``gkHRbcX8 z+EAok?=yuw6d;0OUp+6`kBGKpJ2~7Y*(;oAAfjqP&x>w}sIZl?ySNI$TgZQ}$V+qL z(q^poU<VXC+!h@4okQ;>KYa3Di*$^uQ^n^BiPy^nvFK3Wy>RY#zM?jyc^#aF`T z_>q)EUk9DifIE#HBq%1!f^eL8aQB{!$*#ttJcYcy@}j8y!IVt9?C!~=WqIf_i?ucb*ZM7di7ezH zG3OCq4pY({NlQ9HzUt5O71ohmQMMn(B&kdWQ&eHzcfrcFPx=00000NkvXXu0mjf?h%z; diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000153.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000153.png deleted file mode 100644 index a88950a40c8933c1729a65ca1009362ebb551926..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmV;I0%-k-P)uuszN+to`9 zAN0U4{KB~a;A4cxOcW>zkBETuTs_@9jETT#s=RxKaX}?4oH|SZD8L0i<5VU6tqE!k z6hsp|1_Z&n2W+*5UK3~oPE@oS+OL2I7t&xs0957pL~zgbj`TmO-_gJ=RhSZXdR`@c zTvN{LNF84JA?ykE7zs3>hZ13L4-z{PY{!9)0u4e}&XlY#t>4W6%_f|}gTLYNA!f$W zoe1>PAcjW~Alj)P2?|2p_EX-WVO=W%O zlU#J&XLV)`)VGu$1^?O);=JMp?C?Brem{772zZ?gZduIN_|gTuf|8^?ee%#Xl|KjE znOFv7AdNpSF>+}yXIF+jPo$BTDLJ+$^NiKIb*L_W?IpFsasH;tST1eqnxIy)iSpWh zG9KHWY^KtZMSEyZW6AM!8AP2h)&CPz{F}ssgNQ?1@guP8b{xAhqvZ7+ zj>}U@D6Xj=|KLO8gzTL&B{LquZ-FRy8E)X+{C?K&Wgw>q8(y}VzJTm$whLQcw)Iym xji#igtEtlpdv4ed)^y1O0tQ}rgO{`G_X*u(u)4|5iar1U002ovPDHLkV1hVLINtyO diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000154.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000154.png deleted file mode 100644 index 9ed057e02fb5c10e9bd840cba8b723ed00e0c90b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 774 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 lawW~-`U~I55k~lJ@B{IEF;DzMXck zu-QPs^<{%zu?KUW;$%-|1IzTJ$y^GoDv2{q912)_G!M+kP*r4H9jkZJ_y3FkDhFTG zZ}t=t{rZ2_o{s5{*8lAnHq6&uv!!TlWVpJ1zI6FZ-Nwu#Q=gueofz9!c3`W+s%h7c z>*&0m-m|t*nqhkkb0+t3W_{KJ%O7Ybh?oZ)5S3F={Gi3GTyw&K>yhLy)BP?Ea}@Q-aiQQfi$+UozZ)4@lM(1ZPGY?!RA1`Wudpmgqbd{p6X35 zj^Li1nXK>S!p7!f8$YLST6XLz2m9LcOx?wcw*6v#bpFtX`%7-Qg5uKC)z4*}Q$iB} Dd6(G2 literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000LB-WxQCVJ&L5_xwv)zQOfvOoxg8YIR9G=}s1F~B^T^vIqTHj7P zSlDbJ;QF#buh@e*PjRv*vw>xL(qt|LR+Yq=CJqIxJ(>q*WT+}Ku8!3^>HGi1f0ctT z>Nk4|iGKY*Yfs1YN9+Ig3mfL^uGvzwHZojYKVQ21rEX*9k*QBl%TA2#D?6~&Vb!$j z$8~gGPw!dVD9x}vhB=e_II}+Mf#nah6GY4d4v5OBD1OjlR<1eW!1YM-m+5{Nhq;P^ zo%fs+zQk^?h-6y8$+xlcWux;mmzf8yswUQ`RZBm9HKmn7$NT-JxbUZDSJ`e(OS;;< z({eA%nY}S@To}UxmhA}yf_nALkPDwCJGEbMX!trmu2}IxlF*8KvL-By&XLCyOB8nK z7cBpLgz1Drl6j)tubockni*0e6FKXOPB7|m3E2IyG->9LnU~0Z;^7>XKkkv7`%)hi z@>krlX8NGW`rmi|vL}x@Z5GtrX<+`aNvihon%utv3vyrNBz3I*+_KPHW5P_AS5NgO z7e{c<&P>+#a$#fhv5lY8H!VAMm4kh4d8Y2-McaO{K01Hs!~G?FVdQ&MBb@ E0P{Z6(*OVf literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000o&6cbw-BHC^j!}+=j^UM3M}evtOM?7@862M7NCUE4JzX3_B3j>0 zJ6PCkAmIA4L9f_@IZtu2C$oWNdeUSr1y+^BnI;YetUa0sW@M-;GOmu*JL&uX#ebE9 zFX}gY3W#o^Sv^FwaT|ZyC{H1PV=8>sSPs>h>?JGO5)nV1N z>&JC;UQh2?+bGSjJ%%}x`#7^c>w)DDv=c;lTAs@|Wp;7l*lu zf}QuA6u!i6uZUz?z{$6<@@1p*GnbhMuBs;1s8vfpel?|)LC5?3rnvB@W>?v6PD{Gl zz0-0p%bC3~Z(JC|1D5Rx1cG|?%#aJ8COfrXaA^2CKdxBuLXyymd$J}hjLwnA6iXC# z=oc*ie1z$QLXvr+-LIWa=b9N(A`?05icT=h{@k+ATVujZmsd~q zCKpF=&(2KN_i|xl^RbPe(>EFMg{vd$@? F2>`TT+4cYc literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000xL(qt|LR+Yq=CJqIxJ(>q*WT+}Ku8!3^>HGi1f0ctT z>Nk4|iGKY*Yfs1YN9+Ig3mfL^uGvzwHZojYKVQ21rEX*9k*QBl%TA2#D?6~&Vb!$j z$8~gGPw!dVD9x}vhB=e_II}+Mf#nah6GY4d4v5OBD1OjlR<1eW!1YM-m+5{Nhq;P^ zo%fs+zQk^?h-6y8$+xlcWux;mmzf8yswUQ`RZBm9HKmn7$NT-JxbUZDSJ`e(OS;;< z({eA%nY}S@To}UxmhA}yf_nALkPDwCJGEbMX!trmu2}IxlF*8KvL-By&XLCyOB8nK z7cBpLgz1Drl6j)tubockni*0e6FKXOPB7|m3E2IyG->9LnU~0Z;^7>XKkkv7`%)hi z@>krlX8NGW`rmi|vL}x@Z5GtrX<+`aNvihon%utv3vyrNBz3I*+_KPHW5P_AS5NgO z7e{c<&P>+#a$#fhv5lY8H!VAMm4kh4d8Y2-McaO{K01Hs!~G?FVdQ&MBb@ E0QLXXkpKVy literal 524 zcmV+n0`vWeP)Tbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000eTpg=-()a(1|0)Mx z)Nl3_68-vr)}D^(kJkU~7dFh-U9+WVZDhE*e!g`1OWnrIBU7KAmYo>eS9V~l!>Vc5 zkL&2Xp5C*zQJP_U409&;ab|ti1Ir(1Cy1B_91xXLQT(9AtXy-#f$NdvFVp=l4s#U+ zJMTFue2Lv&5y`ZGlW$|?%SPvCE;A2YRZXl>tCoKJYDz1Ej`#abap6zRuCm>nmUOjy zr{!LjGkas+xG;tXEZY+Z1oi5fAs0SPc51)i(C~GBT(RPXB%u}eWKCEYog;lT_{FHMxHU7UaIjN$Obrxn-fZ#)O$Jub%2n zE{@=yotdof<-*41V;euGZ(4TjDhK=8@=V>ui?;n@eRTfNhxTbto*J zezeh8`JTp^@QgtXd!`t641yO7rx##IZG+r&^ z3h&pylOslq7;$&F?RlvFva`2D=SBAOS|dB``7?ywpf;~3Myd{u za0Clnk=nhVuP*j>AxUrkjmHr>lH>v^A-N+b>CI2hbtXG|Zp z|9_EVn}@dZ>6)?Tjy1>0!TPeZflmqNLt-Lwn&|kdf-iBR+kdw{5B0nx3J(=sN4lbn zqSEL{p=Eur>gJatPtJ^D>L_e_{d$0<3;;{Lac6}Y+RgO`-^mdpZiX+U^eyvCdGyc# O0000QmLBz|jOlhxB=l>VA0iP()h|q}9{a&t;ucLK6TQq!}Rq literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^91ILBKnMgj9ji2el%l7LV@O2n+ar#G3=BL>3csgc mdwSzw^B0#%DxN@e={Q@q`iDnCY)2JAnmk?oT-G@yGywpk-Wg{A diff --git a/res/battle/graphic/pl_batt_obj/sprites/pokeball_throw.png b/res/battle/graphic/pl_batt_obj/sprites/poke_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pokeball_throw.png rename to res/battle/graphic/pl_batt_obj/sprites/poke_ball_throw.png diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 710e07b89c..fdf8b7b53a 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -44,9 +44,9 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { }; /* -* Maps a battle platform ID to the NARC member in pl_batt_obj containing a sprite for it. +* Maps a battle terrain index to the NARC member in pl_batt_obj containing a sprite for it. */ -__attribute__((aligned(4))) static const u16 ov16_BattlePlatformIndexToNARCMember[] = { +__attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToNARCMember[] = { 0x87, 0x91, 0x7F, @@ -73,7 +73,7 @@ __attribute__((aligned(4))) static const u16 ov16_BattlePlatformIndexToNARCMembe 0xAF }; -__attribute__((aligned(4))) static const u16 Unk_ov16_0227006C[] = { +__attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToOpponentNARCMember[] = { 0x88, 0x92, 0x82, @@ -101,10 +101,10 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_0227006C[] = { }; /* -* Maps a battle platform ID to the NARC member in pl_batt_obj containing a palette for it. -* Each battle platform has 3 palette options for different times of day (?) +* Maps a battle terrain ID to the NARC member in pl_batt_obj containing a palette for it. +* Each battle terrain has 3 palette options for different times of day (?) */ -__attribute__((aligned(4))) static const u16 ov16_BattlePlatformIndexToPaletteMember[][3] = { +__attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToPaletteMember[][3] = { 0x7, 0x8, 0x9, @@ -195,14 +195,14 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) v2 = &Unk_ov16_022700CC[param0->unk_08]; if (param0->unk_08 == 0) { - v3 = ov16_BattlePlatformIndexToNARCMember[param0->unk_09]; + v3 = ov16_BattleTerrainIndexToNARCMember[param0->unk_09]; v4 = 20013; v5 = 128; v6 = 20005; v7 = 129; v8 = 20005; } else { - v3 = Unk_ov16_0227006C[param0->unk_09]; + v3 = ov16_BattleTerrainIndexToOpponentNARCMember[param0->unk_09]; v4 = 20014; v5 = 131; v6 = 20006; @@ -211,8 +211,8 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) } SpriteRenderer_LoadCharResObjFromOpenNarc(v0, v1, v10, v3, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v4); - SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, ov16_BattlePlatformIndexToPaletteMember[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); - PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, ov16_BattlePlatformIndexToPaletteMember[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); + SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, ov16_BattleTerrainIndexToPaletteMember[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); + PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, ov16_BattleTerrainIndexToPaletteMember[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); SpriteRenderer_LoadCellResObjFromOpenNarc(v0, v1, v10, v5, 1, v6); SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, v1, v10, v7, 1, v8); NARC_dtor(v10); From c4f1a2df175e51e68dce28313af0c3f97721a7f2 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Wed, 16 Oct 2024 09:57:49 -0500 Subject: [PATCH 12/26] apply clang-format to code changes --- src/battle/battle_icon.c | 58 ++++++++++++++++------------------ src/battle/ov16_02268520.c | 10 +++--- src/battle/ov16_0226871C.c | 2 +- src/overlay012/ov12_02235E94.c | 6 ++-- src/overlay013/ov13_02224500.c | 2 +- src/overlay019/ov19_021DA92C.c | 2 +- src/overlay070/ov70_0225D9A4.c | 2 +- src/overlay084/ov84_022403F4.c | 2 +- src/overlay091/ov91_021D0D80.c | 2 +- src/unk_0208EA44.c | 2 +- 10 files changed, 43 insertions(+), 45 deletions(-) diff --git a/src/battle/battle_icon.c b/src/battle/battle_icon.c index d20674feee..ea65ed44fd 100644 --- a/src/battle/battle_icon.c +++ b/src/battle/battle_icon.c @@ -11,11 +11,9 @@ #include "palette.h" #include "unk_0200C6E4.h" -#include "narc.h" - /* -* Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. -*/ + * Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. + */ __attribute__((aligned(4))) static const u32 BattleIcon_NARCMemberMap[] = { 0xEA, 0xE1, @@ -43,8 +41,8 @@ __attribute__((aligned(4))) static const u32 BattleIcon_NARCMemberMap[] = { }; /* -* Maps a type index (e.g. TYPE_WATER) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. -*/ + * Maps a type index (e.g. TYPE_WATER) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. + */ __attribute__((aligned(4))) static const u8 BattleIcon_PaletteIndexMap[] = { 0x0, 0x0, @@ -72,8 +70,8 @@ __attribute__((aligned(4))) static const u8 BattleIcon_PaletteIndexMap[] = { }; /* -* Maps move types (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. -*/ + * Maps move types (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. + */ __attribute__((aligned(4))) static const u32 BattleIcon_MoveType_NARCMemberMap[] = { 0xF4, 0xF6, @@ -81,8 +79,8 @@ __attribute__((aligned(4))) static const u32 BattleIcon_MoveType_NARCMemberMap[] }; /* -* Maps a move type (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. -*/ + * Maps a move type (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. + */ __attribute__((aligned(4))) static const u8 BattleIcon_MoveType_PaletteIndexMap[] = { 0x0, 0x1, @@ -90,9 +88,9 @@ __attribute__((aligned(4))) static const u8 BattleIcon_MoveType_PaletteIndexMap[ }; /* -* Given a type index, return the corresponding NARC member containing the icon for that type. -* See also BattleIcon_GetNARCIndex. -*/ + * Given a type index, return the corresponding NARC member containing the icon for that type. + * See also BattleIcon_GetNARCIndex. + */ u32 BattleIcon_TypeIndexToNARCMember(int typeIndex) { GF_ASSERT(typeIndex < NELEMS(BattleIcon_NARCMemberMap)); @@ -100,9 +98,9 @@ u32 BattleIcon_TypeIndexToNARCMember(int typeIndex) } /* -* Returns the NARC member within pl_batt_obj containing palettes for battle icons. -* See also BattleIcon_GetNARCIndex. -*/ + * Returns the NARC member within pl_batt_obj containing palettes for battle icons. + * See also BattleIcon_GetNARCIndex. + */ u32 BattleIcon_GetPaletteNARCMember(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE; @@ -119,9 +117,9 @@ u32 sub_0207C928(void) } /* -* Given a type index, return the corresponding palette index to use for that type's icon. -* See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. -*/ + * Given a type index, return the corresponding palette index to use for that type's icon. + * See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. + */ u8 BattleIcon_TypeIndexToPaletteIndex(int typeIndex) { GF_ASSERT(typeIndex < NELEMS(BattleIcon_PaletteIndexMap)); @@ -129,8 +127,8 @@ u8 BattleIcon_TypeIndexToPaletteIndex(int typeIndex) } /* -* Returns the index of the NARC for pl_batt_obj. -*/ + * Returns the index of the NARC for pl_batt_obj. + */ u32 BattleIcon_GetNARCIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; @@ -191,9 +189,9 @@ void sub_0207CA88(CellActorData *param0) } /* -* Given a movetype index, return the corresponding NARC member containing the icon for that movetype. -* See also BattleIcon_GetNARCIndex. -*/ + * Given a movetype index, return the corresponding NARC member containing the icon for that movetype. + * See also BattleIcon_GetNARCIndex. + */ u32 BattleIcon_MoveTypeIndexToNARCMember(int moveTypeIndex) { GF_ASSERT(moveTypeIndex < NELEMS(BattleIcon_MoveType_NARCMemberMap)); @@ -201,9 +199,9 @@ u32 BattleIcon_MoveTypeIndexToNARCMember(int moveTypeIndex) } /* -* Given a movetype index, return the corresponding palette index to use for that movetype's icon. -* See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. -*/ + * Given a movetype index, return the corresponding palette index to use for that movetype's icon. + * See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. + */ u8 BattleIcon_MoveTypeIndexToPaletteIndex(int moveTypeIndex) { GF_ASSERT(moveTypeIndex < NELEMS(BattleIcon_MoveType_PaletteIndexMap)); @@ -211,9 +209,9 @@ u8 BattleIcon_MoveTypeIndexToPaletteIndex(int moveTypeIndex) } /* -* Returns the index of the NARC for pl_batt_obj. -* (This is identical to BattleIcon_GetNARCIndex). -*/ + * Returns the index of the NARC for pl_batt_obj. + * (This is identical to BattleIcon_GetNARCIndex). + */ u32 BattleIcon_GetMoveTypeNARCIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index fdf8b7b53a..5a089b878a 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -44,8 +44,8 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { }; /* -* Maps a battle terrain index to the NARC member in pl_batt_obj containing a sprite for it. -*/ + * Maps a battle terrain index to the NARC member in pl_batt_obj containing a sprite for it. + */ __attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToNARCMember[] = { 0x87, 0x91, @@ -101,9 +101,9 @@ __attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToOpponentNA }; /* -* Maps a battle terrain ID to the NARC member in pl_batt_obj containing a palette for it. -* Each battle terrain has 3 palette options for different times of day (?) -*/ + * Maps a battle terrain ID to the NARC member in pl_batt_obj containing a palette for it. + * Each battle terrain has 3 palette options for different times of day (?) + */ __attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToPaletteMember[][3] = { 0x7, 0x8, diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 7a7ad1fd9e..a30bd3f9aa 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -16,6 +16,7 @@ #include "struct_defs/struct_0209C370.h" #include "battle/battle_display.h" +#include "battle/battle_icon.h" #include "battle/ov16_0223DF00.h" #include "battle/ov16_0226DB7C.h" #include "battle/ov16_0226DE44.h" @@ -59,7 +60,6 @@ #include "unk_02017728.h" #include "unk_0201D15C.h" #include "unk_0201E86C.h" -#include "battle/battle_icon.h" #include "unk_0208C098.h" typedef struct { diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index 1f6e65f305..af994f89ef 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -129,9 +129,9 @@ static BOOL ov12_02237694(BallRotation *param0); static BOOL ov12_02237474(BallRotation *param0); /* -* Maps a ball index (produced by ov12_02235E94) to NARC members in pl_batt_obj. -* These NARC members describe the sprite, palette, cell, and anim to use for that ball. -*/ + * Maps a ball index (produced by ov12_02235E94) to NARC members in pl_batt_obj. + * These NARC members describe the sprite, palette, cell, and anim to use for that ball. + */ static const int ov12_BallIndexToNARCMembers[][4] = { { 0x120, 0x5C, 0x11F, 0x11E }, { 0x123, 0x5D, 0x122, 0x121 }, diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 7bf5dffe53..78058b50b8 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -8,6 +8,7 @@ #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020F1DB8.h" +#include "battle/battle_icon.h" #include "battle/ov16_0223DF00.h" #include "battle/ov16_0226DB7C.h" #include "battle/struct_ov16_0226DC24_decl.h" @@ -24,7 +25,6 @@ #include "pokemon_icon.h" #include "pokemon_summary_app.h" #include "unk_0200C6E4.h" -#include "battle/battle_icon.h" #include "unk_0207E0B8.h" #include "unk_0208C098.h" diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 5d7af499c0..e3c18dd635 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -5,6 +5,7 @@ #include "struct_defs/archived_sprite.h" +#include "battle/battle_icon.h" #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" #include "overlay019/struct_ov19_021D4DF0.h" @@ -26,7 +27,6 @@ #include "unk_0200762C.h" #include "unk_0200C440.h" #include "unk_02018340.h" -#include "battle/battle_icon.h" typedef struct { u16 unk_00; diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 9ec42c223a..e801f8b9aa 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -9,6 +9,7 @@ #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" +#include "battle/battle_icon.h" #include "overlay005/struct_ov5_021DE5D0.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay065/struct_ov65_0222F6EC.h" @@ -78,7 +79,6 @@ #include "unk_02024220.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "battle/battle_icon.h" typedef struct { u16 unk_00; diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index 5e68d8652a..f1e7159e5f 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -7,6 +7,7 @@ #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0207CB08.h" +#include "battle/battle_icon.h" #include "overlay084/struct_ov84_0223B5A0.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" @@ -18,7 +19,6 @@ #include "move_table.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" -#include "battle/battle_icon.h" static void ov84_02240424(UnkStruct_ov84_0223B5A0 *param0); static void ov84_022404C0(UnkStruct_ov84_0223B5A0 *param0); diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 51d6bf8e5d..d6d20feecc 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -11,6 +11,7 @@ #include "struct_defs/struct_020997B8.h" #include "struct_defs/struct_02099F80.h" +#include "battle/battle_icon.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" @@ -42,7 +43,6 @@ #include "unk_0200F174.h" #include "unk_02017728.h" #include "unk_0201DBEC.h" -#include "battle/battle_icon.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index b705724e0a..d80497f38c 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -5,6 +5,7 @@ #include "struct_defs/pokemon_summary_app.h" +#include "battle/battle_icon.h" #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay104/struct_ov104_022412F4.h" @@ -19,7 +20,6 @@ #include "pokemon_summary_app.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" -#include "battle/battle_icon.h" #include "unk_020920C0.h" #include "unk_020923C0.h" From ec4f1ffc50c60b2f5fc900e24896a130fdbb7314 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Wed, 16 Oct 2024 13:49:14 -0500 Subject: [PATCH 13/26] rename all terrain img/pals, better describe arrays using pl_batt_obj data --- include/battle/battle_icon.h | 6 +- res/battle/graphic/pl_batt_obj/order.txt | 162 ++++++------- ...al => battle_terrain_arcade_afternoon.pal} | 0 ...0059.pal => battle_terrain_arcade_day.pal} | 0 ...60.pal => battle_terrain_arcade_night.pal} | 0 ...al => battle_terrain_castle_afternoon.pal} | 0 ...0062.pal => battle_terrain_castle_day.pal} | 0 ...63.pal => battle_terrain_castle_night.pal} | 0 ....pal => battle_terrain_cave_afternoon.pal} | 0 ...000029.pal => battle_terrain_cave_day.pal} | 0 ...0030.pal => battle_terrain_cave_night.pal} | 0 ... => battle_terrain_champion_afternoon.pal} | 0 ...47.pal => battle_terrain_champion_day.pal} | 0 ....pal => battle_terrain_champion_night.pal} | 0 ...le_terrain_distortion_world_afternoon.pal} | 0 ...> battle_terrain_distortion_world_day.pal} | 0 ...battle_terrain_distortion_world_night.pal} | 0 ...battle_terrain_elite4_aaron_afternoon.pal} | 0 ...al => battle_terrain_elite4_aaron_day.pal} | 0 ... => battle_terrain_elite4_aaron_night.pal} | 0 ...attle_terrain_elite4_bertha_afternoon.pal} | 0 ...l => battle_terrain_elite4_bertha_day.pal} | 0 ...=> battle_terrain_elite4_bertha_night.pal} | 0 ...battle_terrain_elite4_flint_afternoon.pal} | 0 ...al => battle_terrain_elite4_flint_day.pal} | 0 ... => battle_terrain_elite4_flint_night.pal} | 0 ...attle_terrain_elite4_lucian_afternoon.pal} | 0 ...l => battle_terrain_elite4_lucian_day.pal} | 0 ...=> battle_terrain_elite4_lucian_night.pal} | 0 ...l => battle_terrain_factory_afternoon.pal} | 0 ...056.pal => battle_terrain_factory_day.pal} | 0 ...7.pal => battle_terrain_factory_night.pal} | 0 ... => battle_terrain_giratina_afternoon.pal} | 0 ...68.pal => battle_terrain_giratina_day.pal} | 0 ....pal => battle_terrain_giratina_night.pal} | 0 ...pal => battle_terrain_grass_afternoon.pal} | 0 ...00001.pal => battle_terrain_grass_day.pal} | 0 ...003.pal => battle_terrain_grass_night.pal} | 0 ....pal => battle_terrain_hall_afternoon.pal} | 0 ...000065.pal => battle_terrain_hall_day.pal} | 0 ...0066.pal => battle_terrain_hall_night.pal} | 0 ...1.pal => battle_terrain_ice_afternoon.pal} | 0 ...0000010.pal => battle_terrain_ice_day.pal} | 0 ...00012.pal => battle_terrain_ice_night.pal} | 0 ...l => battle_terrain_indoors_afternoon.pal} | 0 ...020.pal => battle_terrain_indoors_day.pal} | 0 ...1.pal => battle_terrain_indoors_night.pal} | 0 ... => battle_terrain_mountain_afternoon.pal} | 0 ...13.pal => battle_terrain_mountain_day.pal} | 0 ....pal => battle_terrain_mountain_night.pal} | 0 ...6.pal => battle_terrain_mud_afternoon.pal} | 0 ...0000025.pal => battle_terrain_mud_day.pal} | 0 ...00027.pal => battle_terrain_mud_night.pal} | 0 ....pal => battle_terrain_path_afternoon.pal} | 0 ...000007.pal => battle_terrain_path_day.pal} | 0 ...0009.pal => battle_terrain_path_night.pal} | 0 ...al => battle_terrain_puddle_afternoon.pal} | 0 ...0031.pal => battle_terrain_puddle_day.pal} | 0 ...33.pal => battle_terrain_puddle_night.pal} | 0 ....pal => battle_terrain_sand_afternoon.pal} | 0 ...000022.pal => battle_terrain_sand_day.pal} | 0 ...0024.pal => battle_terrain_sand_night.pal} | 0 ....pal => battle_terrain_snow_afternoon.pal} | 0 ...000016.pal => battle_terrain_snow_day.pal} | 0 ...0018.pal => battle_terrain_snow_night.pal} | 0 ....pal => battle_terrain_surf_afternoon.pal} | 0 ...000004.pal => battle_terrain_surf_day.pal} | 0 ...0006.pal => battle_terrain_surf_night.pal} | 0 ...pal => battle_terrain_tower_afternoon.pal} | 0 ...00053.pal => battle_terrain_tower_day.pal} | 0 ...054.pal => battle_terrain_tower_night.pal} | 0 .../graphic/pl_batt_obj/palettes/data.json | 138 +++++------ .../graphic/pl_batt_obj/palettes/meson.build | 138 +++++------ ...png => battle_terrain_arcade_opponent.png} | Bin ...9.png => battle_terrain_arcade_player.png} | Bin ...png => battle_terrain_castle_opponent.png} | Bin ...1.png => battle_terrain_castle_player.png} | Bin ...ng => battle_terrain_factory_opponent.png} | Bin ....png => battle_terrain_factory_player.png} | Bin .../battle_terrain_giratina_opponent.png | Bin 0 -> 157 bytes ...png => battle_terrain_giratina_player.png} | Bin ...4.png => battle_terrain_hall_opponent.png} | Bin ...173.png => battle_terrain_hall_player.png} | Bin ....png => battle_terrain_tower_opponent.png} | Bin .../sprites/battle_terrain_tower_player.png | Bin 0 -> 494 bytes .../graphic/pl_batt_obj/sprites/data.json | 24 +- .../graphic/pl_batt_obj/sprites/meson.build | 24 +- .../sprites/pl_batt_obj_00000165.png | Bin 482 -> 0 bytes .../sprites/pl_batt_obj_00000176.png | Bin 96 -> 0 bytes src/battle/battle_icon.c | 153 +++++++------ src/battle/ov16_02268520.c | 215 +++++++----------- src/overlay013/ov13_02224500.c | 4 +- src/overlay084/ov84_022403F4.c | 4 +- src/overlay091/ov91_021D0D80.c | 4 +- src/unk_0208EA44.c | 4 +- 95 files changed, 421 insertions(+), 455 deletions(-) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000058.pal => battle_terrain_arcade_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000059.pal => battle_terrain_arcade_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000060.pal => battle_terrain_arcade_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000061.pal => battle_terrain_castle_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000062.pal => battle_terrain_castle_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000063.pal => battle_terrain_castle_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000028.pal => battle_terrain_cave_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000029.pal => battle_terrain_cave_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000030.pal => battle_terrain_cave_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000046.pal => battle_terrain_champion_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000047.pal => battle_terrain_champion_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000048.pal => battle_terrain_champion_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000049.pal => battle_terrain_distortion_world_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000050.pal => battle_terrain_distortion_world_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000051.pal => battle_terrain_distortion_world_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000034.pal => battle_terrain_elite4_aaron_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000035.pal => battle_terrain_elite4_aaron_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000036.pal => battle_terrain_elite4_aaron_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000037.pal => battle_terrain_elite4_bertha_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000038.pal => battle_terrain_elite4_bertha_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000039.pal => battle_terrain_elite4_bertha_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000040.pal => battle_terrain_elite4_flint_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000041.pal => battle_terrain_elite4_flint_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000042.pal => battle_terrain_elite4_flint_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000043.pal => battle_terrain_elite4_lucian_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000044.pal => battle_terrain_elite4_lucian_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000045.pal => battle_terrain_elite4_lucian_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000055.pal => battle_terrain_factory_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000056.pal => battle_terrain_factory_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000057.pal => battle_terrain_factory_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000067.pal => battle_terrain_giratina_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000068.pal => battle_terrain_giratina_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000069.pal => battle_terrain_giratina_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000002.pal => battle_terrain_grass_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000001.pal => battle_terrain_grass_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000003.pal => battle_terrain_grass_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000064.pal => battle_terrain_hall_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000065.pal => battle_terrain_hall_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000066.pal => battle_terrain_hall_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000011.pal => battle_terrain_ice_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000010.pal => battle_terrain_ice_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000012.pal => battle_terrain_ice_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000019.pal => battle_terrain_indoors_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000020.pal => battle_terrain_indoors_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000021.pal => battle_terrain_indoors_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000014.pal => battle_terrain_mountain_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000013.pal => battle_terrain_mountain_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000015.pal => battle_terrain_mountain_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000026.pal => battle_terrain_mud_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000025.pal => battle_terrain_mud_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000027.pal => battle_terrain_mud_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000008.pal => battle_terrain_path_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000007.pal => battle_terrain_path_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000009.pal => battle_terrain_path_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000032.pal => battle_terrain_puddle_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000031.pal => battle_terrain_puddle_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000033.pal => battle_terrain_puddle_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000023.pal => battle_terrain_sand_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000022.pal => battle_terrain_sand_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000024.pal => battle_terrain_sand_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000017.pal => battle_terrain_snow_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000016.pal => battle_terrain_snow_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000018.pal => battle_terrain_snow_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000005.pal => battle_terrain_surf_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000004.pal => battle_terrain_surf_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000006.pal => battle_terrain_surf_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000052.pal => battle_terrain_tower_afternoon.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000053.pal => battle_terrain_tower_day.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000054.pal => battle_terrain_tower_night.pal} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000170.png => battle_terrain_arcade_opponent.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000169.png => battle_terrain_arcade_player.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000172.png => battle_terrain_castle_opponent.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000171.png => battle_terrain_castle_player.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000168.png => battle_terrain_factory_opponent.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000167.png => battle_terrain_factory_player.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_giratina_opponent.png rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000175.png => battle_terrain_giratina_player.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000174.png => battle_terrain_hall_opponent.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000173.png => battle_terrain_hall_player.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{pl_batt_obj_00000166.png => battle_terrain_tower_opponent.png} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/battle_terrain_tower_player.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000165.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000176.png diff --git a/include/battle/battle_icon.h b/include/battle/battle_icon.h index fc1e74ff89..3bb5a84e49 100644 --- a/include/battle/battle_icon.h +++ b/include/battle/battle_icon.h @@ -27,9 +27,9 @@ void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1); void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2); CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); void sub_0207CA88(CellActorData *param0); -u32 BattleIcon_MoveTypeIndexToNARCMember(int param0); -u8 BattleIcon_MoveTypeIndexToPaletteIndex(int param0); -u32 BattleIcon_GetMoveTypeNARCIndex(void); +u32 BattleIcon_MoveClassIndexToNARCMember(int param0); +u8 BattleIcon_MoveClassIndexToPaletteIndex(int param0); +u32 BattleIcon_GetMoveClassNARCIndex(void); void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); void sub_0207CB00(CellActorData *param0); diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/order.txt index e8faf018e3..6b20cb3a99 100644 --- a/res/battle/graphic/pl_batt_obj/order.txt +++ b/res/battle/graphic/pl_batt_obj/order.txt @@ -1,73 +1,73 @@ pl_batt_obj_00000000.NCLR -pl_batt_obj_00000001.NCLR -pl_batt_obj_00000002.NCLR -pl_batt_obj_00000003.NCLR -pl_batt_obj_00000004.NCLR -pl_batt_obj_00000005.NCLR -pl_batt_obj_00000006.NCLR -pl_batt_obj_00000007.NCLR -pl_batt_obj_00000008.NCLR -pl_batt_obj_00000009.NCLR -pl_batt_obj_00000010.NCLR -pl_batt_obj_00000011.NCLR -pl_batt_obj_00000012.NCLR -pl_batt_obj_00000013.NCLR -pl_batt_obj_00000014.NCLR -pl_batt_obj_00000015.NCLR -pl_batt_obj_00000016.NCLR -pl_batt_obj_00000017.NCLR -pl_batt_obj_00000018.NCLR -pl_batt_obj_00000019.NCLR -pl_batt_obj_00000020.NCLR -pl_batt_obj_00000021.NCLR -pl_batt_obj_00000022.NCLR -pl_batt_obj_00000023.NCLR -pl_batt_obj_00000024.NCLR -pl_batt_obj_00000025.NCLR -pl_batt_obj_00000026.NCLR -pl_batt_obj_00000027.NCLR -pl_batt_obj_00000028.NCLR -pl_batt_obj_00000029.NCLR -pl_batt_obj_00000030.NCLR -pl_batt_obj_00000031.NCLR -pl_batt_obj_00000032.NCLR -pl_batt_obj_00000033.NCLR -pl_batt_obj_00000034.NCLR -pl_batt_obj_00000035.NCLR -pl_batt_obj_00000036.NCLR -pl_batt_obj_00000037.NCLR -pl_batt_obj_00000038.NCLR -pl_batt_obj_00000039.NCLR -pl_batt_obj_00000040.NCLR -pl_batt_obj_00000041.NCLR -pl_batt_obj_00000042.NCLR -pl_batt_obj_00000043.NCLR -pl_batt_obj_00000044.NCLR -pl_batt_obj_00000045.NCLR -pl_batt_obj_00000046.NCLR -pl_batt_obj_00000047.NCLR -pl_batt_obj_00000048.NCLR -pl_batt_obj_00000049.NCLR -pl_batt_obj_00000050.NCLR -pl_batt_obj_00000051.NCLR -pl_batt_obj_00000052.NCLR -pl_batt_obj_00000053.NCLR -pl_batt_obj_00000054.NCLR -pl_batt_obj_00000055.NCLR -pl_batt_obj_00000056.NCLR -pl_batt_obj_00000057.NCLR -pl_batt_obj_00000058.NCLR -pl_batt_obj_00000059.NCLR -pl_batt_obj_00000060.NCLR -pl_batt_obj_00000061.NCLR -pl_batt_obj_00000062.NCLR -pl_batt_obj_00000063.NCLR -pl_batt_obj_00000064.NCLR -pl_batt_obj_00000065.NCLR -pl_batt_obj_00000066.NCLR -pl_batt_obj_00000067.NCLR -pl_batt_obj_00000068.NCLR -pl_batt_obj_00000069.NCLR +battle_terrain_grass_day.NCLR +battle_terrain_grass_afternoon.NCLR +battle_terrain_grass_night.NCLR +battle_terrain_surf_day.NCLR +battle_terrain_surf_afternoon.NCLR +battle_terrain_surf_night.NCLR +battle_terrain_path_day.NCLR +battle_terrain_path_afternoon.NCLR +battle_terrain_path_night.NCLR +battle_terrain_ice_day.NCLR +battle_terrain_ice_afternoon.NCLR +battle_terrain_ice_night.NCLR +battle_terrain_mountain_day.NCLR +battle_terrain_mountain_afternoon.NCLR +battle_terrain_mountain_night.NCLR +battle_terrain_snow_day.NCLR +battle_terrain_snow_afternoon.NCLR +battle_terrain_snow_night.NCLR +battle_terrain_indoors_day.NCLR +battle_terrain_indoors_afternoon.NCLR +battle_terrain_indoors_night.NCLR +battle_terrain_sand_day.NCLR +battle_terrain_sand_afternoon.NCLR +battle_terrain_sand_night.NCLR +battle_terrain_mud_day.NCLR +battle_terrain_mud_afternoon.NCLR +battle_terrain_mud_night.NCLR +battle_terrain_cave_day.NCLR +battle_terrain_cave_afternoon.NCLR +battle_terrain_cave_night.NCLR +battle_terrain_puddle_day.NCLR +battle_terrain_puddle_afternoon.NCLR +battle_terrain_puddle_night.NCLR +battle_terrain_elite4_aaron_day.NCLR +battle_terrain_elite4_aaron_afternoon.NCLR +battle_terrain_elite4_aaron_night.NCLR +battle_terrain_elite4_bertha_day.NCLR +battle_terrain_elite4_bertha_afternoon.NCLR +battle_terrain_elite4_bertha_night.NCLR +battle_terrain_elite4_flint_day.NCLR +battle_terrain_elite4_flint_afternoon.NCLR +battle_terrain_elite4_flint_night.NCLR +battle_terrain_elite4_lucian_day.NCLR +battle_terrain_elite4_lucian_afternoon.NCLR +battle_terrain_elite4_lucian_night.NCLR +battle_terrain_champion_day.NCLR +battle_terrain_champion_afternoon.NCLR +battle_terrain_champion_night.NCLR +battle_terrain_distortion_world_day.NCLR +battle_terrain_distortion_world_afternoon.NCLR +battle_terrain_distortion_world_night.NCLR +battle_terrain_tower_day.NCLR +battle_terrain_tower_afternoon.NCLR +battle_terrain_tower_night.NCLR +battle_terrain_factory_day.NCLR +battle_terrain_factory_afternoon.NCLR +battle_terrain_factory_night.NCLR +battle_terrain_arcade_day.NCLR +battle_terrain_arcade_afternoon.NCLR +battle_terrain_arcade_night.NCLR +battle_terrain_castle_day.NCLR +battle_terrain_castle_afternoon.NCLR +battle_terrain_castle_night.NCLR +battle_terrain_hall_day.NCLR +battle_terrain_hall_afternoon.NCLR +battle_terrain_hall_night.NCLR +battle_terrain_giratina_day.NCLR +battle_terrain_giratina_afternoon.NCLR +battle_terrain_giratina_night.NCLR pl_batt_obj_00000070.NCLR healthbox_normal.NCLR pl_batt_obj_00000072.NCLR @@ -163,18 +163,18 @@ battle_terrain_champion_player.NCGR battle_terrain_champion_opponent.NCGR battle_terrain_distortion_world_player.NCGR battle_terrain_distortion_world_opponent.NCGR -pl_batt_obj_00000165.NCGR -pl_batt_obj_00000166.NCGR -pl_batt_obj_00000167.NCGR -pl_batt_obj_00000168.NCGR -pl_batt_obj_00000169.NCGR -pl_batt_obj_00000170.NCGR -pl_batt_obj_00000171.NCGR -pl_batt_obj_00000172.NCGR -pl_batt_obj_00000173.NCGR -pl_batt_obj_00000174.NCGR -pl_batt_obj_00000175.NCGR -pl_batt_obj_00000176.NCGR +battle_terrain_tower_player.NCGR +battle_terrain_tower_opponent.NCGR +battle_terrain_factory_player.NCGR +battle_terrain_factory_opponent.NCGR +battle_terrain_arcade_player.NCGR +battle_terrain_arcade_opponent.NCGR +battle_terrain_castle_player.NCGR +battle_terrain_castle_opponent.NCGR +battle_terrain_hall_player.NCGR +battle_terrain_hall_opponent.NCGR +battle_terrain_giratina_player.NCGR +battle_terrain_giratina_opponent.NCGR pl_batt_obj_00000177.NANR pl_batt_obj_00000178.NCER pl_batt_obj_00000179.NCGR diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000058.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000058.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000059.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000059.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000060.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000060.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000061.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000061.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000062.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000062.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000063.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000063.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000028.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000028.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000029.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000029.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000030.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000030.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000046.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000046.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000047.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000047.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000048.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000048.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000049.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000049.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000050.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000050.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000051.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000051.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000034.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000034.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000035.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000035.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000036.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000036.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000037.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000037.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000038.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000038.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000039.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000039.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000040.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000040.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000041.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000041.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000042.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000042.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000043.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000043.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000044.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000044.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000045.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000045.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000055.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000055.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000056.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000056.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000057.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000057.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000067.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000067.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000068.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000068.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000069.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000069.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000002.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000002.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000001.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000001.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000003.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000003.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000064.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000064.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000065.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000065.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000066.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000066.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000011.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000011.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000010.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000010.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000012.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000012.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000019.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000019.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000020.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000020.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000021.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000021.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000014.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000014.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000013.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000013.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000015.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000015.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000026.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000026.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000025.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000025.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000027.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000027.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000008.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000008.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000007.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000007.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000009.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000009.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000032.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000032.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000031.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000031.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000033.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000033.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000023.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000023.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000022.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000022.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000024.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000024.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000017.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000017.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000016.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000016.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000018.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000018.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000005.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000005.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000004.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000004.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000006.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000006.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000052.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_afternoon.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000052.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_afternoon.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000053.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_day.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000053.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_day.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000054.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_night.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000054.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_night.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/data.json b/res/battle/graphic/pl_batt_obj/palettes/data.json index 071d93f8ff..383c3aaee0 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/data.json +++ b/res/battle/graphic/pl_batt_obj/palettes/data.json @@ -7,105 +7,105 @@ "invert_size": false }, { - "target": "pl_batt_obj_00000052.pal", + "target": "battle_terrain_tower_day.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000053.pal", + "target": "battle_terrain_tower_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000054.pal", + "target": "battle_terrain_tower_night.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000055.pal", + "target": "battle_terrain_factory_day.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000056.pal", + "target": "battle_terrain_factory_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000057.pal", + "target": "battle_terrain_factory_night.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000058.pal", + "target": "battle_terrain_arcade_day.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000059.pal", + "target": "battle_terrain_arcade_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000060.pal", + "target": "battle_terrain_arcade_night.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000061.pal", + "target": "battle_terrain_castle_day.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000062.pal", + "target": "battle_terrain_castle_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000063.pal", + "target": "battle_terrain_castle_night.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000064.pal", + "target": "battle_terrain_hall_day.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000065.pal", + "target": "battle_terrain_hall_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000066.pal", + "target": "battle_terrain_hall_night.pal", "bitdepth": 4, "pad": false, "pcmp": false, @@ -175,378 +175,378 @@ "invert_size": false }, { - "target": "pl_batt_obj_00000001.pal", + "target": "battle_terrain_grass_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000002.pal", + "target": "battle_terrain_grass_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000003.pal", + "target": "battle_terrain_grass_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000004.pal", + "target": "battle_terrain_surf_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000005.pal", + "target": "battle_terrain_surf_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000006.pal", + "target": "battle_terrain_surf_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000007.pal", + "target": "battle_terrain_path_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000008.pal", + "target": "battle_terrain_path_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000009.pal", + "target": "battle_terrain_path_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000010.pal", + "target": "battle_terrain_ice_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000011.pal", + "target": "battle_terrain_ice_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000012.pal", + "target": "battle_terrain_ice_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000013.pal", + "target": "battle_terrain_mountain_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000014.pal", + "target": "battle_terrain_mountain_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000015.pal", + "target": "battle_terrain_mountain_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000016.pal", + "target": "battle_terrain_snow_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000017.pal", + "target": "battle_terrain_snow_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000018.pal", + "target": "battle_terrain_snow_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000019.pal", + "target": "battle_terrain_indoors_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000020.pal", + "target": "battle_terrain_indoors_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000021.pal", + "target": "battle_terrain_indoors_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000022.pal", + "target": "battle_terrain_sand_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000023.pal", + "target": "battle_terrain_sand_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000024.pal", + "target": "battle_terrain_sand_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000025.pal", + "target": "battle_terrain_mud_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000026.pal", + "target": "battle_terrain_mud_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000027.pal", + "target": "battle_terrain_mud_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000028.pal", + "target": "battle_terrain_cave_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000029.pal", + "target": "battle_terrain_cave_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000030.pal", + "target": "battle_terrain_cave_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000031.pal", + "target": "battle_terrain_puddle_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000032.pal", + "target": "battle_terrain_puddle_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000033.pal", + "target": "battle_terrain_puddle_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000034.pal", + "target": "battle_terrain_elite4_aaron_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000035.pal", + "target": "battle_terrain_elite4_aaron_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000036.pal", + "target": "battle_terrain_elite4_aaron_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000037.pal", + "target": "battle_terrain_elite4_bertha_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000038.pal", + "target": "battle_terrain_elite4_bertha_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000039.pal", + "target": "battle_terrain_elite4_bertha_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000040.pal", + "target": "battle_terrain_elite4_flint_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000041.pal", + "target": "battle_terrain_elite4_flint_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000042.pal", + "target": "battle_terrain_elite4_flint_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000043.pal", + "target": "battle_terrain_elite4_lucian_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000044.pal", + "target": "battle_terrain_elite4_lucian_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000045.pal", + "target": "battle_terrain_elite4_lucian_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000046.pal", + "target": "battle_terrain_champion_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000047.pal", + "target": "battle_terrain_champion_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000048.pal", + "target": "battle_terrain_champion_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000049.pal", + "target": "battle_terrain_distortion_world_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000050.pal", + "target": "battle_terrain_distortion_world_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000051.pal", + "target": "battle_terrain_distortion_world_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000067.pal", + "target": "battle_terrain_giratina_day.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000068.pal", + "target": "battle_terrain_giratina_afternoon.pal", "bitdepth": 4, "pad": false, "pcmp": true, "invert_size": true }, { - "target": "pl_batt_obj_00000069.pal", + "target": "battle_terrain_giratina_night.pal", "bitdepth": 4, "pad": false, "pcmp": true, diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/pl_batt_obj/palettes/meson.build index 65a6e1bdb4..33300529dd 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/meson.build +++ b/res/battle/graphic/pl_batt_obj/palettes/meson.build @@ -1,74 +1,74 @@ pl_batt_obj_palettes = files( 'pl_batt_obj_00000000.pal', - 'pl_batt_obj_00000001.pal', - 'pl_batt_obj_00000002.pal', - 'pl_batt_obj_00000003.pal', - 'pl_batt_obj_00000004.pal', - 'pl_batt_obj_00000005.pal', - 'pl_batt_obj_00000006.pal', - 'pl_batt_obj_00000007.pal', - 'pl_batt_obj_00000008.pal', - 'pl_batt_obj_00000009.pal', - 'pl_batt_obj_00000010.pal', - 'pl_batt_obj_00000011.pal', - 'pl_batt_obj_00000012.pal', - 'pl_batt_obj_00000013.pal', - 'pl_batt_obj_00000014.pal', - 'pl_batt_obj_00000015.pal', - 'pl_batt_obj_00000016.pal', - 'pl_batt_obj_00000017.pal', - 'pl_batt_obj_00000018.pal', - 'pl_batt_obj_00000019.pal', - 'pl_batt_obj_00000020.pal', - 'pl_batt_obj_00000021.pal', - 'pl_batt_obj_00000022.pal', - 'pl_batt_obj_00000023.pal', - 'pl_batt_obj_00000024.pal', - 'pl_batt_obj_00000025.pal', - 'pl_batt_obj_00000026.pal', - 'pl_batt_obj_00000027.pal', - 'pl_batt_obj_00000028.pal', - 'pl_batt_obj_00000029.pal', - 'pl_batt_obj_00000030.pal', - 'pl_batt_obj_00000031.pal', - 'pl_batt_obj_00000032.pal', - 'pl_batt_obj_00000033.pal', - 'pl_batt_obj_00000034.pal', - 'pl_batt_obj_00000035.pal', - 'pl_batt_obj_00000036.pal', - 'pl_batt_obj_00000037.pal', - 'pl_batt_obj_00000038.pal', - 'pl_batt_obj_00000039.pal', - 'pl_batt_obj_00000040.pal', - 'pl_batt_obj_00000041.pal', - 'pl_batt_obj_00000042.pal', - 'pl_batt_obj_00000043.pal', - 'pl_batt_obj_00000044.pal', - 'pl_batt_obj_00000045.pal', - 'pl_batt_obj_00000046.pal', - 'pl_batt_obj_00000047.pal', - 'pl_batt_obj_00000048.pal', - 'pl_batt_obj_00000049.pal', - 'pl_batt_obj_00000050.pal', - 'pl_batt_obj_00000051.pal', - 'pl_batt_obj_00000052.pal', - 'pl_batt_obj_00000053.pal', - 'pl_batt_obj_00000054.pal', - 'pl_batt_obj_00000055.pal', - 'pl_batt_obj_00000056.pal', - 'pl_batt_obj_00000057.pal', - 'pl_batt_obj_00000058.pal', - 'pl_batt_obj_00000059.pal', - 'pl_batt_obj_00000060.pal', - 'pl_batt_obj_00000061.pal', - 'pl_batt_obj_00000062.pal', - 'pl_batt_obj_00000063.pal', - 'pl_batt_obj_00000064.pal', - 'pl_batt_obj_00000065.pal', - 'pl_batt_obj_00000066.pal', - 'pl_batt_obj_00000067.pal', - 'pl_batt_obj_00000068.pal', - 'pl_batt_obj_00000069.pal', + 'battle_terrain_grass_day.pal', + 'battle_terrain_grass_afternoon.pal', + 'battle_terrain_grass_night.pal', + 'battle_terrain_surf_day.pal', + 'battle_terrain_surf_afternoon.pal', + 'battle_terrain_surf_night.pal', + 'battle_terrain_path_day.pal', + 'battle_terrain_path_afternoon.pal', + 'battle_terrain_path_night.pal', + 'battle_terrain_ice_day.pal', + 'battle_terrain_ice_afternoon.pal', + 'battle_terrain_ice_night.pal', + 'battle_terrain_mountain_day.pal', + 'battle_terrain_mountain_afternoon.pal', + 'battle_terrain_mountain_night.pal', + 'battle_terrain_snow_day.pal', + 'battle_terrain_snow_afternoon.pal', + 'battle_terrain_snow_night.pal', + 'battle_terrain_indoors_day.pal', + 'battle_terrain_indoors_afternoon.pal', + 'battle_terrain_indoors_night.pal', + 'battle_terrain_sand_day.pal', + 'battle_terrain_sand_afternoon.pal', + 'battle_terrain_sand_night.pal', + 'battle_terrain_mud_day.pal', + 'battle_terrain_mud_afternoon.pal', + 'battle_terrain_mud_night.pal', + 'battle_terrain_cave_day.pal', + 'battle_terrain_cave_afternoon.pal', + 'battle_terrain_cave_night.pal', + 'battle_terrain_puddle_day.pal', + 'battle_terrain_puddle_afternoon.pal', + 'battle_terrain_puddle_night.pal', + 'battle_terrain_elite4_aaron_day.pal', + 'battle_terrain_elite4_aaron_afternoon.pal', + 'battle_terrain_elite4_aaron_night.pal', + 'battle_terrain_elite4_bertha_day.pal', + 'battle_terrain_elite4_bertha_afternoon.pal', + 'battle_terrain_elite4_bertha_night.pal', + 'battle_terrain_elite4_flint_day.pal', + 'battle_terrain_elite4_flint_afternoon.pal', + 'battle_terrain_elite4_flint_night.pal', + 'battle_terrain_elite4_lucian_day.pal', + 'battle_terrain_elite4_lucian_afternoon.pal', + 'battle_terrain_elite4_lucian_night.pal', + 'battle_terrain_champion_day.pal', + 'battle_terrain_champion_afternoon.pal', + 'battle_terrain_champion_night.pal', + 'battle_terrain_distortion_world_day.pal', + 'battle_terrain_distortion_world_afternoon.pal', + 'battle_terrain_distortion_world_night.pal', + 'battle_terrain_tower_day.pal', + 'battle_terrain_tower_afternoon.pal', + 'battle_terrain_tower_night.pal', + 'battle_terrain_factory_day.pal', + 'battle_terrain_factory_afternoon.pal', + 'battle_terrain_factory_night.pal', + 'battle_terrain_arcade_day.pal', + 'battle_terrain_arcade_afternoon.pal', + 'battle_terrain_arcade_night.pal', + 'battle_terrain_castle_day.pal', + 'battle_terrain_castle_afternoon.pal', + 'battle_terrain_castle_night.pal', + 'battle_terrain_hall_day.pal', + 'battle_terrain_hall_afternoon.pal', + 'battle_terrain_hall_night.pal', + 'battle_terrain_giratina_day.pal', + 'battle_terrain_giratina_afternoon.pal', + 'battle_terrain_giratina_night.pal', 'pl_batt_obj_00000070.pal', 'healthbox_normal.pal', 'pl_batt_obj_00000072.pal', diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000170.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_arcade_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000170.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_arcade_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000169.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_arcade_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000169.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_arcade_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000172.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_castle_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000172.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_castle_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000171.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_castle_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000171.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_castle_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000168.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_factory_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000168.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_factory_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000167.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_factory_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000167.png rename to res/battle/graphic/pl_batt_obj/sprites/battle_terrain_factory_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_giratina_opponent.png b/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_giratina_opponent.png new file mode 100644 index 0000000000000000000000000000000000000000..7788134815cafecd1d98a770d8467a387ee91855 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3FHz#Ff1w}YI8z0jg#!3GxeOaCmkj4akx9ba4!cXnlLo nkP*l`wBW0ME|>iRAd_Jqn?M5tHNYz1wzrl-h`<3+2`vM!OAf~}73KvvB(W-Tvi#DHE!uGW&DZ_0GaPSi+?=z% zT61d0RaHUnlgFKo3ockEZ^V?ddrIw|z3Vxii;D|0InDeQ>?put9k*Rsp>A&(Lr$H_ zp##rE4G%o2b>uPl+1bIU5zjc~x5L6a%#XbH-#7bypkMBT5MzJ1lP;@p^^0rYopOZb zIp#zv{3u{@ytO?yHvIfLBm3+G9YzlffZv3L~5u5^}7<&*3k(TWM5!VWSV zEczI?ec)9N<)By(Q-mODmL?F9{= znkAX!lh5U4$}_jv-Yq+kuJMfffDvh|V=_2cm>1ZJCL2W-oUbYDb_Jl`ng$H;}L~bVz^@&;s||s>CM*92FtR61)Zi zKv)vzN>Ql*O2CK)xuX0xV8KK^*Z>GB>vzDb)?4E@=r?*`N)1H9m%3GnuOVs}tuw4ci7A2q{Z|C8lFdg%n+a diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000176.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000176.png deleted file mode 100644 index 1d915367b1e27a9a40b17ba81b2c51a6bcf0d1cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%0wfrsrS5JAQtF;Ajv*1PZ%-{`WMJT7QutpV mQmLBz|jOlhxB=l>VA0iP()h|q}9{a&t;ucLK6TQq!}Rq diff --git a/src/battle/battle_icon.c b/src/battle/battle_icon.c index ea65ed44fd..2db4938fb8 100644 --- a/src/battle/battle_icon.c +++ b/src/battle/battle_icon.c @@ -8,83 +8,92 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" +#include "consts/pokemon.h" +#include "consts/moves.h" #include "palette.h" #include "unk_0200C6E4.h" +// these do not align with the types defined in consts/pokemon.json. +#define TYPE_COOL_ICON NUMBER_OF_MON_TYPES + 0 +#define TYPE_BEAUTY_ICON NUMBER_OF_MON_TYPES + 1 +#define TYPE_CUTE_ICON NUMBER_OF_MON_TYPES + 2 +#define TYPE_SMART_ICON NUMBER_OF_MON_TYPES + 3 +#define TYPE_TOUGH_ICON NUMBER_OF_MON_TYPES + 4 + /* * Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ -__attribute__((aligned(4))) static const u32 BattleIcon_NARCMemberMap[] = { - 0xEA, - 0xE1, - 0xE3, - 0xEB, - 0xE5, - 0xED, - 0xE7, - 0xE4, - 0xEE, - 0xEC, - 0xE2, - 0xF1, - 0xE9, - 0xDE, - 0xDF, - 0xE6, - 0xDD, - 0xE0, - 0xF0, - 0xDB, - 0xDC, - 0xE8, - 0xEF +__attribute__((aligned(4))) static const u32 sBattleIcon_NARCMemberMap[] = { + [TYPE_NORMAL] = 0xEA, + [TYPE_FIGHTING] = 0xE1, + [TYPE_FLYING] = 0xE3, + [TYPE_POISON] = 0xEB, + [TYPE_GROUND] = 0xE5, + [TYPE_ROCK] = 0xED, + [TYPE_BUG] = 0xE7, + [TYPE_GHOST] = 0xE4, + [TYPE_STEEL] = 0xEE, + [TYPE_MYSTERY] = 0xEC, + [TYPE_FIRE] = 0xE2, + [TYPE_WATER] = 0xF1, + [TYPE_GRASS] = 0xE9, + [TYPE_ELECTRIC] = 0xDE, + [TYPE_PSYCHIC] = 0xDF, + [TYPE_ICE] = 0xE6, + [TYPE_DRAGON] = 0xDD, + [TYPE_DARK] = 0xE0, + [TYPE_COOL_ICON] = 0xF0, + [TYPE_BEAUTY_ICON] = 0xDB, + [TYPE_CUTE_ICON] = 0xDC, + [TYPE_SMART_ICON] = 0xE8, + [TYPE_TOUGH_ICON] = 0xEF }; /* * Maps a type index (e.g. TYPE_WATER) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ -__attribute__((aligned(4))) static const u8 BattleIcon_PaletteIndexMap[] = { - 0x0, - 0x0, - 0x1, - 0x1, - 0x0, - 0x0, - 0x2, - 0x1, - 0x0, - 0x2, - 0x0, - 0x1, - 0x2, - 0x0, - 0x1, - 0x1, - 0x2, - 0x0, - 0x0, - 0x1, - 0x1, - 0x2, - 0x0 +__attribute__((aligned(4))) static const u8 sBattleIcon_PaletteIndexMap[] = { + [TYPE_NORMAL] = 0x0, + [TYPE_FIGHTING] = 0x0, + [TYPE_FLYING] = 0x1, + [TYPE_POISON] = 0x1, + [TYPE_GROUND] = 0x0, + [TYPE_ROCK] = 0x0, + [TYPE_BUG] = 0x2, + [TYPE_GHOST] = 0x1, + [TYPE_STEEL] = 0x0, + [TYPE_MYSTERY] = 0x2, + [TYPE_FIRE] = 0x0, + [TYPE_WATER] = 0x1, + [TYPE_GRASS] = 0x2, + [TYPE_ELECTRIC] = 0x0, + [TYPE_PSYCHIC] = 0x1, + [TYPE_ICE] = 0x1, + [TYPE_DRAGON] = 0x2, + [TYPE_DARK] = 0x0, + [TYPE_COOL_ICON] = 0x0, + [TYPE_BEAUTY_ICON] = 0x1, + [TYPE_CUTE_ICON] = 0x1, + [TYPE_SMART_ICON] = 0x2, + [TYPE_TOUGH_ICON] = 0x0 }; /* - * Maps move types (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. + * Maps move classes (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ -__attribute__((aligned(4))) static const u32 BattleIcon_MoveType_NARCMemberMap[] = { - 0xF4, - 0xF6, - 0xF5 +__attribute__((aligned(4))) static const u32 sBattleIcon_MoveClass_NARCMemberMap[] = { + [CLASS_PHYSICAL] = 0xF4, + [CLASS_SPECIAL] = 0xF6, + [CLASS_STATUS] = 0xF5 }; /* - * Maps a move type (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. + * Maps move classes (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ -__attribute__((aligned(4))) static const u8 BattleIcon_MoveType_PaletteIndexMap[] = { - 0x0, - 0x1, - 0x0 +__attribute__((aligned(4))) static const u8 sBattleIcon_MoveClass_PaletteIndexMap[] = { + [CLASS_PHYSICAL] = 0x0, + [CLASS_SPECIAL] = 0x1, + [CLASS_STATUS] = 0x0 }; /* @@ -93,8 +102,8 @@ __attribute__((aligned(4))) static const u8 BattleIcon_MoveType_PaletteIndexMap[ */ u32 BattleIcon_TypeIndexToNARCMember(int typeIndex) { - GF_ASSERT(typeIndex < NELEMS(BattleIcon_NARCMemberMap)); - return BattleIcon_NARCMemberMap[typeIndex]; + GF_ASSERT(typeIndex < NELEMS(sBattleIcon_NARCMemberMap)); + return sBattleIcon_NARCMemberMap[typeIndex]; } /* @@ -122,8 +131,8 @@ u32 sub_0207C928(void) */ u8 BattleIcon_TypeIndexToPaletteIndex(int typeIndex) { - GF_ASSERT(typeIndex < NELEMS(BattleIcon_PaletteIndexMap)); - return BattleIcon_PaletteIndexMap[typeIndex]; + GF_ASSERT(typeIndex < NELEMS(sBattleIcon_PaletteIndexMap)); + return sBattleIcon_PaletteIndexMap[typeIndex]; } /* @@ -189,37 +198,37 @@ void sub_0207CA88(CellActorData *param0) } /* - * Given a movetype index, return the corresponding NARC member containing the icon for that movetype. + * Given a move class index, return the corresponding NARC member containing the icon for that move class. * See also BattleIcon_GetNARCIndex. */ -u32 BattleIcon_MoveTypeIndexToNARCMember(int moveTypeIndex) +u32 BattleIcon_MoveClassIndexToNARCMember(int moveClassIndex) { - GF_ASSERT(moveTypeIndex < NELEMS(BattleIcon_MoveType_NARCMemberMap)); - return BattleIcon_MoveType_NARCMemberMap[moveTypeIndex]; + GF_ASSERT(moveClassIndex < NELEMS(sBattleIcon_MoveClass_NARCMemberMap)); + return sBattleIcon_MoveClass_NARCMemberMap[moveClassIndex]; } /* - * Given a movetype index, return the corresponding palette index to use for that movetype's icon. + * Given a move class index, return the corresponding palette index to use for that move class' icon. * See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. */ -u8 BattleIcon_MoveTypeIndexToPaletteIndex(int moveTypeIndex) +u8 BattleIcon_MoveClassIndexToPaletteIndex(int moveClassIndex) { - GF_ASSERT(moveTypeIndex < NELEMS(BattleIcon_MoveType_PaletteIndexMap)); - return BattleIcon_MoveType_PaletteIndexMap[moveTypeIndex]; + GF_ASSERT(moveClassIndex < NELEMS(sBattleIcon_MoveClass_PaletteIndexMap)); + return sBattleIcon_MoveClass_PaletteIndexMap[moveClassIndex]; } /* * Returns the index of the NARC for pl_batt_obj. * (This is identical to BattleIcon_GetNARCIndex). */ -u32 BattleIcon_GetMoveTypeNARCIndex(void) +u32 BattleIcon_GetMoveClassNARCIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int moveTypeIndex, u32 param4) { - sub_0200CBDC(param0, param1, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(moveTypeIndex), 1, param2, param4); + sub_0200CBDC(param0, param1, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(moveTypeIndex), 1, param2, param4); } void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1) diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 5a089b878a..683abe13a1 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -12,6 +12,8 @@ #include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_02268520.h" +#include "consts/battle.h" + #include "narc.h" #include "palette.h" #include "unk_0200C6E4.h" @@ -44,139 +46,94 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { }; /* - * Maps a battle terrain index to the NARC member in pl_batt_obj containing a sprite for it. + * Maps a battle terrain index to the NARC member in pl_batt_obj containing the player's sprite for it. */ -__attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToNARCMember[] = { - 0x87, - 0x91, - 0x7F, - 0x97, - 0x8B, - 0x95, - 0x8D, - 0x85, - 0x89, - 0x8F, - 0x93, - 0x97, - 0x99, - 0x9B, - 0x9D, - 0x9F, - 0xA1, - 0xA3, - 0xA5, - 0xA7, - 0xA9, - 0xAB, - 0xAD, - 0xAF +__attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToNARCMember[] = { + [TERRAIN_PLAIN] = 0x87, + [TERRAIN_SAND] = 0x91, + [TERRAIN_GRASS] = 0x7F, + [TERRAIN_PUDDLE] = 0x97, + [TERRAIN_MOUNTAIN] = 0x8B, + [TERRAIN_CAVE] = 0x95, + [TERRAIN_SNOW] = 0x8D, + [TERRAIN_WATER] = 0x85, + [TERRAIN_ICE] = 0x89, + [TERRAIN_BUILDING] = 0x8F, + [TERRAIN_GREAT_MARSH] = 0x93, + [TERRAIN_BRIDGE] = 0x97, + [TERRAIN_AARON] = 0x99, + [TERRAIN_BERTHA] = 0x9B, + [TERRAIN_FLINT] = 0x9D, + [TERRAIN_LUCIAN] = 0x9F, + [TERRAIN_CYNTHIA] = 0xA1, + [TERRAIN_DISTORTION_WORLD] = 0xA3, + [TERRAIN_BATTLE_TOWER] = 0xA5, + [TERRAIN_BATTLE_FACTORY] = 0xA7, + [TERRAIN_BATTLE_ARCADE] = 0xA9, + [TERRAIN_BATTLE_CASTLE] = 0xAB, + [TERRAIN_BATTLE_HALL] = 0xAD, + [TERRAIN_GIRATINA] = 0xAF }; -__attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToOpponentNARCMember[] = { - 0x88, - 0x92, - 0x82, - 0x98, - 0x8C, - 0x96, - 0x8E, - 0x86, - 0x8A, - 0x90, - 0x94, - 0x94, - 0x9A, - 0x9C, - 0x9E, - 0xA0, - 0xA2, - 0xA4, - 0xA6, - 0xA8, - 0xAA, - 0xAC, - 0xAE, - 0xB0 +/* + * Maps a battle terrain index to the NARC member in pl_batt_obj containing the opponent's sprite for it. + */ +__attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToOpponentNARCMember[] = { + [TERRAIN_PLAIN] = 0x88, + [TERRAIN_SAND] = 0x92, + [TERRAIN_GRASS] = 0x82, + [TERRAIN_PUDDLE] = 0x98, + [TERRAIN_MOUNTAIN] = 0x8C, + [TERRAIN_CAVE] = 0x96, + [TERRAIN_SNOW] = 0x8E, + [TERRAIN_WATER] = 0x86, + [TERRAIN_ICE] = 0x8A, + [TERRAIN_BUILDING] = 0x90, + [TERRAIN_GREAT_MARSH] = 0x94, + [TERRAIN_BRIDGE] = 0x94, + [TERRAIN_AARON] = 0x9A, + [TERRAIN_BERTHA] = 0x9C, + [TERRAIN_FLINT] = 0x9E, + [TERRAIN_LUCIAN] = 0xA0, + [TERRAIN_CYNTHIA] = 0xA2, + [TERRAIN_DISTORTION_WORLD] = 0xA4, + [TERRAIN_BATTLE_TOWER] = 0xA6, + [TERRAIN_BATTLE_FACTORY] = 0xA8, + [TERRAIN_BATTLE_ARCADE] = 0xAA, + [TERRAIN_BATTLE_CASTLE] = 0xAC, + [TERRAIN_BATTLE_HALL] = 0xAE, + [TERRAIN_GIRATINA] = 0xB0 }; /* * Maps a battle terrain ID to the NARC member in pl_batt_obj containing a palette for it. - * Each battle terrain has 3 palette options for different times of day (?) + * Each battle terrain has 3 palette options for different times of day. */ -__attribute__((aligned(4))) static const u16 ov16_BattleTerrainIndexToPaletteMember[][3] = { - 0x7, - 0x8, - 0x9, - 0x16, - 0x17, - 0x18, - 0x1, - 0x2, - 0x3, - 0x1F, - 0x20, - 0x21, - 0xD, - 0xE, - 0xF, - 0x1C, - 0x1D, - 0x1E, - 0x10, - 0x11, - 0x12, - 0x4, - 0x5, - 0x6, - 0xA, - 0xB, - 0xC, - 0x13, - 0x14, - 0x15, - 0x19, - 0x1A, - 0x1B, - 0x19, - 0x1A, - 0x1B, - 0x22, - 0x23, - 0x24, - 0x25, - 0x26, - 0x27, - 0x28, - 0x29, - 0x2A, - 0x2B, - 0x2C, - 0x2D, - 0x2E, - 0x2F, - 0x30, - 0x31, - 0x32, - 0x33, - 0x34, - 0x35, - 0x36, - 0x37, - 0x38, - 0x39, - 0x3A, - 0x3B, - 0x3C, - 0x3D, - 0x3E, - 0x3F, - 0x40, - 0x41, - 0x42, - 0x43, - 0x44, - 0x45 +__attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToPaletteMember[][3] = { + [TERRAIN_PLAIN] = { 0x7, 0x8, 0x9 }, + [TERRAIN_SAND] = { 0x16, 0x17, 0x18 }, + [TERRAIN_GRASS] = { 0x1, 0x2, 0x3 }, + [TERRAIN_PUDDLE] = { 0x1F, 0x20, 0x21 }, + [TERRAIN_MOUNTAIN] = { 0xD, 0xE, 0xF }, + [TERRAIN_CAVE] = { 0x1C, 0x1D, 0x1E }, + [TERRAIN_SNOW] = { 0x10, 0x11, 0x12 }, + [TERRAIN_WATER] = { 0x4, 0x5, 0x6 }, + [TERRAIN_ICE] = { 0xA, 0xB, 0xC }, + [TERRAIN_BUILDING] = { 0x13, 0x14, 0x15 }, + [TERRAIN_GREAT_MARSH] = { 0x19, 0x1A, 0x1B }, + [TERRAIN_BRIDGE] = { 0x19, 0x1A, 0x1B }, + [TERRAIN_AARON] = { 0x22, 0x23, 0x24 }, + [TERRAIN_BERTHA] = { 0x25, 0x26, 0x27 }, + [TERRAIN_FLINT] = { 0x28, 0x29, 0x2A }, + [TERRAIN_LUCIAN] = { 0x2B, 0x2C, 0x2D }, + [TERRAIN_CYNTHIA] = { 0x2E, 0x2F, 0x30 }, + [TERRAIN_DISTORTION_WORLD] = { 0x31, 0x32, 0x33 }, + [TERRAIN_BATTLE_TOWER] = { 0x34, 0x35, 0x36 }, + [TERRAIN_BATTLE_FACTORY] = { 0x37, 0x38, 0x39 }, + [TERRAIN_BATTLE_ARCADE] = { 0x3A, 0x3B, 0x3C }, + [TERRAIN_BATTLE_CASTLE] = { 0x3D, 0x3E, 0x3F }, + [TERRAIN_BATTLE_HALL] = { 0x40, 0x41, 0x42 }, + [TERRAIN_GIRATINA] = { 0x43, 0x44, 0x45 } }; void ov16_02268520(UnkStruct_ov16_02268520 *param0) @@ -195,14 +152,14 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) v2 = &Unk_ov16_022700CC[param0->unk_08]; if (param0->unk_08 == 0) { - v3 = ov16_BattleTerrainIndexToNARCMember[param0->unk_09]; + v3 = sov16_BattleTerrainIndexToNARCMember[param0->unk_09]; v4 = 20013; v5 = 128; v6 = 20005; v7 = 129; v8 = 20005; } else { - v3 = ov16_BattleTerrainIndexToOpponentNARCMember[param0->unk_09]; + v3 = sov16_BattleTerrainIndexToOpponentNARCMember[param0->unk_09]; v4 = 20014; v5 = 131; v6 = 20006; @@ -211,8 +168,8 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) } SpriteRenderer_LoadCharResObjFromOpenNarc(v0, v1, v10, v3, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v4); - SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, ov16_BattleTerrainIndexToPaletteMember[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); - PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, ov16_BattleTerrainIndexToPaletteMember[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); + SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, sov16_BattleTerrainIndexToPaletteMember[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); + PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, sov16_BattleTerrainIndexToPaletteMember[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); SpriteRenderer_LoadCellResObjFromOpenNarc(v0, v1, v10, v5, 1, v6); SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, v1, v10, v7, 1, v8); NARC_dtor(v10); diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 78058b50b8..0f8c69dcb0 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -408,8 +408,8 @@ static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1 { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(param2), 1, 45077); - sub_0200D41C(param1, BattleIcon_MoveTypeIndexToPaletteIndex(param2) + 4); + sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(param2), 1, 45077); + sub_0200D41C(param1, BattleIcon_MoveClassIndexToPaletteIndex(param2) + 4); } static void ov13_02224AB0(u16 param0, CellActorData *param1, const int param2, const int param3) diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index f1e7159e5f..198d37a935 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -450,8 +450,8 @@ void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2) sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v1), 1, 49409); sub_0200D41C(param0->unk_E0[10], BattleIcon_TypeIndexToPaletteIndex(v1) + 6); - sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(v2), 1, 49410); - sub_0200D41C(param0->unk_E0[11], BattleIcon_MoveTypeIndexToPaletteIndex(v2) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(v2), 1, 49410); + sub_0200D41C(param0->unk_E0[11], BattleIcon_MoveClassIndexToPaletteIndex(v2) + 6); } void ov84_02240E24(UnkStruct_ov84_0223B5A0 *param0, s16 param1, s16 param2) diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index d6d20feecc..d51efd60f1 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1444,8 +1444,8 @@ static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(v0), 1, 47275); - sub_0200D41C(param0->unk_118[5], BattleIcon_MoveTypeIndexToPaletteIndex(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(v0), 1, 47275); + sub_0200D41C(param0->unk_118[5], BattleIcon_MoveClassIndexToPaletteIndex(v0) + 2); } static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index d80497f38c..279138fd0b 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -464,8 +464,8 @@ void sub_0208F294(PokemonSummaryApp *param0, u32 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->renderer, param0->gfxHandler, BattleIcon_GetMoveTypeNARCIndex(), BattleIcon_MoveTypeIndexToNARCMember(v0), 1, 10); - sub_0200D414(param0->unk_41C[18], BattleIcon_MoveTypeIndexToPaletteIndex(v0) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(v0), 1, 10); + sub_0200D414(param0->unk_41C[18], BattleIcon_MoveClassIndexToPaletteIndex(v0) + 3); } void sub_0208F2E8(PokemonSummaryApp *param0) From 434a25043a4d8c767a6b0a3f2f2dc5ebc02882bd Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Wed, 16 Oct 2024 16:03:25 -0500 Subject: [PATCH 14/26] generate + use naix for pl_batt_obj, rename known NCER/NANR files --- include/battle/battle_icon.h | 2 - res/battle/graphic/pl_batt_obj/meson.build | 1 + res/battle/graphic/pl_batt_obj/order.txt | 686 +++++++++--------- ...pal => battle_subscreen_cursor_corner.pal} | 0 .../graphic/pl_batt_obj/palettes/data.json | 2 +- .../graphic/pl_batt_obj/palettes/meson.build | 2 +- ...batt_obj_00000334.NANR => bait_throw.NANR} | Bin ...batt_obj_00000284.NCER => bait_throw.NCER} | Bin ...NR => ball_status_indicator_opponent.NANR} | Bin ...ER => ball_status_indicator_opponent.NCER} | Bin ...NANR => ball_status_indicator_player.NANR} | Bin ...NCER => ball_status_indicator_player.NCER} | Bin ...NR => battle_subscreen_cursor_corner.NANR} | Bin ...ER => battle_subscreen_cursor_corner.NCER} | Bin ...0132.NANR => battle_terrain_opponent.NANR} | Bin ...0131.NCER => battle_terrain_opponent.NCER} | Bin ...000129.NANR => battle_terrain_player.NANR} | Bin ...000128.NCER => battle_terrain_player.NCER} | Bin ..._00000283.NANR => cherish_ball_throw.NANR} | Bin ..._00000287.NCER => cherish_ball_throw.NCER} | Bin .../graphic/pl_batt_obj/prebuilt/data.json | 128 ++-- ...obj_00000286.NANR => dive_ball_throw.NANR} | Bin ...obj_00000290.NCER => dive_ball_throw.NCER} | Bin ...obj_00000319.NANR => dusk_ball_throw.NANR} | Bin ...obj_00000293.NCER => dusk_ball_throw.NCER} | Bin ...bj_00000289.NANR => great_ball_throw.NANR} | Bin ...bj_00000296.NCER => great_ball_throw.NCER} | Bin ...obj_00000322.NANR => heal_ball_throw.NANR} | Bin ...obj_00000299.NCER => heal_ball_throw.NCER} | Bin ...NANR => healthbox_doubles_opponent_1.NANR} | Bin ...NCER => healthbox_doubles_opponent_1.NCER} | Bin ...NANR => healthbox_doubles_opponent_2.NANR} | Bin ...NCER => healthbox_doubles_opponent_2.NCER} | Bin ...2.NANR => healthbox_doubles_player_1.NANR} | Bin ...6.NCER => healthbox_doubles_player_1.NCER} | Bin ...5.NANR => healthbox_doubles_player_2.NANR} | Bin ...9.NCER => healthbox_doubles_player_2.NCER} | Bin ...bj_00000198.NANR => healthbox_safari.NANR} | Bin ...bj_00000254.NCER => healthbox_safari.NCER} | Bin ...1.NANR => healthbox_singles_opponent.NANR} | Bin ...2.NCER => healthbox_singles_opponent.NCER} | Bin ...255.NANR => healthbox_singles_player.NANR} | Bin ...190.NCER => healthbox_singles_player.NCER} | Bin ...j_00000292.NANR => luxury_ball_throw.NANR} | Bin ...j_00000302.NCER => luxury_ball_throw.NCER} | Bin ...j_00000295.NANR => master_ball_throw.NANR} | Bin ...j_00000305.NCER => master_ball_throw.NCER} | Bin .../graphic/pl_batt_obj/prebuilt/meson.build | 196 ++--- ..._batt_obj_00000337.NANR => mud_throw.NANR} | Bin ..._batt_obj_00000338.NCER => mud_throw.NCER} | Bin ...obj_00000298.NANR => nest_ball_throw.NANR} | Bin ...obj_00000308.NCER => nest_ball_throw.NCER} | Bin ..._obj_00000301.NANR => net_ball_throw.NANR} | Bin ..._obj_00000311.NCER => net_ball_throw.NCER} | Bin ...obj_00000304.NANR => park_ball_throw.NANR} | Bin ...obj_00000314.NCER => park_ball_throw.NCER} | Bin ...att_obj_00000342.NANR => party_gauge.NANR} | Bin ...att_obj_00000341.NCER => party_gauge.NCER} | Bin ...obj_00000307.NANR => poke_ball_throw.NANR} | Bin ...obj_00000317.NCER => poke_ball_throw.NCER} | Bin ..._00000310.NANR => premier_ball_throw.NANR} | Bin ..._00000320.NCER => premier_ball_throw.NCER} | Bin ...bj_00000325.NANR => quick_ball_throw.NANR} | Bin ...bj_00000323.NCER => quick_ball_throw.NCER} | Bin ...j_00000313.NANR => repeat_ball_throw.NANR} | Bin ...j_00000326.NCER => repeat_ball_throw.NCER} | Bin ...j_00000316.NANR => safari_ball_throw.NANR} | Bin ...j_00000329.NCER => safari_ball_throw.NCER} | Bin ...bj_00000328.NANR => timer_ball_throw.NANR} | Bin ...bj_00000332.NCER => timer_ball_throw.NCER} | Bin ...bj_00000331.NANR => ultra_ball_throw.NANR} | Bin ...bj_00000335.NCER => ultra_ball_throw.NCER} | Bin .../graphic/pl_batt_obj/sprites/data.json | 6 +- .../graphic/pl_batt_obj/sprites/meson.build | 6 +- ...e_physical.png => move_class_physical.png} | Bin ...ype_special.png => move_class_special.png} | Bin ..._type_status.png => move_class_status.png} | Bin src/battle/battle_icon.c | 55 +- src/battle/healthbar.c | 77 +- src/battle/ov16_02268520.c | 154 ++-- src/battle/ov16_0226871C.c | 14 +- src/battle/ov16_0226DB7C.c | 10 +- src/battle/party_gauge.c | 16 +- src/overlay010/ov10_0221F800.c | 8 +- src/overlay012/ov12_02235E94.c | 42 +- .../pl_batt_obj/make_pl_batt_obj_palettes.py | 2 +- .../pl_batt_obj/make_pl_batt_obj_prebuilts.py | 4 +- .../pl_batt_obj/make_pl_batt_obj_sprites.py | 2 +- 88 files changed, 705 insertions(+), 708 deletions(-) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000080.pal => battle_subscreen_cursor_corner.pal} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000334.NANR => bait_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000284.NCER => bait_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000206.NANR => ball_status_indicator_opponent.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000204.NCER => ball_status_indicator_opponent.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000209.NANR => ball_status_indicator_player.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000207.NCER => ball_status_indicator_player.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000252.NANR => battle_subscreen_cursor_corner.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000251.NCER => battle_subscreen_cursor_corner.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000132.NANR => battle_terrain_opponent.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000131.NCER => battle_terrain_opponent.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000129.NANR => battle_terrain_player.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000128.NCER => battle_terrain_player.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000283.NANR => cherish_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000287.NCER => cherish_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000286.NANR => dive_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000290.NCER => dive_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000319.NANR => dusk_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000293.NCER => dusk_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000289.NANR => great_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000296.NCER => great_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000322.NANR => heal_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000299.NCER => heal_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000186.NANR => healthbox_doubles_opponent_1.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000187.NCER => healthbox_doubles_opponent_1.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000189.NANR => healthbox_doubles_opponent_2.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000193.NCER => healthbox_doubles_opponent_2.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000192.NANR => healthbox_doubles_player_1.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000196.NCER => healthbox_doubles_player_1.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000195.NANR => healthbox_doubles_player_2.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000199.NCER => healthbox_doubles_player_2.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000198.NANR => healthbox_safari.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000254.NCER => healthbox_safari.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000201.NANR => healthbox_singles_opponent.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000202.NCER => healthbox_singles_opponent.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000255.NANR => healthbox_singles_player.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000190.NCER => healthbox_singles_player.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000292.NANR => luxury_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000302.NCER => luxury_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000295.NANR => master_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000305.NCER => master_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000337.NANR => mud_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000338.NCER => mud_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000298.NANR => nest_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000308.NCER => nest_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000301.NANR => net_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000311.NCER => net_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000304.NANR => park_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000314.NCER => park_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000342.NANR => party_gauge.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000341.NCER => party_gauge.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000307.NANR => poke_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000317.NCER => poke_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000310.NANR => premier_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000320.NCER => premier_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000325.NANR => quick_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000323.NCER => quick_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000313.NANR => repeat_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000326.NCER => repeat_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000316.NANR => safari_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000329.NCER => safari_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000328.NANR => timer_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000332.NCER => timer_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000331.NANR => ultra_ball_throw.NANR} (100%) rename res/battle/graphic/pl_batt_obj/prebuilt/{pl_batt_obj_00000335.NCER => ultra_ball_throw.NCER} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{move_type_physical.png => move_class_physical.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{move_type_special.png => move_class_special.png} (100%) rename res/battle/graphic/pl_batt_obj/sprites/{move_type_status.png => move_class_status.png} (100%) diff --git a/include/battle/battle_icon.h b/include/battle/battle_icon.h index 3bb5a84e49..33ac5a786a 100644 --- a/include/battle/battle_icon.h +++ b/include/battle/battle_icon.h @@ -10,8 +10,6 @@ #include "palette.h" -#define NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE 74 - u32 BattleIcon_TypeIndexToNARCMember(int param0); u32 BattleIcon_GetPaletteNARCMember(void); u32 sub_0207C924(void); diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index c0e0e68386..921418af85 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -16,6 +16,7 @@ nitrofs_files += custom_target('pl_batt_obj.narc', knarc_exe, '-d', '@PRIVATE_DIR@', '-o', '@INPUT0@', + '--naix', '-p', '@OUTPUT@' ], diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/order.txt index 6b20cb3a99..9da6155caf 100644 --- a/res/battle/graphic/pl_batt_obj/order.txt +++ b/res/battle/graphic/pl_batt_obj/order.txt @@ -1,343 +1,343 @@ -pl_batt_obj_00000000.NCLR -battle_terrain_grass_day.NCLR -battle_terrain_grass_afternoon.NCLR -battle_terrain_grass_night.NCLR -battle_terrain_surf_day.NCLR -battle_terrain_surf_afternoon.NCLR -battle_terrain_surf_night.NCLR -battle_terrain_path_day.NCLR -battle_terrain_path_afternoon.NCLR -battle_terrain_path_night.NCLR -battle_terrain_ice_day.NCLR -battle_terrain_ice_afternoon.NCLR -battle_terrain_ice_night.NCLR -battle_terrain_mountain_day.NCLR -battle_terrain_mountain_afternoon.NCLR -battle_terrain_mountain_night.NCLR -battle_terrain_snow_day.NCLR -battle_terrain_snow_afternoon.NCLR -battle_terrain_snow_night.NCLR -battle_terrain_indoors_day.NCLR -battle_terrain_indoors_afternoon.NCLR -battle_terrain_indoors_night.NCLR -battle_terrain_sand_day.NCLR -battle_terrain_sand_afternoon.NCLR -battle_terrain_sand_night.NCLR -battle_terrain_mud_day.NCLR -battle_terrain_mud_afternoon.NCLR -battle_terrain_mud_night.NCLR -battle_terrain_cave_day.NCLR -battle_terrain_cave_afternoon.NCLR -battle_terrain_cave_night.NCLR -battle_terrain_puddle_day.NCLR -battle_terrain_puddle_afternoon.NCLR -battle_terrain_puddle_night.NCLR -battle_terrain_elite4_aaron_day.NCLR -battle_terrain_elite4_aaron_afternoon.NCLR -battle_terrain_elite4_aaron_night.NCLR -battle_terrain_elite4_bertha_day.NCLR -battle_terrain_elite4_bertha_afternoon.NCLR -battle_terrain_elite4_bertha_night.NCLR -battle_terrain_elite4_flint_day.NCLR -battle_terrain_elite4_flint_afternoon.NCLR -battle_terrain_elite4_flint_night.NCLR -battle_terrain_elite4_lucian_day.NCLR -battle_terrain_elite4_lucian_afternoon.NCLR -battle_terrain_elite4_lucian_night.NCLR -battle_terrain_champion_day.NCLR -battle_terrain_champion_afternoon.NCLR -battle_terrain_champion_night.NCLR -battle_terrain_distortion_world_day.NCLR -battle_terrain_distortion_world_afternoon.NCLR -battle_terrain_distortion_world_night.NCLR -battle_terrain_tower_day.NCLR -battle_terrain_tower_afternoon.NCLR -battle_terrain_tower_night.NCLR -battle_terrain_factory_day.NCLR -battle_terrain_factory_afternoon.NCLR -battle_terrain_factory_night.NCLR -battle_terrain_arcade_day.NCLR -battle_terrain_arcade_afternoon.NCLR -battle_terrain_arcade_night.NCLR -battle_terrain_castle_day.NCLR -battle_terrain_castle_afternoon.NCLR -battle_terrain_castle_night.NCLR -battle_terrain_hall_day.NCLR -battle_terrain_hall_afternoon.NCLR -battle_terrain_hall_night.NCLR -battle_terrain_giratina_day.NCLR -battle_terrain_giratina_afternoon.NCLR -battle_terrain_giratina_night.NCLR -pl_batt_obj_00000070.NCLR -healthbox_normal.NCLR -pl_batt_obj_00000072.NCLR -pl_batt_obj_00000073.NCLR -icon_palettes.NCLR -pl_batt_obj_00000075.NCLR -pl_batt_obj_00000076.NCGR -pl_batt_obj_00000077.NCER -pl_batt_obj_00000078.NANR -pl_batt_obj_00000079.NCLR -pl_batt_obj_00000080.NCLR -healthbox_safari.NCLR -pl_batt_obj_00000082.NCLR -pl_batt_obj_00000083.NCLR -pl_batt_obj_00000084.NCLR -pl_batt_obj_00000085.NCLR -pl_batt_obj_00000086.NCLR -pl_batt_obj_00000087.NCLR -pl_batt_obj_00000088.NCLR -pl_batt_obj_00000089.NCLR -pl_batt_obj_00000090.NCLR -poke_ball_throw.NCLR -master_ball_throw.NCLR -ultra_ball_throw.NCLR -great_ball_throw.NCLR -safari_ball_throw.NCLR -net_ball_throw.NCLR -dive_ball_throw.NCLR -nest_ball_throw.NCLR -repeat_ball_throw.NCLR -timer_ball_throw.NCLR -luxury_ball_throw.NCLR -premier_ball_throw.NCLR -quick_ball_throw.NCLR -dusk_ball_throw.NCLR -heal_ball_throw.NCLR -cherish_ball_throw.NCLR -park_ball_throw.NCLR -bait_throw.NCLR -mud_throw.NCLR -party_gauge.NCLR -pl_batt_obj_00000111.NCLR -pl_batt_obj_00000112.NCGR -pl_batt_obj_00000113.NCER -pl_batt_obj_00000114.NANR -pl_batt_obj_00000115.NANR -pl_batt_obj_00000116.NCER -pl_batt_obj_00000117.NCGR -pl_batt_obj_00000118.NANR -pl_batt_obj_00000119.NCER -pl_batt_obj_00000120.NCGR -pl_batt_obj_00000121.NCGR -pl_batt_obj_00000122.NCER -pl_batt_obj_00000123.NANR -pl_batt_obj_00000124.NCGR -pl_batt_obj_00000125.NCER -pl_batt_obj_00000126.NANR -battle_terrain_grass_player.NCGR -pl_batt_obj_00000128.NCER -pl_batt_obj_00000129.NANR -battle_terrain_grass_opponent.NCGR -pl_batt_obj_00000131.NCER -pl_batt_obj_00000132.NANR -battle_terrain_surf_player.NCGR -battle_terrain_surf_opponent.NCGR -battle_terrain_path_player.NCGR -battle_terrain_path_opponent.NCGR -battle_terrain_ice_player.NCGR -battle_terrain_ice_opponent.NCGR -battle_terrain_mountain_player.NCGR -battle_terrain_mountain_opponent.NCGR -battle_terrain_snow_player.NCGR -battle_terrain_snow_opponent.NCGR -battle_terrain_indoors_player.NCGR -battle_terrain_indoors_opponent.NCGR -battle_terrain_sand_player.NCGR -battle_terrain_sand_opponent.NCGR -battle_terrain_mud_player.NCGR -battle_terrain_mud_opponent.NCGR -battle_terrain_cave_player.NCGR -battle_terrain_cave_opponent.NCGR -battle_terrain_puddle_player.NCGR -battle_terrain_puddle_opponent.NCGR -battle_terrain_elite4_aaron_player.NCGR -battle_terrain_elite4_aaron_opponent.NCGR -battle_terrain_elite4_bertha_player.NCGR -battle_terrain_elite4_bertha_opponent.NCGR -battle_terrain_elite4_flint_player.NCGR -battle_terrain_elite4_flint_opponent.NCGR -battle_terrain_elite4_lucian_player.NCGR -battle_terrain_elite4_lucian_opponent.NCGR -battle_terrain_champion_player.NCGR -battle_terrain_champion_opponent.NCGR -battle_terrain_distortion_world_player.NCGR -battle_terrain_distortion_world_opponent.NCGR -battle_terrain_tower_player.NCGR -battle_terrain_tower_opponent.NCGR -battle_terrain_factory_player.NCGR -battle_terrain_factory_opponent.NCGR -battle_terrain_arcade_player.NCGR -battle_terrain_arcade_opponent.NCGR -battle_terrain_castle_player.NCGR -battle_terrain_castle_opponent.NCGR -battle_terrain_hall_player.NCGR -battle_terrain_hall_opponent.NCGR -battle_terrain_giratina_player.NCGR -battle_terrain_giratina_opponent.NCGR -pl_batt_obj_00000177.NANR -pl_batt_obj_00000178.NCER -pl_batt_obj_00000179.NCGR -pl_batt_obj_00000180.NANR -pl_batt_obj_00000181.NCER -pl_batt_obj_00000182.NCGR -pl_batt_obj_00000183.NANR -pl_batt_obj_00000184.NCER -pl_batt_obj_00000185.NCGR -pl_batt_obj_00000186.NANR -pl_batt_obj_00000187.NCER -healthbox_singles_opponent.NCGR -pl_batt_obj_00000189.NANR -pl_batt_obj_00000190.NCER -healthbox_singles_player.NCGR -pl_batt_obj_00000192.NANR -pl_batt_obj_00000193.NCER -healthbox_doubles_opponent_1.NCGR -pl_batt_obj_00000195.NANR -pl_batt_obj_00000196.NCER -healthbox_doubles_opponent_2.NCGR -pl_batt_obj_00000198.NANR -pl_batt_obj_00000199.NCER -healthbox_doubles_player_1.NCGR -pl_batt_obj_00000201.NANR -pl_batt_obj_00000202.NCER -healthbox_doubles_player_2.NCGR -pl_batt_obj_00000204.NCER -ball_status_indicator_opponent.NCGR -pl_batt_obj_00000206.NANR -pl_batt_obj_00000207.NCER -ball_status_indicator_player.NCGR -pl_batt_obj_00000209.NANR -pl_batt_obj_00000210.NCER -pl_batt_obj_00000211.NCGR -pl_batt_obj_00000212.NANR -pl_batt_obj_00000213.NCER -pl_batt_obj_00000214.NCGR -pl_batt_obj_00000215.NANR -pl_batt_obj_00000216.NCER -pl_batt_obj_00000217.NCGR -pl_batt_obj_00000218.NANR -contest_icon_beauty.NCGR -contest_icon_cute.NCGR -type_icon_dragon.NCGR -type_icon_electric.NCGR -type_icon_psychic.NCGR -type_icon_dark.NCGR -type_icon_fighting.NCGR -type_icon_fire.NCGR -type_icon_flying.NCGR -type_icon_ghost.NCGR -type_icon_ground.NCGR -type_icon_ice.NCGR -type_icon_bug.NCGR -contest_icon_smart.NCGR -type_icon_grass.NCGR -type_icon_normal.NCGR -type_icon_poison.NCGR -type_icon_mystery.NCGR -type_icon_rock.NCGR -type_icon_steel.NCGR -contest_icon_tough.NCGR -contest_icon_cool.NCGR -type_icon_water.NCGR -pl_batt_obj_00000242.NCER -pl_batt_obj_00000243.NANR -move_type_physical.NCGR -move_type_status.NCGR -move_type_special.NCGR -pl_batt_obj_00000247.NCGR -pl_batt_obj_00000248.NCER -pl_batt_obj_00000249.NANR -battle_subscreen_cursor_corner.NCGR -pl_batt_obj_00000251.NCER -pl_batt_obj_00000252.NANR -healthbox_safari.NCGR -pl_batt_obj_00000254.NCER -pl_batt_obj_00000255.NANR -pl_batt_obj_00000256.NCGR -pl_batt_obj_00000257.NCER -pl_batt_obj_00000258.NANR -pl_batt_obj_00000259.NCGR -pl_batt_obj_00000260.NCGR -pl_batt_obj_00000261.NCGR -pl_batt_obj_00000262.NCGR -pl_batt_obj_00000263.NCGR -pl_batt_obj_00000264.NCGR -pl_batt_obj_00000265.NCGR -pl_batt_obj_00000266.NCGR -pl_batt_obj_00000267.NCER -pl_batt_obj_00000268.NCER -pl_batt_obj_00000269.NCER -pl_batt_obj_00000270.NCER -pl_batt_obj_00000271.NCER -pl_batt_obj_00000272.NCER -pl_batt_obj_00000273.NCER -pl_batt_obj_00000274.NCER -pl_batt_obj_00000275.NANR -pl_batt_obj_00000276.NANR -pl_batt_obj_00000277.NANR -pl_batt_obj_00000278.NANR -pl_batt_obj_00000279.NANR -pl_batt_obj_00000280.NANR -pl_batt_obj_00000281.NANR -pl_batt_obj_00000282.NANR -pl_batt_obj_00000283.NANR -pl_batt_obj_00000284.NCER -poke_ball_throw.NCGR -pl_batt_obj_00000286.NANR -pl_batt_obj_00000287.NCER -master_ball_throw.NCGR -pl_batt_obj_00000289.NANR -pl_batt_obj_00000290.NCER -ultra_ball_throw.NCGR -pl_batt_obj_00000292.NANR -pl_batt_obj_00000293.NCER -great_ball_throw.NCGR -pl_batt_obj_00000295.NANR -pl_batt_obj_00000296.NCER -safari_ball_throw.NCGR -pl_batt_obj_00000298.NANR -pl_batt_obj_00000299.NCER -net_ball_throw.NCGR -pl_batt_obj_00000301.NANR -pl_batt_obj_00000302.NCER -dive_ball_throw.NCGR -pl_batt_obj_00000304.NANR -pl_batt_obj_00000305.NCER -nest_ball_throw.NCGR -pl_batt_obj_00000307.NANR -pl_batt_obj_00000308.NCER -repeat_ball_throw.NCGR -pl_batt_obj_00000310.NANR -pl_batt_obj_00000311.NCER -timer_ball_throw.NCGR -pl_batt_obj_00000313.NANR -pl_batt_obj_00000314.NCER -luxury_ball_throw.NCGR -pl_batt_obj_00000316.NANR -pl_batt_obj_00000317.NCER -premier_ball_throw.NCGR -pl_batt_obj_00000319.NANR -pl_batt_obj_00000320.NCER -quick_ball_throw.NCGR -pl_batt_obj_00000322.NANR -pl_batt_obj_00000323.NCER -dusk_ball_throw.NCGR -pl_batt_obj_00000325.NANR -pl_batt_obj_00000326.NCER -heal_ball_throw.NCGR -pl_batt_obj_00000328.NANR -pl_batt_obj_00000329.NCER -cherish_ball_throw.NCGR -pl_batt_obj_00000331.NANR -pl_batt_obj_00000332.NCER -park_ball_throw.NCGR -pl_batt_obj_00000334.NANR -pl_batt_obj_00000335.NCER -bait_throw.NCGR -pl_batt_obj_00000337.NANR -pl_batt_obj_00000338.NCER -mud_throw.NCGR -party_gauge.NCGR -pl_batt_obj_00000341.NCER -pl_batt_obj_00000342.NANR \ No newline at end of file +pl_batt_obj_00000000.nclr +battle_terrain_grass_day.nclr +battle_terrain_grass_afternoon.nclr +battle_terrain_grass_night.nclr +battle_terrain_surf_day.nclr +battle_terrain_surf_afternoon.nclr +battle_terrain_surf_night.nclr +battle_terrain_path_day.nclr +battle_terrain_path_afternoon.nclr +battle_terrain_path_night.nclr +battle_terrain_ice_day.nclr +battle_terrain_ice_afternoon.nclr +battle_terrain_ice_night.nclr +battle_terrain_mountain_day.nclr +battle_terrain_mountain_afternoon.nclr +battle_terrain_mountain_night.nclr +battle_terrain_snow_day.nclr +battle_terrain_snow_afternoon.nclr +battle_terrain_snow_night.nclr +battle_terrain_indoors_day.nclr +battle_terrain_indoors_afternoon.nclr +battle_terrain_indoors_night.nclr +battle_terrain_sand_day.nclr +battle_terrain_sand_afternoon.nclr +battle_terrain_sand_night.nclr +battle_terrain_mud_day.nclr +battle_terrain_mud_afternoon.nclr +battle_terrain_mud_night.nclr +battle_terrain_cave_day.nclr +battle_terrain_cave_afternoon.nclr +battle_terrain_cave_night.nclr +battle_terrain_puddle_day.nclr +battle_terrain_puddle_afternoon.nclr +battle_terrain_puddle_night.nclr +battle_terrain_elite4_aaron_day.nclr +battle_terrain_elite4_aaron_afternoon.nclr +battle_terrain_elite4_aaron_night.nclr +battle_terrain_elite4_bertha_day.nclr +battle_terrain_elite4_bertha_afternoon.nclr +battle_terrain_elite4_bertha_night.nclr +battle_terrain_elite4_flint_day.nclr +battle_terrain_elite4_flint_afternoon.nclr +battle_terrain_elite4_flint_night.nclr +battle_terrain_elite4_lucian_day.nclr +battle_terrain_elite4_lucian_afternoon.nclr +battle_terrain_elite4_lucian_night.nclr +battle_terrain_champion_day.nclr +battle_terrain_champion_afternoon.nclr +battle_terrain_champion_night.nclr +battle_terrain_distortion_world_day.nclr +battle_terrain_distortion_world_afternoon.nclr +battle_terrain_distortion_world_night.nclr +battle_terrain_tower_day.nclr +battle_terrain_tower_afternoon.nclr +battle_terrain_tower_night.nclr +battle_terrain_factory_day.nclr +battle_terrain_factory_afternoon.nclr +battle_terrain_factory_night.nclr +battle_terrain_arcade_day.nclr +battle_terrain_arcade_afternoon.nclr +battle_terrain_arcade_night.nclr +battle_terrain_castle_day.nclr +battle_terrain_castle_afternoon.nclr +battle_terrain_castle_night.nclr +battle_terrain_hall_day.nclr +battle_terrain_hall_afternoon.nclr +battle_terrain_hall_night.nclr +battle_terrain_giratina_day.nclr +battle_terrain_giratina_afternoon.nclr +battle_terrain_giratina_night.nclr +pl_batt_obj_00000070.nclr +healthbox_normal.nclr +pl_batt_obj_00000072.nclr +pl_batt_obj_00000073.nclr +icon_palettes.nclr +pl_batt_obj_00000075.nclr +pl_batt_obj_00000076.ncgr +pl_batt_obj_00000077.ncer +pl_batt_obj_00000078.nanr +pl_batt_obj_00000079.nclr +battle_subscreen_cursor_corner.nclr +healthbox_safari.nclr +pl_batt_obj_00000082.nclr +pl_batt_obj_00000083.nclr +pl_batt_obj_00000084.nclr +pl_batt_obj_00000085.nclr +pl_batt_obj_00000086.nclr +pl_batt_obj_00000087.nclr +pl_batt_obj_00000088.nclr +pl_batt_obj_00000089.nclr +pl_batt_obj_00000090.nclr +poke_ball_throw.nclr +master_ball_throw.nclr +ultra_ball_throw.nclr +great_ball_throw.nclr +safari_ball_throw.nclr +net_ball_throw.nclr +dive_ball_throw.nclr +nest_ball_throw.nclr +repeat_ball_throw.nclr +timer_ball_throw.nclr +luxury_ball_throw.nclr +premier_ball_throw.nclr +quick_ball_throw.nclr +dusk_ball_throw.nclr +heal_ball_throw.nclr +cherish_ball_throw.nclr +park_ball_throw.nclr +bait_throw.nclr +mud_throw.nclr +party_gauge.nclr +pl_batt_obj_00000111.nclr +pl_batt_obj_00000112.ncgr +pl_batt_obj_00000113.ncer +pl_batt_obj_00000114.nanr +pl_batt_obj_00000115.nanr +pl_batt_obj_00000116.ncer +pl_batt_obj_00000117.ncgr +pl_batt_obj_00000118.nanr +pl_batt_obj_00000119.ncer +pl_batt_obj_00000120.ncgr +pl_batt_obj_00000121.ncgr +pl_batt_obj_00000122.ncer +pl_batt_obj_00000123.nanr +pl_batt_obj_00000124.ncgr +pl_batt_obj_00000125.ncer +pl_batt_obj_00000126.nanr +battle_terrain_grass_player.ncgr +battle_terrain_player.ncer +battle_terrain_player.nanr +battle_terrain_grass_opponent.ncgr +battle_terrain_opponent.ncer +battle_terrain_opponent.nanr +battle_terrain_surf_player.ncgr +battle_terrain_surf_opponent.ncgr +battle_terrain_path_player.ncgr +battle_terrain_path_opponent.ncgr +battle_terrain_ice_player.ncgr +battle_terrain_ice_opponent.ncgr +battle_terrain_mountain_player.ncgr +battle_terrain_mountain_opponent.ncgr +battle_terrain_snow_player.ncgr +battle_terrain_snow_opponent.ncgr +battle_terrain_indoors_player.ncgr +battle_terrain_indoors_opponent.ncgr +battle_terrain_sand_player.ncgr +battle_terrain_sand_opponent.ncgr +battle_terrain_mud_player.ncgr +battle_terrain_mud_opponent.ncgr +battle_terrain_cave_player.ncgr +battle_terrain_cave_opponent.ncgr +battle_terrain_puddle_player.ncgr +battle_terrain_puddle_opponent.ncgr +battle_terrain_elite4_aaron_player.ncgr +battle_terrain_elite4_aaron_opponent.ncgr +battle_terrain_elite4_bertha_player.ncgr +battle_terrain_elite4_bertha_opponent.ncgr +battle_terrain_elite4_flint_player.ncgr +battle_terrain_elite4_flint_opponent.ncgr +battle_terrain_elite4_lucian_player.ncgr +battle_terrain_elite4_lucian_opponent.ncgr +battle_terrain_champion_player.ncgr +battle_terrain_champion_opponent.ncgr +battle_terrain_distortion_world_player.ncgr +battle_terrain_distortion_world_opponent.ncgr +battle_terrain_tower_player.ncgr +battle_terrain_tower_opponent.ncgr +battle_terrain_factory_player.ncgr +battle_terrain_factory_opponent.ncgr +battle_terrain_arcade_player.ncgr +battle_terrain_arcade_opponent.ncgr +battle_terrain_castle_player.ncgr +battle_terrain_castle_opponent.ncgr +battle_terrain_hall_player.ncgr +battle_terrain_hall_opponent.ncgr +battle_terrain_giratina_player.ncgr +battle_terrain_giratina_opponent.ncgr +pl_batt_obj_00000177.nanr +pl_batt_obj_00000178.ncer +pl_batt_obj_00000179.ncgr +pl_batt_obj_00000180.nanr +pl_batt_obj_00000181.ncer +pl_batt_obj_00000182.ncgr +pl_batt_obj_00000183.nanr +pl_batt_obj_00000184.ncer +pl_batt_obj_00000185.ncgr +healthbox_singles_opponent.nanr +healthbox_singles_opponent.ncer +healthbox_singles_opponent.ncgr +healthbox_singles_player.nanr +healthbox_singles_player.ncer +healthbox_singles_player.ncgr +healthbox_doubles_opponent_1.nanr +healthbox_doubles_opponent_1.ncer +healthbox_doubles_opponent_1.ncgr +healthbox_doubles_opponent_2.nanr +healthbox_doubles_opponent_2.ncer +healthbox_doubles_opponent_2.ncgr +healthbox_doubles_player_1.nanr +healthbox_doubles_player_1.ncer +healthbox_doubles_player_1.ncgr +healthbox_doubles_player_2.nanr +healthbox_doubles_player_2.ncer +healthbox_doubles_player_2.ncgr +ball_status_indicator_opponent.ncer +ball_status_indicator_opponent.ncgr +ball_status_indicator_opponent.nanr +ball_status_indicator_player.ncer +ball_status_indicator_player.ncgr +ball_status_indicator_player.nanr +pl_batt_obj_00000210.ncer +pl_batt_obj_00000211.ncgr +pl_batt_obj_00000212.nanr +pl_batt_obj_00000213.ncer +pl_batt_obj_00000214.ncgr +pl_batt_obj_00000215.nanr +pl_batt_obj_00000216.ncer +pl_batt_obj_00000217.ncgr +pl_batt_obj_00000218.nanr +contest_icon_beauty.ncgr +contest_icon_cute.ncgr +type_icon_dragon.ncgr +type_icon_electric.ncgr +type_icon_psychic.ncgr +type_icon_dark.ncgr +type_icon_fighting.ncgr +type_icon_fire.ncgr +type_icon_flying.ncgr +type_icon_ghost.ncgr +type_icon_ground.ncgr +type_icon_ice.ncgr +type_icon_bug.ncgr +contest_icon_smart.ncgr +type_icon_grass.ncgr +type_icon_normal.ncgr +type_icon_poison.ncgr +type_icon_mystery.ncgr +type_icon_rock.ncgr +type_icon_steel.ncgr +contest_icon_tough.ncgr +contest_icon_cool.ncgr +type_icon_water.ncgr +pl_batt_obj_00000242.ncer +pl_batt_obj_00000243.nanr +move_class_physical.ncgr +move_class_status.ncgr +move_class_special.ncgr +pl_batt_obj_00000247.ncgr +pl_batt_obj_00000248.ncer +pl_batt_obj_00000249.nanr +battle_subscreen_cursor_corner.ncgr +battle_subscreen_cursor_corner.ncer +battle_subscreen_cursor_corner.nanr +healthbox_safari.ncgr +healthbox_safari.ncer +healthbox_safari.nanr +pl_batt_obj_00000256.ncgr +pl_batt_obj_00000257.ncer +pl_batt_obj_00000258.nanr +pl_batt_obj_00000259.ncgr +pl_batt_obj_00000260.ncgr +pl_batt_obj_00000261.ncgr +pl_batt_obj_00000262.ncgr +pl_batt_obj_00000263.ncgr +pl_batt_obj_00000264.ncgr +pl_batt_obj_00000265.ncgr +pl_batt_obj_00000266.ncgr +pl_batt_obj_00000267.ncer +pl_batt_obj_00000268.ncer +pl_batt_obj_00000269.ncer +pl_batt_obj_00000270.ncer +pl_batt_obj_00000271.ncer +pl_batt_obj_00000272.ncer +pl_batt_obj_00000273.ncer +pl_batt_obj_00000274.ncer +pl_batt_obj_00000275.nanr +pl_batt_obj_00000276.nanr +pl_batt_obj_00000277.nanr +pl_batt_obj_00000278.nanr +pl_batt_obj_00000279.nanr +pl_batt_obj_00000280.nanr +pl_batt_obj_00000281.nanr +pl_batt_obj_00000282.nanr +poke_ball_throw.nanr +poke_ball_throw.ncer +poke_ball_throw.ncgr +master_ball_throw.nanr +master_ball_throw.ncer +master_ball_throw.ncgr +ultra_ball_throw.nanr +ultra_ball_throw.ncer +ultra_ball_throw.ncgr +great_ball_throw.nanr +great_ball_throw.ncer +great_ball_throw.ncgr +safari_ball_throw.nanr +safari_ball_throw.ncer +safari_ball_throw.ncgr +net_ball_throw.nanr +net_ball_throw.ncer +net_ball_throw.ncgr +dive_ball_throw.nanr +dive_ball_throw.ncer +dive_ball_throw.ncgr +nest_ball_throw.nanr +nest_ball_throw.ncer +nest_ball_throw.ncgr +repeat_ball_throw.nanr +repeat_ball_throw.ncer +repeat_ball_throw.ncgr +timer_ball_throw.nanr +timer_ball_throw.ncer +timer_ball_throw.ncgr +luxury_ball_throw.nanr +luxury_ball_throw.ncer +luxury_ball_throw.ncgr +premier_ball_throw.nanr +premier_ball_throw.ncer +premier_ball_throw.ncgr +quick_ball_throw.nanr +quick_ball_throw.ncer +quick_ball_throw.ncgr +dusk_ball_throw.nanr +dusk_ball_throw.ncer +dusk_ball_throw.ncgr +heal_ball_throw.nanr +heal_ball_throw.ncer +heal_ball_throw.ncgr +cherish_ball_throw.nanr +cherish_ball_throw.ncer +cherish_ball_throw.ncgr +park_ball_throw.nanr +park_ball_throw.ncer +park_ball_throw.ncgr +bait_throw.nanr +bait_throw.ncer +bait_throw.ncgr +mud_throw.nanr +mud_throw.ncer +mud_throw.ncgr +party_gauge.ncgr +party_gauge.ncer +party_gauge.nanr \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000080.pal b/res/battle/graphic/pl_batt_obj/palettes/battle_subscreen_cursor_corner.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000080.pal rename to res/battle/graphic/pl_batt_obj/palettes/battle_subscreen_cursor_corner.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/data.json b/res/battle/graphic/pl_batt_obj/palettes/data.json index 383c3aaee0..986903a646 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/data.json +++ b/res/battle/graphic/pl_batt_obj/palettes/data.json @@ -595,7 +595,7 @@ "invert_size": true }, { - "target": "pl_batt_obj_00000080.pal", + "target": "battle_subscreen_cursor_corner.pal", "bitdepth": 4, "pad": false, "pcmp": true, diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/pl_batt_obj/palettes/meson.build index 33300529dd..5a0cdf880d 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/meson.build +++ b/res/battle/graphic/pl_batt_obj/palettes/meson.build @@ -76,7 +76,7 @@ pl_batt_obj_palettes = files( 'icon_palettes.pal', 'pl_batt_obj_00000075.pal', 'pl_batt_obj_00000079.pal', - 'pl_batt_obj_00000080.pal', + 'battle_subscreen_cursor_corner.pal', 'healthbox_safari.pal', 'pl_batt_obj_00000082.pal', 'pl_batt_obj_00000083.pal', diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000334.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000334.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000284.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000284.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000206.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_opponent.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000206.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_opponent.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000204.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_opponent.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000204.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_opponent.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000209.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000209.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000207.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000207.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000252.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000252.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000251.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000251.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000132.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_opponent.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000132.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_opponent.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000131.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_opponent.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000131.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_opponent.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000129.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_player.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000129.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_player.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000128.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_player.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000128.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_player.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000283.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/cherish_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000283.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/cherish_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000287.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/cherish_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000287.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/cherish_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/data.json b/res/battle/graphic/pl_batt_obj/prebuilt/data.json index 02ce6bf974..87574e3113 100644 --- a/res/battle/graphic/pl_batt_obj/prebuilt/data.json +++ b/res/battle/graphic/pl_batt_obj/prebuilt/data.json @@ -48,19 +48,19 @@ "compressed": true }, { - "target": "pl_batt_obj_00000128.NCER", + "target": "battle_terrain_player.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000129.NANR", + "target": "battle_terrain_player.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000131.NCER", + "target": "battle_terrain_opponent.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000132.NANR", + "target": "battle_terrain_opponent.NANR", "compressed": true }, { @@ -88,67 +88,67 @@ "compressed": true }, { - "target": "pl_batt_obj_00000186.NANR", + "target": "healthbox_singles_opponent.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000187.NCER", + "target": "healthbox_singles_opponent.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000189.NANR", + "target": "healthbox_singles_player.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000190.NCER", + "target": "healthbox_singles_player.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000192.NANR", + "target": "healthbox_doubles_opponent_1.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000193.NCER", + "target": "healthbox_doubles_opponent_1.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000195.NANR", + "target": "healthbox_doubles_opponent_2.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000196.NCER", + "target": "healthbox_doubles_opponent_2.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000198.NANR", + "target": "healthbox_doubles_player_1.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000199.NCER", + "target": "healthbox_doubles_player_1.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000201.NANR", + "target": "healthbox_doubles_player_2.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000202.NCER", + "target": "healthbox_doubles_player_2.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000204.NCER", + "target": "ball_status_indicator_opponent.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000206.NANR", + "target": "ball_status_indicator_opponent.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000207.NCER", + "target": "ball_status_indicator_player.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000209.NANR", + "target": "ball_status_indicator_player.NANR", "compressed": true }, { @@ -192,19 +192,19 @@ "compressed": true }, { - "target": "pl_batt_obj_00000251.NCER", + "target": "battle_subscreen_cursor_corner.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000252.NANR", + "target": "battle_subscreen_cursor_corner.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000254.NCER", + "target": "healthbox_safari.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000255.NANR", + "target": "healthbox_safari.NANR", "compressed": true }, { @@ -280,163 +280,163 @@ "compressed": true }, { - "target": "pl_batt_obj_00000283.NANR", + "target": "poke_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000284.NCER", + "target": "poke_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000286.NANR", + "target": "master_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000287.NCER", + "target": "master_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000289.NANR", + "target": "ultra_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000290.NCER", + "target": "ultra_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000292.NANR", + "target": "great_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000293.NCER", + "target": "great_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000295.NANR", + "target": "safari_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000296.NCER", + "target": "safari_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000298.NANR", + "target": "net_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000299.NCER", + "target": "net_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000301.NANR", + "target": "dive_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000302.NCER", + "target": "dive_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000304.NANR", + "target": "nest_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000305.NCER", + "target": "nest_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000307.NANR", + "target": "repeat_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000308.NCER", + "target": "repeat_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000310.NANR", + "target": "timer_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000311.NCER", + "target": "timer_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000313.NANR", + "target": "luxury_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000314.NCER", + "target": "luxury_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000316.NANR", + "target": "premier_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000317.NCER", + "target": "premier_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000319.NANR", + "target": "quick_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000320.NCER", + "target": "quick_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000322.NANR", + "target": "dusk_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000323.NCER", + "target": "dusk_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000325.NANR", + "target": "heal_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000326.NCER", + "target": "heal_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000328.NANR", + "target": "cherish_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000329.NCER", + "target": "cherish_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000331.NANR", + "target": "park_ball_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000332.NCER", + "target": "park_ball_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000334.NANR", + "target": "bait_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000335.NCER", + "target": "bait_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000337.NANR", + "target": "mud_throw.NANR", "compressed": true }, { - "target": "pl_batt_obj_00000338.NCER", + "target": "mud_throw.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000341.NCER", + "target": "party_gauge.NCER", "compressed": true }, { - "target": "pl_batt_obj_00000342.NANR", + "target": "party_gauge.NANR", "compressed": true } ] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000286.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/dive_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000286.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/dive_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000290.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/dive_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000290.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/dive_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000319.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/dusk_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000319.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/dusk_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000293.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/dusk_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000293.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/dusk_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000289.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/great_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000289.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/great_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000296.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/great_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000296.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/great_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000322.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/heal_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000322.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/heal_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000299.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/heal_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000299.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/heal_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000186.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_1.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000186.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_1.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000187.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_1.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000187.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_1.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000189.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_2.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000189.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_2.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000193.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_2.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000193.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_2.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000192.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_1.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000192.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_1.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000196.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_1.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000196.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_1.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000195.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_2.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000195.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_2.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000199.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_2.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000199.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_2.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000198.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_safari.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000198.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_safari.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000254.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_safari.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000254.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_safari.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000201.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_opponent.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000201.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_opponent.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000202.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_opponent.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000202.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_opponent.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000255.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_player.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000255.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_player.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000190.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_player.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000190.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_player.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000292.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/luxury_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000292.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/luxury_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000302.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/luxury_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000302.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/luxury_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000295.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/master_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000295.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/master_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000305.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/master_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000305.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/master_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/meson.build b/res/battle/graphic/pl_batt_obj/prebuilt/meson.build index 59217e3f7a..30d29c10c4 100644 --- a/res/battle/graphic/pl_batt_obj/prebuilt/meson.build +++ b/res/battle/graphic/pl_batt_obj/prebuilt/meson.build @@ -1,58 +1,89 @@ -pl_batt_obj_prebuilt = files( - 'pl_batt_obj_00000077.NCER', +pl_batt_obj_nanr = files( 'pl_batt_obj_00000078.NANR', - 'pl_batt_obj_00000113.NCER', 'pl_batt_obj_00000114.NANR', 'pl_batt_obj_00000115.NANR', - 'pl_batt_obj_00000116.NCER', 'pl_batt_obj_00000118.NANR', - 'pl_batt_obj_00000119.NCER', - 'pl_batt_obj_00000122.NCER', 'pl_batt_obj_00000123.NANR', - 'pl_batt_obj_00000125.NCER', 'pl_batt_obj_00000126.NANR', - 'pl_batt_obj_00000128.NCER', - 'pl_batt_obj_00000129.NANR', - 'pl_batt_obj_00000131.NCER', - 'pl_batt_obj_00000132.NANR', + 'battle_terrain_player.NANR', + 'battle_terrain_opponent.NANR', 'pl_batt_obj_00000177.NANR', - 'pl_batt_obj_00000178.NCER', 'pl_batt_obj_00000180.NANR', - 'pl_batt_obj_00000181.NCER', 'pl_batt_obj_00000183.NANR', + 'healthbox_singles_opponent.NANR', + 'healthbox_singles_player.NANR', + 'healthbox_doubles_opponent_1.NANR', + 'healthbox_doubles_opponent_2.NANR', + 'healthbox_doubles_player_1.NANR', + 'healthbox_doubles_player_2.NANR', + 'ball_status_indicator_opponent.NANR', + 'ball_status_indicator_player.NANR', + 'pl_batt_obj_00000212.NANR', + 'pl_batt_obj_00000215.NANR', + 'pl_batt_obj_00000218.NANR', + 'pl_batt_obj_00000243.NANR', + 'pl_batt_obj_00000249.NANR', + 'battle_subscreen_cursor_corner.NANR', + 'healthbox_safari.NANR', + 'pl_batt_obj_00000258.NANR', + 'pl_batt_obj_00000275.NANR', + 'pl_batt_obj_00000276.NANR', + 'pl_batt_obj_00000277.NANR', + 'pl_batt_obj_00000278.NANR', + 'pl_batt_obj_00000279.NANR', + 'pl_batt_obj_00000280.NANR', + 'pl_batt_obj_00000281.NANR', + 'pl_batt_obj_00000282.NANR', + 'poke_ball_throw.NANR', + 'master_ball_throw.NANR', + 'ultra_ball_throw.NANR', + 'great_ball_throw.NANR', + 'safari_ball_throw.NANR', + 'net_ball_throw.NANR', + 'dive_ball_throw.NANR', + 'nest_ball_throw.NANR', + 'repeat_ball_throw.NANR', + 'timer_ball_throw.NANR', + 'luxury_ball_throw.NANR', + 'premier_ball_throw.NANR', + 'quick_ball_throw.NANR', + 'dusk_ball_throw.NANR', + 'heal_ball_throw.NANR', + 'cherish_ball_throw.NANR', + 'park_ball_throw.NANR', + 'bait_throw.NANR', + 'mud_throw.NANR', + 'party_gauge.NANR' +) + +pl_batt_obj_ncer = files( + 'pl_batt_obj_00000077.NCER', + 'pl_batt_obj_00000113.NCER', + 'pl_batt_obj_00000116.NCER', + 'pl_batt_obj_00000119.NCER', + 'pl_batt_obj_00000122.NCER', + 'pl_batt_obj_00000125.NCER', + 'battle_terrain_player.NCER', + 'battle_terrain_opponent.NCER', + 'pl_batt_obj_00000178.NCER', + 'pl_batt_obj_00000181.NCER', 'pl_batt_obj_00000184.NCER', - 'pl_batt_obj_00000186.NANR', - 'pl_batt_obj_00000187.NCER', - 'pl_batt_obj_00000189.NANR', - 'pl_batt_obj_00000190.NCER', - 'pl_batt_obj_00000192.NANR', - 'pl_batt_obj_00000193.NCER', - 'pl_batt_obj_00000195.NANR', - 'pl_batt_obj_00000196.NCER', - 'pl_batt_obj_00000198.NANR', - 'pl_batt_obj_00000199.NCER', - 'pl_batt_obj_00000201.NANR', - 'pl_batt_obj_00000202.NCER', - 'pl_batt_obj_00000204.NCER', - 'pl_batt_obj_00000206.NANR', - 'pl_batt_obj_00000207.NCER', - 'pl_batt_obj_00000209.NANR', + 'healthbox_singles_opponent.NCER', + 'healthbox_singles_player.NCER', + 'healthbox_doubles_opponent_1.NCER', + 'healthbox_doubles_opponent_2.NCER', + 'healthbox_doubles_player_1.NCER', + 'healthbox_doubles_player_2.NCER', + 'ball_status_indicator_opponent.NCER', + 'ball_status_indicator_player.NCER', 'pl_batt_obj_00000210.NCER', - 'pl_batt_obj_00000212.NANR', 'pl_batt_obj_00000213.NCER', - 'pl_batt_obj_00000215.NANR', 'pl_batt_obj_00000216.NCER', - 'pl_batt_obj_00000218.NANR', 'pl_batt_obj_00000242.NCER', - 'pl_batt_obj_00000243.NANR', 'pl_batt_obj_00000248.NCER', - 'pl_batt_obj_00000249.NANR', - 'pl_batt_obj_00000251.NCER', - 'pl_batt_obj_00000252.NANR', - 'pl_batt_obj_00000254.NCER', - 'pl_batt_obj_00000255.NANR', + 'battle_subscreen_cursor_corner.NCER', + 'healthbox_safari.NCER', 'pl_batt_obj_00000257.NCER', - 'pl_batt_obj_00000258.NANR', 'pl_batt_obj_00000267.NCER', 'pl_batt_obj_00000268.NCER', 'pl_batt_obj_00000269.NCER', @@ -61,63 +92,50 @@ pl_batt_obj_prebuilt = files( 'pl_batt_obj_00000272.NCER', 'pl_batt_obj_00000273.NCER', 'pl_batt_obj_00000274.NCER', - 'pl_batt_obj_00000275.NANR', - 'pl_batt_obj_00000276.NANR', - 'pl_batt_obj_00000277.NANR', - 'pl_batt_obj_00000278.NANR', - 'pl_batt_obj_00000279.NANR', - 'pl_batt_obj_00000280.NANR', - 'pl_batt_obj_00000281.NANR', - 'pl_batt_obj_00000282.NANR', - 'pl_batt_obj_00000283.NANR', - 'pl_batt_obj_00000284.NCER', - 'pl_batt_obj_00000286.NANR', - 'pl_batt_obj_00000287.NCER', - 'pl_batt_obj_00000289.NANR', - 'pl_batt_obj_00000290.NCER', - 'pl_batt_obj_00000292.NANR', - 'pl_batt_obj_00000293.NCER', - 'pl_batt_obj_00000295.NANR', - 'pl_batt_obj_00000296.NCER', - 'pl_batt_obj_00000298.NANR', - 'pl_batt_obj_00000299.NCER', - 'pl_batt_obj_00000301.NANR', - 'pl_batt_obj_00000302.NCER', - 'pl_batt_obj_00000304.NANR', - 'pl_batt_obj_00000305.NCER', - 'pl_batt_obj_00000307.NANR', - 'pl_batt_obj_00000308.NCER', - 'pl_batt_obj_00000310.NANR', - 'pl_batt_obj_00000311.NCER', - 'pl_batt_obj_00000313.NANR', - 'pl_batt_obj_00000314.NCER', - 'pl_batt_obj_00000316.NANR', - 'pl_batt_obj_00000317.NCER', - 'pl_batt_obj_00000319.NANR', - 'pl_batt_obj_00000320.NCER', - 'pl_batt_obj_00000322.NANR', - 'pl_batt_obj_00000323.NCER', - 'pl_batt_obj_00000325.NANR', - 'pl_batt_obj_00000326.NCER', - 'pl_batt_obj_00000328.NANR', - 'pl_batt_obj_00000329.NCER', - 'pl_batt_obj_00000331.NANR', - 'pl_batt_obj_00000332.NCER', - 'pl_batt_obj_00000334.NANR', - 'pl_batt_obj_00000335.NCER', - 'pl_batt_obj_00000337.NANR', - 'pl_batt_obj_00000338.NCER', - 'pl_batt_obj_00000341.NCER', - 'pl_batt_obj_00000342.NANR' + 'poke_ball_throw.NCER', + 'master_ball_throw.NCER', + 'ultra_ball_throw.NCER', + 'great_ball_throw.NCER', + 'safari_ball_throw.NCER', + 'net_ball_throw.NCER', + 'dive_ball_throw.NCER', + 'nest_ball_throw.NCER', + 'repeat_ball_throw.NCER', + 'timer_ball_throw.NCER', + 'luxury_ball_throw.NCER', + 'premier_ball_throw.NCER', + 'quick_ball_throw.NCER', + 'dusk_ball_throw.NCER', + 'heal_ball_throw.NCER', + 'cherish_ball_throw.NCER', + 'park_ball_throw.NCER', + 'bait_throw.NCER', + 'mud_throw.NCER', + 'party_gauge.NCER' ) pl_batt_obj_prebuilts_data = files('data.json') pl_batt_obj_built = [] -foreach infile : pl_batt_obj_prebuilt +foreach infile : pl_batt_obj_nanr + pl_batt_obj_built += custom_target( + input: [infile, pl_batt_obj_prebuilts_data], + output: '@BASENAME0@.NANR', + command: [ + make_pl_batt_obj_prebuilts_py, + '--nitrogfx', nitrogfx_exe.full_path(), + '--input', '@INPUT0@', + '--output', '@OUTPUT@', + '--datafile', '@INPUT1@', + '--private-dir', '@PRIVATE_DIR@' + ] + ) +endforeach + +foreach infile : pl_batt_obj_ncer pl_batt_obj_built += custom_target( input: [infile, pl_batt_obj_prebuilts_data], - output: '@BASENAME0@', + output: '@BASENAME0@.NCER', command: [ make_pl_batt_obj_prebuilts_py, '--nitrogfx', nitrogfx_exe.full_path(), diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000337.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/mud_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000337.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/mud_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000338.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/mud_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000338.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/mud_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000298.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/nest_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000298.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/nest_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000308.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/nest_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000308.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/nest_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000301.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/net_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000301.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/net_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000311.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/net_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000311.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/net_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000304.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/park_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000304.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/park_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000314.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/park_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000314.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/park_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000342.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/party_gauge.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000342.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/party_gauge.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000341.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/party_gauge.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000341.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/party_gauge.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000307.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000307.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000317.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000317.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000310.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/premier_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000310.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/premier_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000320.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/premier_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000320.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/premier_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000325.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/quick_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000325.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/quick_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000323.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/quick_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000323.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/quick_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000313.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/repeat_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000313.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/repeat_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000326.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/repeat_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000326.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/repeat_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000316.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/safari_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000316.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/safari_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000329.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/safari_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000329.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/safari_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000328.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/timer_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000328.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/timer_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000332.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/timer_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000332.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/timer_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000331.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/ultra_ball_throw.NANR similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000331.NANR rename to res/battle/graphic/pl_batt_obj/prebuilt/ultra_ball_throw.NANR diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000335.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/ultra_ball_throw.NCER similarity index 100% rename from res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000335.NCER rename to res/battle/graphic/pl_batt_obj/prebuilt/ultra_ball_throw.NCER diff --git a/res/battle/graphic/pl_batt_obj/sprites/data.json b/res/battle/graphic/pl_batt_obj/sprites/data.json index b5ae32fa67..a9ea951bc4 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/data.json +++ b/res/battle/graphic/pl_batt_obj/sprites/data.json @@ -563,19 +563,19 @@ "version101": true }, { - "target": "move_type_physical.png", + "target": "move_class_physical.png", "compressed": true, "clobber_size": true, "mapping_type": 32 }, { - "target": "move_type_status.png", + "target": "move_class_status.png", "compressed": true, "clobber_size": true, "mapping_type": 32 }, { - "target": "move_type_special.png", + "target": "move_class_special.png", "compressed": true, "clobber_size": true, "mapping_type": 32 diff --git a/res/battle/graphic/pl_batt_obj/sprites/meson.build b/res/battle/graphic/pl_batt_obj/sprites/meson.build index fda1c279a9..a5ab4450a0 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/meson.build +++ b/res/battle/graphic/pl_batt_obj/sprites/meson.build @@ -88,9 +88,9 @@ pl_batt_obj_sprites = files( 'contest_icon_tough.png', 'contest_icon_cool.png', 'type_icon_water.png', - 'move_type_physical.png', - 'move_type_status.png', - 'move_type_special.png', + 'move_class_physical.png', + 'move_class_status.png', + 'move_class_special.png', 'pl_batt_obj_00000247.png', 'battle_subscreen_cursor_corner.png', 'healthbox_safari.png', diff --git a/res/battle/graphic/pl_batt_obj/sprites/move_type_physical.png b/res/battle/graphic/pl_batt_obj/sprites/move_class_physical.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/move_type_physical.png rename to res/battle/graphic/pl_batt_obj/sprites/move_class_physical.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/move_type_special.png b/res/battle/graphic/pl_batt_obj/sprites/move_class_special.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/move_type_special.png rename to res/battle/graphic/pl_batt_obj/sprites/move_class_special.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/move_type_status.png b/res/battle/graphic/pl_batt_obj/sprites/move_class_status.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/move_type_status.png rename to res/battle/graphic/pl_batt_obj/sprites/move_class_status.png diff --git a/src/battle/battle_icon.c b/src/battle/battle_icon.c index 2db4938fb8..58c30dfc69 100644 --- a/src/battle/battle_icon.c +++ b/src/battle/battle_icon.c @@ -11,6 +11,7 @@ #include "consts/pokemon.h" #include "consts/moves.h" #include "palette.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" #include "unk_0200C6E4.h" // these do not align with the types defined in consts/pokemon.json. @@ -24,29 +25,29 @@ * Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ __attribute__((aligned(4))) static const u32 sBattleIcon_NARCMemberMap[] = { - [TYPE_NORMAL] = 0xEA, - [TYPE_FIGHTING] = 0xE1, - [TYPE_FLYING] = 0xE3, - [TYPE_POISON] = 0xEB, - [TYPE_GROUND] = 0xE5, - [TYPE_ROCK] = 0xED, - [TYPE_BUG] = 0xE7, - [TYPE_GHOST] = 0xE4, - [TYPE_STEEL] = 0xEE, - [TYPE_MYSTERY] = 0xEC, - [TYPE_FIRE] = 0xE2, - [TYPE_WATER] = 0xF1, - [TYPE_GRASS] = 0xE9, - [TYPE_ELECTRIC] = 0xDE, - [TYPE_PSYCHIC] = 0xDF, - [TYPE_ICE] = 0xE6, - [TYPE_DRAGON] = 0xDD, - [TYPE_DARK] = 0xE0, - [TYPE_COOL_ICON] = 0xF0, - [TYPE_BEAUTY_ICON] = 0xDB, - [TYPE_CUTE_ICON] = 0xDC, - [TYPE_SMART_ICON] = 0xE8, - [TYPE_TOUGH_ICON] = 0xEF + [TYPE_NORMAL] = type_icon_normal_ncgr, + [TYPE_FIGHTING] = type_icon_fighting_ncgr, + [TYPE_FLYING] = type_icon_flying_ncgr, + [TYPE_POISON] = type_icon_poison_ncgr, + [TYPE_GROUND] = type_icon_ground_ncgr, + [TYPE_ROCK] = type_icon_rock_ncgr, + [TYPE_BUG] = type_icon_bug_ncgr, + [TYPE_GHOST] = type_icon_ghost_ncgr, + [TYPE_STEEL] = type_icon_steel_ncgr, + [TYPE_MYSTERY] = type_icon_mystery_ncgr, + [TYPE_FIRE] = type_icon_fire_ncgr, + [TYPE_WATER] = type_icon_water_ncgr, + [TYPE_GRASS] = type_icon_grass_ncgr, + [TYPE_ELECTRIC] = type_icon_electric_ncgr, + [TYPE_PSYCHIC] = type_icon_psychic_ncgr, + [TYPE_ICE] = type_icon_ice_ncgr, + [TYPE_DRAGON] = type_icon_dragon_ncgr, + [TYPE_DARK] = type_icon_dark_ncgr, + [TYPE_COOL_ICON] = contest_icon_cool_ncgr, + [TYPE_BEAUTY_ICON] = contest_icon_beauty_ncgr, + [TYPE_CUTE_ICON] = contest_icon_cute_ncgr, + [TYPE_SMART_ICON] = contest_icon_smart_ncgr, + [TYPE_TOUGH_ICON] = contest_icon_tough_ncgr }; /* @@ -82,9 +83,9 @@ __attribute__((aligned(4))) static const u8 sBattleIcon_PaletteIndexMap[] = { * Maps move classes (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ __attribute__((aligned(4))) static const u32 sBattleIcon_MoveClass_NARCMemberMap[] = { - [CLASS_PHYSICAL] = 0xF4, - [CLASS_SPECIAL] = 0xF6, - [CLASS_STATUS] = 0xF5 + [CLASS_PHYSICAL] = move_class_physical_ncgr, + [CLASS_SPECIAL] = move_class_special_ncgr, + [CLASS_STATUS] = move_class_status_ncgr }; /* @@ -112,7 +113,7 @@ u32 BattleIcon_TypeIndexToNARCMember(int typeIndex) */ u32 BattleIcon_GetPaletteNARCMember(void) { - return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE; + return icon_palettes_nclr; } u32 sub_0207C924(void) diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index d591b00ed7..7b223dbdfd 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -14,6 +14,7 @@ #include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_022674C4.h" #include "gmm/message_bank_battle_strings.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" #include "assert.h" #include "bg_window.h" @@ -327,38 +328,10 @@ static const VRAMTransfer Unk_ov16_0226F3D4[] = { { 0x0, 0x0 }, }; -#define HEALTHBAR_MAIN_PALETTE_NCLR 71 -#define HEALTHBAR_SAFARI_PALETTE_NCLR 81 - #define HEALTHBAR_MAIN_PALETTE_RESID 20006 #define HEALTHBAR_EFFECTS_PALETTE_RESID 20007 #define HEALTHBAR_SAFARI_PALETTE_RESID 20008 -enum { - HEALTHBAR_SOLO_ENEMY_NANR = 186, - HEALTHBAR_SOLO_ENEMY_NCER, - HEALTHBAR_SOLO_ENEMY_NCGR, - HEALTHBAR_SOLO_PLAYER_NANR, - HEALTHBAR_SOLO_PLAYER_NCER, - HEALTHBAR_SOLO_PLAYER_NCGR, - HEALTHBAR_ENEMY_SLOT_1_NANR, - HEALTHBAR_ENEMY_SLOT_1_NCER, - HEALTHBAR_ENEMY_SLOT_1_NCGR, - HEALTHBAR_ENEMY_SLOT_2_NANR, - HEALTHBAR_ENEMY_SLOT_2_NCER, - HEALTHBAR_ENEMY_SLOT_2_NCGR, - HEALTHBAR_PLAYER_SLOT_1_NANR, - HEALTHBAR_PLAYER_SLOT_1_NCER, - HEALTHBAR_PLAYER_SLOT_1_NCGR, - HEALTHBAR_PLAYER_SLOT_2_NANR, - HEALTHBAR_PLAYER_SLOT_2_NCER, - HEALTHBAR_PLAYER_SLOT_2_NCGR, - - HEALTHBAR_SAFARI_NCGR = 253, - HEALTHBAR_SAFARI_NCER, - HEALTHBAR_SAFARI_NANR, -}; - static const SpriteTemplate sHealthbarTemplate_SoloPlayer = { .x = HEALTHBAR_X_OFFSET_SOLO_PLAYER, .y = HEALTHBAR_Y_OFFSET_SOLO_PLAYER, @@ -368,10 +341,10 @@ static const SpriteTemplate sHealthbarTemplate_SoloPlayer = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - HEALTHBAR_SOLO_PLAYER_NCGR, + healthbox_singles_player_ncgr, HEALTHBAR_MAIN_PALETTE_RESID, - HEALTHBAR_SOLO_PLAYER_NCER, - HEALTHBAR_SOLO_PLAYER_NANR, + healthbox_singles_player_ncer, + healthbox_singles_player_nanr, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -388,10 +361,10 @@ static const SpriteTemplate sHealthbarTemplate_SoloEnemy = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - HEALTHBAR_SOLO_ENEMY_NCGR, + healthbox_singles_opponent_ncgr, HEALTHBAR_MAIN_PALETTE_RESID, - HEALTHBAR_SOLO_ENEMY_NCER, - HEALTHBAR_SOLO_ENEMY_NANR, + healthbox_singles_opponent_ncer, + healthbox_singles_opponent_nanr, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -408,10 +381,10 @@ static const SpriteTemplate sHealthbarTemplate_PlayerSlot1 = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - HEALTHBAR_PLAYER_SLOT_1_NCGR, + healthbox_doubles_player_1_ncgr, HEALTHBAR_MAIN_PALETTE_RESID, - HEALTHBAR_PLAYER_SLOT_1_NCER, - HEALTHBAR_PLAYER_SLOT_1_NANR, + healthbox_doubles_player_1_ncer, + healthbox_doubles_player_1_nanr, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -428,10 +401,10 @@ static const SpriteTemplate sHealthbarTemplate_EnemySlot1 = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - HEALTHBAR_ENEMY_SLOT_1_NCGR, + healthbox_doubles_opponent_1_ncgr, HEALTHBAR_MAIN_PALETTE_RESID, - HEALTHBAR_ENEMY_SLOT_1_NCER, - HEALTHBAR_ENEMY_SLOT_1_NANR, + healthbox_doubles_opponent_1_ncer, + healthbox_doubles_opponent_1_nanr, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -448,10 +421,10 @@ static const SpriteTemplate sHealthbarTemplate_PlayerSlot2 = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - HEALTHBAR_PLAYER_SLOT_2_NCGR, + healthbox_doubles_player_2_ncgr, HEALTHBAR_MAIN_PALETTE_RESID, - HEALTHBAR_PLAYER_SLOT_2_NCER, - HEALTHBAR_PLAYER_SLOT_2_NANR, + healthbox_doubles_player_2_ncer, + healthbox_doubles_player_2_nanr, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -468,10 +441,10 @@ static const SpriteTemplate sHealthbarTemplate_EnemySlot2 = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - HEALTHBAR_ENEMY_SLOT_2_NCGR, + healthbox_doubles_opponent_2_ncgr, HEALTHBAR_MAIN_PALETTE_RESID, - HEALTHBAR_ENEMY_SLOT_2_NCER, - HEALTHBAR_ENEMY_SLOT_2_NANR, + healthbox_doubles_opponent_2_ncer, + healthbox_doubles_opponent_2_nanr, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -501,10 +474,10 @@ static const SpriteTemplate sHealthbarTemplate_NoPlayerMon = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - HEALTHBAR_SAFARI_NCGR, + healthbox_safari_ncgr, HEALTHBAR_SAFARI_PALETTE_RESID, - HEALTHBAR_SAFARI_NCER, - HEALTHBAR_SAFARI_NANR, + healthbox_safari_ncer, + healthbox_safari_nanr, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -519,13 +492,13 @@ void Healthbar_LoadResources(SpriteRenderer *renderer, SpriteGfxHandler *gfxHand const SpriteTemplate *template = Healthbar_SpriteTemplate(healthbarType); SpriteRenderer_LoadCharResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[0], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, template->resources[0]); - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, HEALTHBAR_MAIN_PALETTE_NCLR, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_MAIN_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_normal_nclr, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_MAIN_PALETTE_RESID); SpriteRenderer_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[2], TRUE, template->resources[2]); SpriteRenderer_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[3], TRUE, template->resources[3]); - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, HEALTHBAR_MAIN_PALETTE_NCLR, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_EFFECTS_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_normal_nclr, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_EFFECTS_PALETTE_RESID); if (healthbarType == HEALTHBAR_TYPE_SAFARI_ZONE || healthbarType == HEALTHBAR_TYPE_PAL_PARK) { - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, HEALTHBAR_SAFARI_PALETTE_NCLR, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_SAFARI_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_safari_nclr, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_SAFARI_PALETTE_RESID); } } diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 683abe13a1..a4c3676917 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -12,6 +12,8 @@ #include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_02268520.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" + #include "consts/battle.h" #include "narc.h" @@ -49,60 +51,60 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { * Maps a battle terrain index to the NARC member in pl_batt_obj containing the player's sprite for it. */ __attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToNARCMember[] = { - [TERRAIN_PLAIN] = 0x87, - [TERRAIN_SAND] = 0x91, - [TERRAIN_GRASS] = 0x7F, - [TERRAIN_PUDDLE] = 0x97, - [TERRAIN_MOUNTAIN] = 0x8B, - [TERRAIN_CAVE] = 0x95, - [TERRAIN_SNOW] = 0x8D, - [TERRAIN_WATER] = 0x85, - [TERRAIN_ICE] = 0x89, - [TERRAIN_BUILDING] = 0x8F, - [TERRAIN_GREAT_MARSH] = 0x93, - [TERRAIN_BRIDGE] = 0x97, - [TERRAIN_AARON] = 0x99, - [TERRAIN_BERTHA] = 0x9B, - [TERRAIN_FLINT] = 0x9D, - [TERRAIN_LUCIAN] = 0x9F, - [TERRAIN_CYNTHIA] = 0xA1, - [TERRAIN_DISTORTION_WORLD] = 0xA3, - [TERRAIN_BATTLE_TOWER] = 0xA5, - [TERRAIN_BATTLE_FACTORY] = 0xA7, - [TERRAIN_BATTLE_ARCADE] = 0xA9, - [TERRAIN_BATTLE_CASTLE] = 0xAB, - [TERRAIN_BATTLE_HALL] = 0xAD, - [TERRAIN_GIRATINA] = 0xAF + [TERRAIN_PLAIN] = battle_terrain_path_player_ncgr, + [TERRAIN_SAND] = battle_terrain_sand_player_ncgr, + [TERRAIN_GRASS] = battle_terrain_grass_player_ncgr, + [TERRAIN_PUDDLE] = battle_terrain_puddle_player_ncgr, + [TERRAIN_MOUNTAIN] = battle_terrain_mountain_player_ncgr, + [TERRAIN_CAVE] = battle_terrain_cave_player_ncgr, + [TERRAIN_SNOW] = battle_terrain_snow_player_ncgr, + [TERRAIN_WATER] = battle_terrain_surf_player_ncgr, + [TERRAIN_ICE] = battle_terrain_ice_player_ncgr, + [TERRAIN_BUILDING] = battle_terrain_indoors_player_ncgr, + [TERRAIN_GREAT_MARSH] = battle_terrain_mud_player_ncgr, + [TERRAIN_BRIDGE] = battle_terrain_puddle_player_ncgr, + [TERRAIN_AARON] = battle_terrain_elite4_aaron_player_ncgr, + [TERRAIN_BERTHA] = battle_terrain_elite4_bertha_player_ncgr, + [TERRAIN_FLINT] = battle_terrain_elite4_flint_player_ncgr, + [TERRAIN_LUCIAN] = battle_terrain_elite4_lucian_player_ncgr, + [TERRAIN_CYNTHIA] = battle_terrain_champion_player_ncgr, + [TERRAIN_DISTORTION_WORLD] = battle_terrain_distortion_world_player_ncgr, + [TERRAIN_BATTLE_TOWER] = battle_terrain_tower_player_ncgr, + [TERRAIN_BATTLE_FACTORY] = battle_terrain_factory_player_ncgr, + [TERRAIN_BATTLE_ARCADE] = battle_terrain_arcade_player_ncgr, + [TERRAIN_BATTLE_CASTLE] = battle_terrain_castle_player_ncgr, + [TERRAIN_BATTLE_HALL] = battle_terrain_hall_player_ncgr, + [TERRAIN_GIRATINA] = battle_terrain_giratina_player_ncgr }; /* * Maps a battle terrain index to the NARC member in pl_batt_obj containing the opponent's sprite for it. */ __attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToOpponentNARCMember[] = { - [TERRAIN_PLAIN] = 0x88, - [TERRAIN_SAND] = 0x92, - [TERRAIN_GRASS] = 0x82, - [TERRAIN_PUDDLE] = 0x98, - [TERRAIN_MOUNTAIN] = 0x8C, - [TERRAIN_CAVE] = 0x96, - [TERRAIN_SNOW] = 0x8E, - [TERRAIN_WATER] = 0x86, - [TERRAIN_ICE] = 0x8A, - [TERRAIN_BUILDING] = 0x90, - [TERRAIN_GREAT_MARSH] = 0x94, - [TERRAIN_BRIDGE] = 0x94, - [TERRAIN_AARON] = 0x9A, - [TERRAIN_BERTHA] = 0x9C, - [TERRAIN_FLINT] = 0x9E, - [TERRAIN_LUCIAN] = 0xA0, - [TERRAIN_CYNTHIA] = 0xA2, - [TERRAIN_DISTORTION_WORLD] = 0xA4, - [TERRAIN_BATTLE_TOWER] = 0xA6, - [TERRAIN_BATTLE_FACTORY] = 0xA8, - [TERRAIN_BATTLE_ARCADE] = 0xAA, - [TERRAIN_BATTLE_CASTLE] = 0xAC, - [TERRAIN_BATTLE_HALL] = 0xAE, - [TERRAIN_GIRATINA] = 0xB0 + [TERRAIN_PLAIN] = battle_terrain_path_opponent_ncgr, + [TERRAIN_SAND] = battle_terrain_sand_opponent_ncgr, + [TERRAIN_GRASS] = battle_terrain_grass_opponent_ncgr, + [TERRAIN_PUDDLE] = battle_terrain_puddle_opponent_ncgr, + [TERRAIN_MOUNTAIN] = battle_terrain_mountain_opponent_ncgr, + [TERRAIN_CAVE] = battle_terrain_cave_opponent_ncgr, + [TERRAIN_SNOW] = battle_terrain_snow_opponent_ncgr, + [TERRAIN_WATER] = battle_terrain_surf_opponent_ncgr, + [TERRAIN_ICE] = battle_terrain_ice_opponent_ncgr, + [TERRAIN_BUILDING] = battle_terrain_indoors_opponent_ncgr, + [TERRAIN_GREAT_MARSH] = battle_terrain_mud_opponent_ncgr, + [TERRAIN_BRIDGE] = battle_terrain_mud_opponent_ncgr, + [TERRAIN_AARON] = battle_terrain_elite4_aaron_opponent_ncgr, + [TERRAIN_BERTHA] = battle_terrain_elite4_bertha_opponent_ncgr, + [TERRAIN_FLINT] = battle_terrain_elite4_flint_opponent_ncgr, + [TERRAIN_LUCIAN] = battle_terrain_elite4_lucian_opponent_ncgr, + [TERRAIN_CYNTHIA] = battle_terrain_champion_opponent_ncgr, + [TERRAIN_DISTORTION_WORLD] = battle_terrain_distortion_world_opponent_ncgr, + [TERRAIN_BATTLE_TOWER] = battle_terrain_tower_opponent_ncgr, + [TERRAIN_BATTLE_FACTORY] = battle_terrain_factory_opponent_ncgr, + [TERRAIN_BATTLE_ARCADE] = battle_terrain_arcade_opponent_ncgr, + [TERRAIN_BATTLE_CASTLE] = battle_terrain_castle_opponent_ncgr, + [TERRAIN_BATTLE_HALL] = battle_terrain_hall_opponent_ncgr, + [TERRAIN_GIRATINA] = battle_terrain_giratina_opponent_ncgr }; /* @@ -110,30 +112,30 @@ __attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToOpponentN * Each battle terrain has 3 palette options for different times of day. */ __attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToPaletteMember[][3] = { - [TERRAIN_PLAIN] = { 0x7, 0x8, 0x9 }, - [TERRAIN_SAND] = { 0x16, 0x17, 0x18 }, - [TERRAIN_GRASS] = { 0x1, 0x2, 0x3 }, - [TERRAIN_PUDDLE] = { 0x1F, 0x20, 0x21 }, - [TERRAIN_MOUNTAIN] = { 0xD, 0xE, 0xF }, - [TERRAIN_CAVE] = { 0x1C, 0x1D, 0x1E }, - [TERRAIN_SNOW] = { 0x10, 0x11, 0x12 }, - [TERRAIN_WATER] = { 0x4, 0x5, 0x6 }, - [TERRAIN_ICE] = { 0xA, 0xB, 0xC }, - [TERRAIN_BUILDING] = { 0x13, 0x14, 0x15 }, - [TERRAIN_GREAT_MARSH] = { 0x19, 0x1A, 0x1B }, - [TERRAIN_BRIDGE] = { 0x19, 0x1A, 0x1B }, - [TERRAIN_AARON] = { 0x22, 0x23, 0x24 }, - [TERRAIN_BERTHA] = { 0x25, 0x26, 0x27 }, - [TERRAIN_FLINT] = { 0x28, 0x29, 0x2A }, - [TERRAIN_LUCIAN] = { 0x2B, 0x2C, 0x2D }, - [TERRAIN_CYNTHIA] = { 0x2E, 0x2F, 0x30 }, - [TERRAIN_DISTORTION_WORLD] = { 0x31, 0x32, 0x33 }, - [TERRAIN_BATTLE_TOWER] = { 0x34, 0x35, 0x36 }, - [TERRAIN_BATTLE_FACTORY] = { 0x37, 0x38, 0x39 }, - [TERRAIN_BATTLE_ARCADE] = { 0x3A, 0x3B, 0x3C }, - [TERRAIN_BATTLE_CASTLE] = { 0x3D, 0x3E, 0x3F }, - [TERRAIN_BATTLE_HALL] = { 0x40, 0x41, 0x42 }, - [TERRAIN_GIRATINA] = { 0x43, 0x44, 0x45 } + [TERRAIN_PLAIN] = { battle_terrain_path_day_nclr, battle_terrain_path_afternoon_nclr, battle_terrain_path_night_nclr }, + [TERRAIN_SAND] = { battle_terrain_sand_day_nclr, battle_terrain_sand_afternoon_nclr, battle_terrain_sand_night_nclr }, + [TERRAIN_GRASS] = { battle_terrain_grass_day_nclr, battle_terrain_grass_afternoon_nclr, battle_terrain_grass_night_nclr }, + [TERRAIN_PUDDLE] = { battle_terrain_puddle_day_nclr, battle_terrain_puddle_afternoon_nclr, battle_terrain_puddle_night_nclr }, + [TERRAIN_MOUNTAIN] = { battle_terrain_mountain_day_nclr, battle_terrain_mountain_afternoon_nclr, battle_terrain_mountain_night_nclr }, + [TERRAIN_CAVE] = { battle_terrain_cave_day_nclr, battle_terrain_cave_afternoon_nclr, battle_terrain_cave_night_nclr }, + [TERRAIN_SNOW] = { battle_terrain_snow_day_nclr, battle_terrain_snow_afternoon_nclr, battle_terrain_snow_night_nclr }, + [TERRAIN_WATER] = { battle_terrain_surf_day_nclr, battle_terrain_surf_afternoon_nclr, battle_terrain_surf_night_nclr }, + [TERRAIN_ICE] = { battle_terrain_ice_day_nclr, battle_terrain_ice_afternoon_nclr, battle_terrain_ice_night_nclr }, + [TERRAIN_BUILDING] = { battle_terrain_indoors_day_nclr, battle_terrain_indoors_afternoon_nclr, battle_terrain_indoors_night_nclr }, + [TERRAIN_GREAT_MARSH] = { battle_terrain_mud_day_nclr, battle_terrain_mud_afternoon_nclr, battle_terrain_mud_night_nclr }, + [TERRAIN_BRIDGE] = { battle_terrain_mud_day_nclr, battle_terrain_mud_afternoon_nclr, battle_terrain_mud_night_nclr }, + [TERRAIN_AARON] = { battle_terrain_elite4_aaron_day_nclr, battle_terrain_elite4_aaron_afternoon_nclr, battle_terrain_elite4_aaron_night_nclr }, + [TERRAIN_BERTHA] = { battle_terrain_elite4_bertha_day_nclr, battle_terrain_elite4_bertha_afternoon_nclr, battle_terrain_elite4_bertha_night_nclr }, + [TERRAIN_FLINT] = { battle_terrain_elite4_flint_day_nclr, battle_terrain_elite4_flint_afternoon_nclr, battle_terrain_elite4_flint_night_nclr }, + [TERRAIN_LUCIAN] = { battle_terrain_elite4_lucian_day_nclr, battle_terrain_elite4_lucian_afternoon_nclr, battle_terrain_elite4_lucian_night_nclr }, + [TERRAIN_CYNTHIA] = { battle_terrain_champion_day_nclr, battle_terrain_champion_afternoon_nclr, battle_terrain_champion_night_nclr }, + [TERRAIN_DISTORTION_WORLD] = { battle_terrain_distortion_world_day_nclr, battle_terrain_distortion_world_afternoon_nclr, battle_terrain_distortion_world_night_nclr }, + [TERRAIN_BATTLE_TOWER] = { battle_terrain_tower_day_nclr, battle_terrain_tower_afternoon_nclr, battle_terrain_tower_night_nclr }, + [TERRAIN_BATTLE_FACTORY] = { battle_terrain_factory_day_nclr, battle_terrain_factory_afternoon_nclr, battle_terrain_factory_night_nclr }, + [TERRAIN_BATTLE_ARCADE] = { battle_terrain_arcade_day_nclr, battle_terrain_arcade_afternoon_nclr, battle_terrain_arcade_night_nclr }, + [TERRAIN_BATTLE_CASTLE] = { battle_terrain_castle_day_nclr, battle_terrain_castle_afternoon_nclr, battle_terrain_castle_night_nclr }, + [TERRAIN_BATTLE_HALL] = { battle_terrain_hall_day_nclr, battle_terrain_hall_afternoon_nclr, battle_terrain_hall_night_nclr }, + [TERRAIN_GIRATINA] = { battle_terrain_giratina_day_nclr, battle_terrain_giratina_afternoon_nclr, battle_terrain_giratina_night_nclr } }; void ov16_02268520(UnkStruct_ov16_02268520 *param0) @@ -154,16 +156,16 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) if (param0->unk_08 == 0) { v3 = sov16_BattleTerrainIndexToNARCMember[param0->unk_09]; v4 = 20013; - v5 = 128; + v5 = battle_terrain_player_ncer; v6 = 20005; - v7 = 129; + v7 = battle_terrain_player_nanr; v8 = 20005; } else { v3 = sov16_BattleTerrainIndexToOpponentNARCMember[param0->unk_09]; v4 = 20014; - v5 = 131; + v5 = battle_terrain_opponent_ncer; v6 = 20006; - v7 = 132; + v7 = battle_terrain_opponent_nanr; v8 = 20006; } diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index a30bd3f9aa..0dd9a3c386 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -30,6 +30,8 @@ #include "battle/struct_ov16_0226DEEC_decl.h" #include "overlay011/ov11_0221F800.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" + #include "assert.h" #include "bg_window.h" #include "cell_actor.h" @@ -1339,13 +1341,13 @@ void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1) v1 = ov16_0223E010(param1->unk_00); v2 = ov16_0223E018(param1->unk_00); - SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, 208, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); - SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, 207, 1, 20015); - SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, 209, 1, 20015); + SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_ncgr, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_ncer, 1, 20015); + SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_nanr, 1, 20015); - SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, 205, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); - SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, 204, 1, 20016); - SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, 206, 1, 20016); + SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_ncgr, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); + SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_ncer, 1, 20016); + SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_nanr, 1, 20016); for (v0 = 0; v0 < 6; v0++) { param1->unk_5BC[v0] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_02270414); diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index 2cc54a0c4f..fe69f8f940 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -8,6 +8,8 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" + #include "heap.h" #include "narc.h" #include "palette.h" @@ -47,10 +49,10 @@ void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param3); - SpriteRenderer_LoadPalette(param2, 3, param0, param1, v0, 80, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param5); - SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, v0, 250, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); - SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, v0, 251, 1, param6); - SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, v0, 252, 1, param7); + SpriteRenderer_LoadPalette(param2, 3, param0, param1, v0, battle_subscreen_cursor_corner_nclr, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param5); + SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_ncgr, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); + SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_ncer, 1, param6); + SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_nanr, 1, param7); NARC_dtor(v0); } diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c index e8a1a7bef6..e63df49184 100644 --- a/src/battle/party_gauge.c +++ b/src/battle/party_gauge.c @@ -14,6 +14,8 @@ #include "battle/ov16_0223DF00.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" + #include "assert.h" #include "cell_actor.h" #include "enums.h" @@ -196,20 +198,14 @@ __attribute__((aligned(4))) static const u16 sPokeballYPosTheirs[] = { [PARTY_GAUGE_POSITION_LOW] = POKEBALL_Y_POS_THEIRS }; -// TODO: naix? -#define PARTY_GAUGE_NCLR 110 -#define PARTY_GAUGE_NCGR_BIN 340 -#define PARTY_GAUGE_NCER_BIN 341 -#define PARTY_GAUGE_NANR_BIN 342 - void PartyGauge_LoadGraphics(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, PaletteData *palette) { NARC *narc = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, HEAP_ID_BATTLE); - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, PARTY_GAUGE_NCLR, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, PARTY_GAUGE_PLTT_RES_ID); - SpriteRenderer_LoadCharResObjFromOpenNarc(renderer, gfxHandler, narc, PARTY_GAUGE_NCGR_BIN, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, PARTY_GAUGE_CHAR_RES_ID); - SpriteRenderer_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, PARTY_GAUGE_NCER_BIN, TRUE, PARTY_GAUGE_CELL_RES_ID); - SpriteRenderer_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, PARTY_GAUGE_NANR_BIN, TRUE, PARTY_GAUGE_ANIM_RES_ID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, party_gauge_nclr, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, PARTY_GAUGE_PLTT_RES_ID); + SpriteRenderer_LoadCharResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_ncgr, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, PARTY_GAUGE_CHAR_RES_ID); + SpriteRenderer_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_ncer, TRUE, PARTY_GAUGE_CELL_RES_ID); + SpriteRenderer_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_nanr, TRUE, PARTY_GAUGE_ANIM_RES_ID); NARC_dtor(narc); } diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 693ffa02b2..e5146772c6 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -16,6 +16,8 @@ #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" + #include "overlay010/struct_ov10_0221F800.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" @@ -1498,10 +1500,10 @@ static void ov10_022210F4(UnkStruct_ov10_0221FB28 *param0) v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param0->unk_00->unk_24); - SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 208, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47111); + SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_ncgr, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47111); sub_0200CC9C(param0->unk_190, param0->unk_194, 108, 8, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47111); - SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 207, 1, 47111); - SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 209, 1, 47111); + SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_ncer, 1, 47111); + SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_nanr, 1, 47111); NARC_dtor(v0); } diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index af994f89ef..73e8f8acd6 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -25,6 +25,8 @@ #include "overlay012/struct_ov12_02237728.h" #include "overlay104/struct_ov104_02241308.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" + #include "heap.h" #include "narc.h" #include "palette.h" @@ -133,26 +135,26 @@ static BOOL ov12_02237474(BallRotation *param0); * These NARC members describe the sprite, palette, cell, and anim to use for that ball. */ static const int ov12_BallIndexToNARCMembers[][4] = { - { 0x120, 0x5C, 0x11F, 0x11E }, - { 0x123, 0x5D, 0x122, 0x121 }, - { 0x126, 0x5E, 0x125, 0x124 }, - { 0x11D, 0x5B, 0x11C, 0x11B }, - { 0x129, 0x5F, 0x128, 0x127 }, - { 0x12C, 0x60, 0x12B, 0x12A }, - { 0x12F, 0x61, 0x12E, 0x12D }, - { 0x132, 0x62, 0x131, 0x130 }, - { 0x135, 0x63, 0x134, 0x133 }, - { 0x138, 0x64, 0x137, 0x136 }, - { 0x13B, 0x65, 0x13A, 0x139 }, - { 0x13E, 0x66, 0x13D, 0x13C }, - { 0x144, 0x68, 0x143, 0x142 }, - { 0x147, 0x69, 0x146, 0x145 }, - { 0x141, 0x67, 0x140, 0x13F }, - { 0x14A, 0x6A, 0x149, 0x148 }, - { 0x14D, 0x6B, 0x14C, 0x14B }, - { 0x153, 0x6D, 0x152, 0x151 }, - { 0x150, 0x6C, 0x14F, 0x14E }, - { 0x150, 0x6C, 0x14F, 0x14E } + { master_ball_throw_ncgr, master_ball_throw_nclr, master_ball_throw_ncer, master_ball_throw_nanr }, + { ultra_ball_throw_ncgr, ultra_ball_throw_nclr, ultra_ball_throw_ncer, ultra_ball_throw_nanr }, + { great_ball_throw_ncgr, great_ball_throw_nclr, great_ball_throw_ncer, great_ball_throw_nanr }, + { poke_ball_throw_ncgr, poke_ball_throw_nclr, poke_ball_throw_ncer, poke_ball_throw_nanr }, + { safari_ball_throw_ncgr, safari_ball_throw_nclr, safari_ball_throw_ncer, safari_ball_throw_nanr }, + { net_ball_throw_ncgr, net_ball_throw_nclr, net_ball_throw_ncer, net_ball_throw_nanr }, + { dive_ball_throw_ncgr, dive_ball_throw_nclr, dive_ball_throw_ncer, dive_ball_throw_nanr }, + { nest_ball_throw_ncgr, nest_ball_throw_nclr, nest_ball_throw_ncer, nest_ball_throw_nanr }, + { repeat_ball_throw_ncgr, repeat_ball_throw_nclr, repeat_ball_throw_ncer, repeat_ball_throw_nanr }, + { timer_ball_throw_ncgr, timer_ball_throw_nclr, timer_ball_throw_ncer, timer_ball_throw_nanr }, + { luxury_ball_throw_ncgr, luxury_ball_throw_nclr, luxury_ball_throw_ncer, luxury_ball_throw_nanr }, + { premier_ball_throw_ncgr, premier_ball_throw_nclr, premier_ball_throw_ncer, premier_ball_throw_nanr }, + { dusk_ball_throw_ncgr, dusk_ball_throw_nclr, dusk_ball_throw_ncer, dusk_ball_throw_nanr }, + { heal_ball_throw_ncgr, heal_ball_throw_nclr, heal_ball_throw_ncer, heal_ball_throw_nanr }, + { quick_ball_throw_ncgr, quick_ball_throw_nclr, quick_ball_throw_ncer, quick_ball_throw_nanr }, + { cherish_ball_throw_ncgr, cherish_ball_throw_nclr, cherish_ball_throw_ncer, cherish_ball_throw_nanr }, + { park_ball_throw_ncgr, park_ball_throw_nclr, park_ball_throw_ncer, park_ball_throw_nanr }, + { mud_throw_ncgr, mud_throw_nclr, mud_throw_ncer, mud_throw_nanr }, + { bait_throw_ncgr, bait_throw_nclr, bait_throw_ncer, bait_throw_nanr }, + { bait_throw_ncgr, bait_throw_nclr, bait_throw_ncer, bait_throw_nanr } }; static const int Unk_ov12_0223AD70[][2] = { diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py index b66bd33366..b2d79d32a3 100644 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py @@ -72,4 +72,4 @@ with open(tmp_file, mode="wb") as f: f.write(data) -shutil.copy(tmp_file, output_file) \ No newline at end of file +shutil.copy(tmp_file, output_file.with_suffix(".nclr")) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py index 3ef319cc5b..4a31b10f64 100644 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py @@ -29,7 +29,7 @@ args = argparser.parse_args() input_file = pathlib.Path(args.input) -output_file = pathlib.Path(args.output).with_suffix(input_file.suffix) +output_file = pathlib.Path(args.output) private_dir = pathlib.Path(args.private_dir) with open(args.datafile) as f: data_map = json.load(f) @@ -58,4 +58,4 @@ with open(tmp_file, mode="wb") as f2: compress.compress(f.read(), f2) -shutil.copy(tmp_file, output_file) \ No newline at end of file +shutil.copy(tmp_file, output_file.with_suffix(input_file.suffix.lower())) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py index e9720fc86a..6f0e463d6e 100644 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py @@ -71,4 +71,4 @@ compress.compress(f.read(), f2) tmp_file = tmp_file.with_suffix(".lz") -shutil.copy(tmp_file, output_file) \ No newline at end of file +shutil.copy(tmp_file, output_file.with_suffix(".ncgr")) \ No newline at end of file From fa6cd30902a2e505d14dc6833e7c28ab0474816b Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Wed, 16 Oct 2024 16:04:09 -0500 Subject: [PATCH 15/26] apply clang-format again after adding naix --- src/battle/battle_icon.c | 8 ++++---- src/battle/healthbar.c | 2 +- src/battle/ov16_02268520.c | 7 +++---- src/battle/ov16_0226871C.c | 3 +-- src/battle/party_gauge.c | 3 +-- src/overlay010/ov10_0221F800.c | 1 - src/overlay012/ov12_02235E94.c | 3 +-- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/battle/battle_icon.c b/src/battle/battle_icon.c index 58c30dfc69..5214a1bd3c 100644 --- a/src/battle/battle_icon.c +++ b/src/battle/battle_icon.c @@ -15,11 +15,11 @@ #include "unk_0200C6E4.h" // these do not align with the types defined in consts/pokemon.json. -#define TYPE_COOL_ICON NUMBER_OF_MON_TYPES + 0 +#define TYPE_COOL_ICON NUMBER_OF_MON_TYPES + 0 #define TYPE_BEAUTY_ICON NUMBER_OF_MON_TYPES + 1 -#define TYPE_CUTE_ICON NUMBER_OF_MON_TYPES + 2 -#define TYPE_SMART_ICON NUMBER_OF_MON_TYPES + 3 -#define TYPE_TOUGH_ICON NUMBER_OF_MON_TYPES + 4 +#define TYPE_CUTE_ICON NUMBER_OF_MON_TYPES + 2 +#define TYPE_SMART_ICON NUMBER_OF_MON_TYPES + 3 +#define TYPE_TOUGH_ICON NUMBER_OF_MON_TYPES + 4 /* * Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 7b223dbdfd..7602b8cb9c 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -11,10 +11,10 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" #include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_022674C4.h" #include "gmm/message_bank_battle_strings.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" #include "assert.h" #include "bg_window.h" diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index a4c3676917..1bb3aafbb3 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -3,19 +3,18 @@ #include #include +#include "consts/battle.h" + #include "struct_decls/battle_system.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" #include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_02268520.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" - -#include "consts/battle.h" - #include "narc.h" #include "palette.h" #include "unk_0200C6E4.h" diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 0dd9a3c386..2a2873ad4f 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -17,6 +17,7 @@ #include "battle/battle_display.h" #include "battle/battle_icon.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" #include "battle/ov16_0223DF00.h" #include "battle/ov16_0226DB7C.h" #include "battle/ov16_0226DE44.h" @@ -30,8 +31,6 @@ #include "battle/struct_ov16_0226DEEC_decl.h" #include "overlay011/ov11_0221F800.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" - #include "assert.h" #include "bg_window.h" #include "cell_actor.h" diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c index e63df49184..970f26fb1a 100644 --- a/src/battle/party_gauge.c +++ b/src/battle/party_gauge.c @@ -12,9 +12,8 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "battle/ov16_0223DF00.h" - #include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/ov16_0223DF00.h" #include "assert.h" #include "cell_actor.h" diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index e5146772c6..50d886aba3 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -17,7 +17,6 @@ #include "struct_defs/struct_02099F80.h" #include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" - #include "overlay010/struct_ov10_0221F800.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index 73e8f8acd6..573a9a7390 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -10,6 +10,7 @@ #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" #include "functypes/funcptr_020146F4.h" #include "overlay012/ov12_0221FC20.h" #include "overlay012/ov12_022237EC.h" @@ -25,8 +26,6 @@ #include "overlay012/struct_ov12_02237728.h" #include "overlay104/struct_ov104_02241308.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" - #include "heap.h" #include "narc.h" #include "palette.h" From 09861734542cca91eb9c0bd222705259e4fa3b2c Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Thu, 17 Oct 2024 09:59:33 -0500 Subject: [PATCH 16/26] update const names and method names from review --- include/battle/battle_icon.h | 12 ++--- src/battle/battle_icon.c | 96 +++++++++++++++++----------------- src/battle/ov16_02268520.c | 14 ++--- src/battle/ov16_0226871C.c | 2 +- src/overlay012/ov12_02235E94.c | 4 +- src/overlay013/ov13_02224500.c | 8 +-- src/overlay019/ov19_021DA92C.c | 20 +++---- src/overlay070/ov70_0225D9A4.c | 8 +-- src/overlay084/ov84_022403F4.c | 8 +-- src/overlay091/ov91_021D0D80.c | 8 +-- src/unk_0208EA44.c | 8 +-- 11 files changed, 94 insertions(+), 94 deletions(-) diff --git a/include/battle/battle_icon.h b/include/battle/battle_icon.h index 33ac5a786a..f01841eabb 100644 --- a/include/battle/battle_icon.h +++ b/include/battle/battle_icon.h @@ -10,11 +10,11 @@ #include "palette.h" -u32 BattleIcon_TypeIndexToNARCMember(int param0); -u32 BattleIcon_GetPaletteNARCMember(void); +u32 BattleIcon_GetMoveTypeTiles(int param0); +u32 BattleIcon_GetMoveTypePaletteFileIndex(void); u32 sub_0207C924(void); u32 sub_0207C928(void); -u8 BattleIcon_TypeIndexToPaletteIndex(int param0); +u8 BattleIcon_GetMoveTypePaletteIndex(int param0); u32 BattleIcon_GetNARCIndex(void); void BattleIcon_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void BattleIcon_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); @@ -25,9 +25,9 @@ void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1); void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2); CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); void sub_0207CA88(CellActorData *param0); -u32 BattleIcon_MoveClassIndexToNARCMember(int param0); -u8 BattleIcon_MoveClassIndexToPaletteIndex(int param0); -u32 BattleIcon_GetMoveClassNARCIndex(void); +u32 BattleIcon_GetMoveClassTiles(int param0); +u8 BattleIcon_GetMoveClassPaletteIndex(int param0); +u32 BattleIcon_GetMoveClassPalettteFileIndex(void); void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); void sub_0207CB00(CellActorData *param0); diff --git a/src/battle/battle_icon.c b/src/battle/battle_icon.c index 5214a1bd3c..6ef6bd61e7 100644 --- a/src/battle/battle_icon.c +++ b/src/battle/battle_icon.c @@ -24,7 +24,7 @@ /* * Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ -__attribute__((aligned(4))) static const u32 sBattleIcon_NARCMemberMap[] = { +__attribute__((aligned(4))) static const u32 sBattleTypeIconTiles[] = { [TYPE_NORMAL] = type_icon_normal_ncgr, [TYPE_FIGHTING] = type_icon_fighting_ncgr, [TYPE_FLYING] = type_icon_flying_ncgr, @@ -53,36 +53,36 @@ __attribute__((aligned(4))) static const u32 sBattleIcon_NARCMemberMap[] = { /* * Maps a type index (e.g. TYPE_WATER) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ -__attribute__((aligned(4))) static const u8 sBattleIcon_PaletteIndexMap[] = { - [TYPE_NORMAL] = 0x0, - [TYPE_FIGHTING] = 0x0, - [TYPE_FLYING] = 0x1, - [TYPE_POISON] = 0x1, - [TYPE_GROUND] = 0x0, - [TYPE_ROCK] = 0x0, - [TYPE_BUG] = 0x2, - [TYPE_GHOST] = 0x1, - [TYPE_STEEL] = 0x0, - [TYPE_MYSTERY] = 0x2, - [TYPE_FIRE] = 0x0, - [TYPE_WATER] = 0x1, - [TYPE_GRASS] = 0x2, - [TYPE_ELECTRIC] = 0x0, - [TYPE_PSYCHIC] = 0x1, - [TYPE_ICE] = 0x1, - [TYPE_DRAGON] = 0x2, - [TYPE_DARK] = 0x0, - [TYPE_COOL_ICON] = 0x0, - [TYPE_BEAUTY_ICON] = 0x1, - [TYPE_CUTE_ICON] = 0x1, - [TYPE_SMART_ICON] = 0x2, - [TYPE_TOUGH_ICON] = 0x0 +__attribute__((aligned(4))) static const u8 sBattleTypeIconPaletteIndex[] = { + [TYPE_NORMAL] = 0, + [TYPE_FIGHTING] = 0, + [TYPE_FLYING] = 1, + [TYPE_POISON] = 1, + [TYPE_GROUND] = 0, + [TYPE_ROCK] = 0, + [TYPE_BUG] = 2, + [TYPE_GHOST] = 1, + [TYPE_STEEL] = 0, + [TYPE_MYSTERY] = 2, + [TYPE_FIRE] = 0, + [TYPE_WATER] = 1, + [TYPE_GRASS] = 2, + [TYPE_ELECTRIC] = 0, + [TYPE_PSYCHIC] = 1, + [TYPE_ICE] = 1, + [TYPE_DRAGON] = 2, + [TYPE_DARK] = 0, + [TYPE_COOL_ICON] = 0, + [TYPE_BEAUTY_ICON] = 1, + [TYPE_CUTE_ICON] = 1, + [TYPE_SMART_ICON] = 2, + [TYPE_TOUGH_ICON] = 0 }; /* * Maps move classes (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ -__attribute__((aligned(4))) static const u32 sBattleIcon_MoveClass_NARCMemberMap[] = { +__attribute__((aligned(4))) static const u32 sMoveClassIconTiles[] = { [CLASS_PHYSICAL] = move_class_physical_ncgr, [CLASS_SPECIAL] = move_class_special_ncgr, [CLASS_STATUS] = move_class_status_ncgr @@ -91,7 +91,7 @@ __attribute__((aligned(4))) static const u32 sBattleIcon_MoveClass_NARCMemberMap /* * Maps move classes (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ -__attribute__((aligned(4))) static const u8 sBattleIcon_MoveClass_PaletteIndexMap[] = { +__attribute__((aligned(4))) static const u8 sMoveClassIconPaletteIndex[] = { [CLASS_PHYSICAL] = 0x0, [CLASS_SPECIAL] = 0x1, [CLASS_STATUS] = 0x0 @@ -101,17 +101,17 @@ __attribute__((aligned(4))) static const u8 sBattleIcon_MoveClass_PaletteIndexMa * Given a type index, return the corresponding NARC member containing the icon for that type. * See also BattleIcon_GetNARCIndex. */ -u32 BattleIcon_TypeIndexToNARCMember(int typeIndex) +u32 BattleIcon_GetMoveTypeTiles(int typeIndex) { - GF_ASSERT(typeIndex < NELEMS(sBattleIcon_NARCMemberMap)); - return sBattleIcon_NARCMemberMap[typeIndex]; + GF_ASSERT(typeIndex < NELEMS(sBattleTypeIconTiles)); + return sBattleTypeIconTiles[typeIndex]; } /* * Returns the NARC member within pl_batt_obj containing palettes for battle icons. * See also BattleIcon_GetNARCIndex. */ -u32 BattleIcon_GetPaletteNARCMember(void) +u32 BattleIcon_GetMoveTypePaletteFileIndex(void) { return icon_palettes_nclr; } @@ -128,12 +128,12 @@ u32 sub_0207C928(void) /* * Given a type index, return the corresponding palette index to use for that type's icon. - * See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. + * See also BattleIcon_GetNARCIndex and BattleIcon_GetMoveTypePaletteFileIndex. */ -u8 BattleIcon_TypeIndexToPaletteIndex(int typeIndex) +u8 BattleIcon_GetMoveTypePaletteIndex(int typeIndex) { - GF_ASSERT(typeIndex < NELEMS(sBattleIcon_PaletteIndexMap)); - return sBattleIcon_PaletteIndexMap[typeIndex]; + GF_ASSERT(typeIndex < NELEMS(sBattleTypeIconPaletteIndex)); + return sBattleTypeIconPaletteIndex[typeIndex]; } /* @@ -146,17 +146,17 @@ u32 BattleIcon_GetNARCIndex(void) void BattleIcon_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int typeIndex, u32 param4) { - sub_0200CBDC(param0, param1, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(typeIndex), 1, param2, param4); + sub_0200CBDC(param0, param1, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(typeIndex), 1, param2, param4); } void BattleIcon_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) { - sub_0200CC9C(param0, param1, BattleIcon_GetNARCIndex(), BattleIcon_GetPaletteNARCMember(), 0, 3, param2, param3); + sub_0200CC9C(param0, param1, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypePaletteFileIndex(), 0, 3, param2, param3); } void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5) { - sub_0200CD7C(param0, param1, param2, param3, BattleIcon_GetNARCIndex(), BattleIcon_GetPaletteNARCMember(), 0, 3, param4, param5); + sub_0200CD7C(param0, param1, param2, param3, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypePaletteFileIndex(), 0, 3, param4, param5); } void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3) @@ -187,7 +187,7 @@ CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, in SpriteTemplate v1; v1 = *param3; - v1.plttIdx = BattleIcon_TypeIndexToPaletteIndex(param2); + v1.plttIdx = BattleIcon_GetMoveTypePaletteIndex(param2); v0 = SpriteActor_LoadResources(param0, param1, &v1); return v0; @@ -202,34 +202,34 @@ void sub_0207CA88(CellActorData *param0) * Given a move class index, return the corresponding NARC member containing the icon for that move class. * See also BattleIcon_GetNARCIndex. */ -u32 BattleIcon_MoveClassIndexToNARCMember(int moveClassIndex) +u32 BattleIcon_GetMoveClassTiles(int moveClassIndex) { - GF_ASSERT(moveClassIndex < NELEMS(sBattleIcon_MoveClass_NARCMemberMap)); - return sBattleIcon_MoveClass_NARCMemberMap[moveClassIndex]; + GF_ASSERT(moveClassIndex < NELEMS(sMoveClassIconTiles)); + return sMoveClassIconTiles[moveClassIndex]; } /* * Given a move class index, return the corresponding palette index to use for that move class' icon. - * See also BattleIcon_GetNARCIndex and BattleIcon_GetPaletteNARCMember. + * See also BattleIcon_GetNARCIndex and BattleIcon_GetMoveTypePaletteFileIndex. */ -u8 BattleIcon_MoveClassIndexToPaletteIndex(int moveClassIndex) +u8 BattleIcon_GetMoveClassPaletteIndex(int moveClassIndex) { - GF_ASSERT(moveClassIndex < NELEMS(sBattleIcon_MoveClass_PaletteIndexMap)); - return sBattleIcon_MoveClass_PaletteIndexMap[moveClassIndex]; + GF_ASSERT(moveClassIndex < NELEMS(sMoveClassIconPaletteIndex)); + return sMoveClassIconPaletteIndex[moveClassIndex]; } /* * Returns the index of the NARC for pl_batt_obj. * (This is identical to BattleIcon_GetNARCIndex). */ -u32 BattleIcon_GetMoveClassNARCIndex(void) +u32 BattleIcon_GetMoveClassPalettteFileIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int moveTypeIndex, u32 param4) { - sub_0200CBDC(param0, param1, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(moveTypeIndex), 1, param2, param4); + sub_0200CBDC(param0, param1, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(moveTypeIndex), 1, param2, param4); } void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1) diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 1bb3aafbb3..3eeae11c6a 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -49,7 +49,7 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { /* * Maps a battle terrain index to the NARC member in pl_batt_obj containing the player's sprite for it. */ -__attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToNARCMember[] = { +__attribute__((aligned(4))) static const u16 sBattleTerrainPlayerTiles[] = { [TERRAIN_PLAIN] = battle_terrain_path_player_ncgr, [TERRAIN_SAND] = battle_terrain_sand_player_ncgr, [TERRAIN_GRASS] = battle_terrain_grass_player_ncgr, @@ -79,7 +79,7 @@ __attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToNARCMembe /* * Maps a battle terrain index to the NARC member in pl_batt_obj containing the opponent's sprite for it. */ -__attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToOpponentNARCMember[] = { +__attribute__((aligned(4))) static const u16 sBattleTerrainOpponentTiles[] = { [TERRAIN_PLAIN] = battle_terrain_path_opponent_ncgr, [TERRAIN_SAND] = battle_terrain_sand_opponent_ncgr, [TERRAIN_GRASS] = battle_terrain_grass_opponent_ncgr, @@ -110,7 +110,7 @@ __attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToOpponentN * Maps a battle terrain ID to the NARC member in pl_batt_obj containing a palette for it. * Each battle terrain has 3 palette options for different times of day. */ -__attribute__((aligned(4))) static const u16 sov16_BattleTerrainIndexToPaletteMember[][3] = { +__attribute__((aligned(4))) static const u16 sBattleTerrainPaletteFileIndex[][3] = { [TERRAIN_PLAIN] = { battle_terrain_path_day_nclr, battle_terrain_path_afternoon_nclr, battle_terrain_path_night_nclr }, [TERRAIN_SAND] = { battle_terrain_sand_day_nclr, battle_terrain_sand_afternoon_nclr, battle_terrain_sand_night_nclr }, [TERRAIN_GRASS] = { battle_terrain_grass_day_nclr, battle_terrain_grass_afternoon_nclr, battle_terrain_grass_night_nclr }, @@ -153,14 +153,14 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) v2 = &Unk_ov16_022700CC[param0->unk_08]; if (param0->unk_08 == 0) { - v3 = sov16_BattleTerrainIndexToNARCMember[param0->unk_09]; + v3 = sBattleTerrainPlayerTiles[param0->unk_09]; v4 = 20013; v5 = battle_terrain_player_ncer; v6 = 20005; v7 = battle_terrain_player_nanr; v8 = 20005; } else { - v3 = sov16_BattleTerrainIndexToOpponentNARCMember[param0->unk_09]; + v3 = sBattleTerrainOpponentTiles[param0->unk_09]; v4 = 20014; v5 = battle_terrain_opponent_ncer; v6 = 20006; @@ -169,8 +169,8 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) } SpriteRenderer_LoadCharResObjFromOpenNarc(v0, v1, v10, v3, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v4); - SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, sov16_BattleTerrainIndexToPaletteMember[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); - PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, sov16_BattleTerrainIndexToPaletteMember[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); + SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, sBattleTerrainPaletteFileIndex[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); + PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, sBattleTerrainPaletteFileIndex[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); SpriteRenderer_LoadCellResObjFromOpenNarc(v0, v1, v10, v5, 1, v6); SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, v1, v10, v7, 1, v8); NARC_dtor(v10); diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 2a2873ad4f..d34ec2c186 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -2801,7 +2801,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ for (v4 = 0; v4 < 4; v4++) { if ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0)) { v5 = MoveTable_LoadParam(param2->unk_00[v4], MOVEATTRIBUTE_TYPE); - v1 = Graphics_GetCharData(BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v5), 1, &v2, 5); + v1 = Graphics_GetCharData(BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(v5), 1, &v2, 5); MI_CpuCopy32(v2->pRawData, v0->unk_18[v4], v3); Heap_FreeToHeap(v1); } diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index 573a9a7390..76b055b850 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -133,7 +133,7 @@ static BOOL ov12_02237474(BallRotation *param0); * Maps a ball index (produced by ov12_02235E94) to NARC members in pl_batt_obj. * These NARC members describe the sprite, palette, cell, and anim to use for that ball. */ -static const int ov12_BallIndexToNARCMembers[][4] = { +static const int sThrownBallSpriteResources[][4] = { { master_ball_throw_ncgr, master_ball_throw_nclr, master_ball_throw_ncer, master_ball_throw_nanr }, { ultra_ball_throw_ncgr, ultra_ball_throw_nclr, ultra_ball_throw_ncer, ultra_ball_throw_nanr }, { great_ball_throw_ncgr, great_ball_throw_nclr, great_ball_throw_ncer, great_ball_throw_nanr }, @@ -345,7 +345,7 @@ static int ov12_02235FC8(int param0, int param1) int v0; v0 = ov12_02235E94(param0); - return ov12_BallIndexToNARCMembers[v0][param1]; + return sThrownBallSpriteResources[v0][param1]; } UnkStruct_ov12_02235FE0 *ov12_02235FE0(int param0) diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 0f8c69dcb0..387f1481b6 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -400,16 +400,16 @@ static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1 { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(param3), 1, param2); - sub_0200D41C(param1, BattleIcon_TypeIndexToPaletteIndex(param3) + 4); + sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(param3), 1, param2); + sub_0200D41C(param1, BattleIcon_GetMoveTypePaletteIndex(param3) + 4); } static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2) { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(param2), 1, 45077); - sub_0200D41C(param1, BattleIcon_MoveClassIndexToPaletteIndex(param2) + 4); + sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(param2), 1, 45077); + sub_0200D41C(param1, BattleIcon_GetMoveClassPaletteIndex(param2) + 4); } static void ov13_02224AB0(u16 param0, CellActorData *param1, const int param2, const int param3) diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index e3c18dd635..45f2bc4264 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -36,11 +36,11 @@ typedef struct { UnkStruct_ov19_021DA9E0 *unk_08; } UnkStruct_ov19_021DAE2C; -u32 BattleIcon_TypeIndexToNARCMember(int param0); -u32 BattleIcon_GetPaletteNARCMember(void); +u32 BattleIcon_GetMoveTypeTiles(int param0); +u32 BattleIcon_GetMoveTypePaletteFileIndex(void); u32 sub_0207C924(void); u32 sub_0207C928(void); -u8 BattleIcon_TypeIndexToPaletteIndex(int param0); +u8 BattleIcon_GetMoveTypePaletteIndex(int param0); u32 BattleIcon_GetNARCIndex(void); void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2); static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0); @@ -217,9 +217,9 @@ static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0) u32 v2, v3, v4; v2 = BattleIcon_GetNARCIndex(); - v3 = BattleIcon_TypeIndexToNARCMember(2); + v3 = BattleIcon_GetMoveTypeTiles(2); - Graphics_LoadPalette(v2, BattleIcon_GetPaletteNARCMember(), 1, 10 * 0x20, 0x20 * 3, 10); + Graphics_LoadPalette(v2, BattleIcon_GetMoveTypePaletteFileIndex(), 1, 10 * 0x20, 0x20 * 3, 10); for (v4 = 0; v4 < 2; v4++) { NNS_G2dInitImageProxy(&v0); @@ -415,24 +415,24 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p u32 v3, v4; v3 = BattleIcon_GetNARCIndex(); - v4 = BattleIcon_TypeIndexToNARCMember(param1->unk_10->unk_4C.unk_0C); + v4 = BattleIcon_GetMoveTypeTiles(param1->unk_10->unk_4C.unk_0C); - Graphics_LoadObjectTiles(BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10); v2 = *CellActor_GetPosition(param1->unk_3C[0]); v2.y = (176 + (16 * param3)) << FX32_SHIFT; CellActor_SetPosition(param1->unk_3C[0], &v2); - CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + BattleIcon_TypeIndexToPaletteIndex(param1->unk_10->unk_4C.unk_0C)); + CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + BattleIcon_GetMoveTypePaletteIndex(param1->unk_10->unk_4C.unk_0C)); CellActor_SetDrawFlag(param1->unk_3C[0], 1); if (param1->unk_10->unk_4C.unk_0C != param1->unk_10->unk_4C.unk_0D) { - Graphics_LoadObjectTiles(BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); + Graphics_LoadObjectTiles(BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10); v2.x += (36 << FX32_SHIFT); CellActor_SetPosition(param1->unk_3C[1], &v2); - CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + BattleIcon_TypeIndexToPaletteIndex(param1->unk_10->unk_4C.unk_0D)); + CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + BattleIcon_GetMoveTypePaletteIndex(param1->unk_10->unk_4C.unk_0D)); CellActor_SetDrawFlag(param1->unk_3C[1], 1); } else { CellActor_SetDrawFlag(param1->unk_3C[1], 0); diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index e801f8b9aa..28a057eec6 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -2435,7 +2435,7 @@ static void ov70_0225F95C(SysTask *param0, void *param1) } { - Graphics_LoadPalette(BattleIcon_GetNARCIndex(), BattleIcon_GetPaletteNARCMember(), 4, 11 * 32, 3 * 32, v0->unk_156); + Graphics_LoadPalette(BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypePaletteFileIndex(), 4, 11 * 32, 3 * 32, v0->unk_156); } SysTask_Done(param0); @@ -2634,16 +2634,16 @@ static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA if (v0 != 0) { v2 = ov66_022316E8(v0); - v3 = LoadMemberFromNARC(BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v2), 1, param3, 1); + v3 = LoadMemberFromNARC(BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(v2), 1, param3, 1); NNS_G2dGetUnpackedCharacterData(v3, &v4); Bg_LoadTiles(param2->unk_00, Unk_ov70_0226D5CC[3], v4->pRawData, 4 * 2 * 32, Unk_ov70_0226D590[v1]); Heap_FreeToHeap(v3); Bg_CopyToTilemapRect(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, Unk_ov70_0226D624[v1], 0, 0, 4, 2); - Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + BattleIcon_TypeIndexToPaletteIndex(v2)); + Bg_ChangeTilemapRectPalette(param2->unk_00, Unk_ov70_0226D5CC[3], 26, 2 + (2 * v1), 4, 2, 11 + BattleIcon_GetMoveTypePaletteIndex(v2)); Bg_ScheduleTilemapTransfer(param2->unk_00, Unk_ov70_0226D5CC[3]); - }sub_0201C3C0 + } } } diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index 198d37a935..6913a425a8 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -448,10 +448,10 @@ void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2) v1 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_TYPE); v2 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v1), 1, 49409); - sub_0200D41C(param0->unk_E0[10], BattleIcon_TypeIndexToPaletteIndex(v1) + 6); - sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(v2), 1, 49410); - sub_0200D41C(param0->unk_E0[11], BattleIcon_MoveClassIndexToPaletteIndex(v2) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(v1), 1, 49409); + sub_0200D41C(param0->unk_E0[10], BattleIcon_GetMoveTypePaletteIndex(v1) + 6); + sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(v2), 1, 49410); + sub_0200D41C(param0->unk_E0[11], BattleIcon_GetMoveClassPaletteIndex(v2) + 6); } void ov84_02240E24(UnkStruct_ov84_0223B5A0 *param0, s16 param1, s16 param2) diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index d51efd60f1..a95f12b4cf 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1366,8 +1366,8 @@ static void ov91_021D22A0(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CONTEST_TYPE) + 18; } - sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(v0), 1, 47276 + param2); - sub_0200D41C(param0->unk_118[6 + param2], BattleIcon_TypeIndexToPaletteIndex(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(v0), 1, 47276 + param2); + sub_0200D41C(param0->unk_118[6 + param2], BattleIcon_GetMoveTypePaletteIndex(v0) + 2); } static void ov91_021D2314(UnkStruct_ov91_021D0ED8 *param0) @@ -1444,8 +1444,8 @@ static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(v0), 1, 47275); - sub_0200D41C(param0->unk_118[5], BattleIcon_MoveClassIndexToPaletteIndex(v0) + 2); + sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(v0), 1, 47275); + sub_0200D41C(param0->unk_118[5], BattleIcon_GetMoveClassPaletteIndex(v0) + 2); } static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index 279138fd0b..2692248d2a 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -429,8 +429,8 @@ void sub_0208F16C(PokemonSummaryApp *param0) static void sub_0208F194(PokemonSummaryApp *param0, u8 param1, u8 param2, u8 param3) { - sub_0200D948(param0->renderer, param0->gfxHandler, BattleIcon_GetNARCIndex(), BattleIcon_TypeIndexToNARCMember(param3), 1, param2); - sub_0200D414(param0->unk_41C[param1], BattleIcon_TypeIndexToPaletteIndex(param3) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(param3), 1, param2); + sub_0200D414(param0->unk_41C[param1], BattleIcon_GetMoveTypePaletteIndex(param3) + 3); } static void sub_0208F1E4(PokemonSummaryApp *param0, u8 *param1, s16 *param2, s16 *param3) @@ -464,8 +464,8 @@ void sub_0208F294(PokemonSummaryApp *param0, u32 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->renderer, param0->gfxHandler, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_MoveClassIndexToNARCMember(v0), 1, 10); - sub_0200D414(param0->unk_41C[18], BattleIcon_MoveClassIndexToPaletteIndex(v0) + 3); + sub_0200D948(param0->renderer, param0->gfxHandler, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(v0), 1, 10); + sub_0200D414(param0->unk_41C[18], BattleIcon_GetMoveClassPaletteIndex(v0) + 3); } void sub_0208F2E8(PokemonSummaryApp *param0) From 6611b55bbb59a693e431b38a0ae3f1b6ef9dcdbc Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Thu, 17 Oct 2024 14:34:21 -0500 Subject: [PATCH 17/26] convert all NCER files into json and adjust build system --- .../graphic/pl_batt_obj/cells/bait_throw.json | 349 +++++ .../cells/ball_status_indicator_opponent.json | 145 +++ .../cells/ball_status_indicator_player.json | 145 +++ .../cells/battle_subscreen_cursor_corner.json | 145 +++ .../cells/battle_terrain_opponent.json | 64 + .../cells/battle_terrain_player.json | 103 ++ .../pl_batt_obj/cells/cherish_ball_throw.json | 349 +++++ .../graphic/pl_batt_obj/cells/data.json | 222 ++++ .../pl_batt_obj/cells/dive_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/dusk_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/great_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/heal_ball_throw.json | 349 +++++ .../cells/healthbox_doubles_opponent_1.json | 64 + .../cells/healthbox_doubles_opponent_2.json | 64 + .../cells/healthbox_doubles_player_1.json | 64 + .../cells/healthbox_doubles_player_2.json | 64 + .../pl_batt_obj/cells/healthbox_safari.json | 60 + .../cells/healthbox_singles_opponent.json | 64 + .../cells/healthbox_singles_player.json | 64 + .../pl_batt_obj/cells/luxury_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/master_ball_throw.json | 349 +++++ .../graphic/pl_batt_obj/cells/meson.build | 75 ++ .../graphic/pl_batt_obj/cells/mud_throw.json | 247 ++++ .../pl_batt_obj/cells/nest_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/net_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/park_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/party_gauge.json | 1127 +++++++++++++++++ .../cells/pl_batt_obj_00000077.json | 143 +++ .../cells/pl_batt_obj_00000113.json | 143 +++ .../cells/pl_batt_obj_00000116.json | 99 ++ .../cells/pl_batt_obj_00000119.json | 59 + .../cells/pl_batt_obj_00000122.json | 79 ++ .../cells/pl_batt_obj_00000125.json | 79 ++ .../cells/pl_batt_obj_00000178.json | 40 + .../cells/pl_batt_obj_00000181.json | 209 +++ .../cells/pl_batt_obj_00000184.json | 253 ++++ .../cells/pl_batt_obj_00000210.json | 379 ++++++ .../cells/pl_batt_obj_00000213.json | 199 +++ .../cells/pl_batt_obj_00000216.json | 259 ++++ .../cells/pl_batt_obj_00000242.json | 40 + .../cells/pl_batt_obj_00000248.json | 349 +++++ .../cells/pl_batt_obj_00000257.json | 64 + .../cells/pl_batt_obj_00000267.json | 682 ++++++++++ .../cells/pl_batt_obj_00000268.json | 682 ++++++++++ .../cells/pl_batt_obj_00000269.json | 682 ++++++++++ .../cells/pl_batt_obj_00000270.json | 682 ++++++++++ .../cells/pl_batt_obj_00000271.json | 682 ++++++++++ .../cells/pl_batt_obj_00000272.json | 682 ++++++++++ .../cells/pl_batt_obj_00000273.json | 682 ++++++++++ .../cells/pl_batt_obj_00000274.json | 682 ++++++++++ .../pl_batt_obj/cells/poke_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/premier_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/quick_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/repeat_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/safari_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/timer_ball_throw.json | 349 +++++ .../pl_batt_obj/cells/ultra_ball_throw.json | 349 +++++ res/battle/graphic/pl_batt_obj/meson.build | 4 +- .../pl_batt_obj/prebuilt/bait_throw.NCER | Bin 318 -> 0 bytes .../ball_status_indicator_opponent.NCER | Bin 216 -> 0 bytes .../ball_status_indicator_player.NCER | Bin 216 -> 0 bytes .../battle_subscreen_cursor_corner.NCER | Bin 216 -> 0 bytes .../prebuilt/battle_terrain_opponent.NCER | Bin 111 -> 0 bytes .../prebuilt/battle_terrain_player.NCER | Bin 123 -> 0 bytes .../prebuilt/cherish_ball_throw.NCER | Bin 318 -> 0 bytes .../pl_batt_obj/prebuilt/dive_ball_throw.NCER | Bin 318 -> 0 bytes .../pl_batt_obj/prebuilt/dusk_ball_throw.NCER | Bin 318 -> 0 bytes .../prebuilt/great_ball_throw.NCER | Bin 318 -> 0 bytes .../pl_batt_obj/prebuilt/heal_ball_throw.NCER | Bin 318 -> 0 bytes .../healthbox_doubles_opponent_1.NCER | Bin 111 -> 0 bytes .../healthbox_doubles_opponent_2.NCER | Bin 111 -> 0 bytes .../prebuilt/healthbox_doubles_player_1.NCER | Bin 111 -> 0 bytes .../prebuilt/healthbox_doubles_player_2.NCER | Bin 111 -> 0 bytes .../prebuilt/healthbox_safari.NCER | Bin 103 -> 0 bytes .../prebuilt/healthbox_singles_opponent.NCER | Bin 111 -> 0 bytes .../prebuilt/healthbox_singles_player.NCER | Bin 111 -> 0 bytes .../prebuilt/luxury_ball_throw.NCER | Bin 318 -> 0 bytes .../prebuilt/master_ball_throw.NCER | Bin 318 -> 0 bytes .../graphic/pl_batt_obj/prebuilt/meson.build | 73 -- .../pl_batt_obj/prebuilt/mud_throw.NCER | Bin 252 -> 0 bytes .../pl_batt_obj/prebuilt/nest_ball_throw.NCER | Bin 318 -> 0 bytes .../pl_batt_obj/prebuilt/net_ball_throw.NCER | Bin 318 -> 0 bytes .../pl_batt_obj/prebuilt/park_ball_throw.NCER | Bin 318 -> 0 bytes .../pl_batt_obj/prebuilt/party_gauge.NCER | Bin 857 -> 0 bytes .../prebuilt/pl_batt_obj_00000077.NCER | Bin 135 -> 0 bytes .../prebuilt/pl_batt_obj_00000113.NCER | Bin 135 -> 0 bytes .../prebuilt/pl_batt_obj_00000116.NCER | Bin 115 -> 0 bytes .../prebuilt/pl_batt_obj_00000119.NCER | Bin 103 -> 0 bytes .../prebuilt/pl_batt_obj_00000122.NCER | Bin 109 -> 0 bytes .../prebuilt/pl_batt_obj_00000125.NCER | Bin 109 -> 0 bytes .../prebuilt/pl_batt_obj_00000178.NCER | Bin 97 -> 0 bytes .../prebuilt/pl_batt_obj_00000181.NCER | Bin 173 -> 0 bytes .../prebuilt/pl_batt_obj_00000184.NCER | Bin 227 -> 0 bytes .../prebuilt/pl_batt_obj_00000210.NCER | Bin 199 -> 0 bytes .../prebuilt/pl_batt_obj_00000213.NCER | Bin 145 -> 0 bytes .../prebuilt/pl_batt_obj_00000216.NCER | Bin 163 -> 0 bytes .../prebuilt/pl_batt_obj_00000242.NCER | Bin 97 -> 0 bytes .../prebuilt/pl_batt_obj_00000248.NCER | Bin 318 -> 0 bytes .../prebuilt/pl_batt_obj_00000257.NCER | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000267.NCER | Bin 391 -> 0 bytes .../prebuilt/pl_batt_obj_00000268.NCER | Bin 391 -> 0 bytes .../prebuilt/pl_batt_obj_00000269.NCER | Bin 391 -> 0 bytes .../prebuilt/pl_batt_obj_00000270.NCER | Bin 391 -> 0 bytes .../prebuilt/pl_batt_obj_00000271.NCER | Bin 391 -> 0 bytes .../prebuilt/pl_batt_obj_00000272.NCER | Bin 391 -> 0 bytes .../prebuilt/pl_batt_obj_00000273.NCER | Bin 391 -> 0 bytes .../prebuilt/pl_batt_obj_00000274.NCER | Bin 391 -> 0 bytes .../pl_batt_obj/prebuilt/poke_ball_throw.NCER | Bin 318 -> 0 bytes .../prebuilt/premier_ball_throw.NCER | Bin 318 -> 0 bytes .../prebuilt/quick_ball_throw.NCER | Bin 318 -> 0 bytes .../prebuilt/repeat_ball_throw.NCER | Bin 318 -> 0 bytes .../prebuilt/safari_ball_throw.NCER | Bin 318 -> 0 bytes .../prebuilt/timer_ball_throw.NCER | Bin 318 -> 0 bytes .../prebuilt/ultra_ball_throw.NCER | Bin 318 -> 0 bytes .../pl_batt_obj/make_pl_batt_obj_cells.py | 64 + tools/scripts/pl_batt_obj/meson.build | 3 +- 116 files changed, 16918 insertions(+), 75 deletions(-) create mode 100644 res/battle/graphic/pl_batt_obj/cells/bait_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_opponent.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_player.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/battle_subscreen_cursor_corner.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/battle_terrain_opponent.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/battle_terrain_player.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/cherish_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/data.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/dive_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/dusk_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/great_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/heal_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_1.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_2.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_1.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_2.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/healthbox_safari.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/healthbox_singles_opponent.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/healthbox_singles_player.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/luxury_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/master_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/meson.build create mode 100644 res/battle/graphic/pl_batt_obj/cells/mud_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/nest_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/net_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/park_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/party_gauge.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000077.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000113.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000116.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000119.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000122.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000125.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000178.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000181.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000184.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000210.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000213.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000216.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000242.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000248.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000257.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/poke_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/premier_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/quick_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/repeat_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/safari_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/timer_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/cells/ultra_ball_throw.json delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_opponent.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_opponent.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_player.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/cherish_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/dive_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/dusk_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/great_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/heal_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_1.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_2.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_1.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_2.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_safari.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_opponent.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_player.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/luxury_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/master_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/mud_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/nest_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/net_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/park_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/party_gauge.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000077.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000113.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000116.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000119.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000122.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000125.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000178.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000181.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000184.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000210.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000213.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000216.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000242.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000248.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000257.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000267.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000268.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000269.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000270.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000271.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000272.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000273.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000274.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/premier_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/quick_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/repeat_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/safari_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/timer_ball_throw.NCER delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/ultra_ball_throw.NCER create mode 100644 tools/scripts/pl_batt_obj/make_pl_batt_obj_cells.py diff --git a/res/battle/graphic/pl_batt_obj/cells/bait_throw.json b/res/battle/graphic/pl_batt_obj/cells/bait_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/bait_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_opponent.json b/res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_opponent.json new file mode 100644 index 0000000000..2f83ff44f7 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_opponent.json @@ -0,0 +1,145 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 4, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_player.json b/res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_player.json new file mode 100644 index 0000000000..705eca1c3d --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_player.json @@ -0,0 +1,145 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 4, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/battle_subscreen_cursor_corner.json b/res/battle/graphic/pl_batt_obj/cells/battle_subscreen_cursor_corner.json new file mode 100644 index 0000000000..88a0991d61 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/battle_subscreen_cursor_corner.json @@ -0,0 +1,145 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 4, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": true, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 16, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": true, + "hvFlip": true, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 24, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/battle_terrain_opponent.json b/res/battle/graphic/pl_batt_obj/cells/battle_terrain_opponent.json new file mode 100644 index 0000000000..0295c92e7a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/battle_terrain_opponent.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 18 + }, + "maxX": 64, + "maxY": 32, + "minX": -64, + "minY": -32, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime2"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/battle_terrain_player.json b/res/battle/graphic/pl_batt_obj/cells/battle_terrain_player.json new file mode 100644 index 0000000000..57d7e5d2e7 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/battle_terrain_player.json @@ -0,0 +1,103 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 32 + }, + "maxX": 128, + "maxY": 16, + "minX": -128, + "minY": -16, + "oamCount": 4, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 384, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/cherish_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/cherish_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/cherish_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/data.json b/res/battle/graphic/pl_batt_obj/cells/data.json new file mode 100644 index 0000000000..25cdb301ca --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/data.json @@ -0,0 +1,222 @@ +[ + { + "target": "pl_batt_obj_00000077.json", + "compressed": false + }, + { + "target": "pl_batt_obj_00000113.json", + "compressed": false + }, + { + "target": "pl_batt_obj_00000116.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000119.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000122.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000125.json", + "compressed": true + }, + { + "target": "battle_terrain_player.json", + "compressed": true + }, + { + "target": "battle_terrain_opponent.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000178.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000181.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000184.json", + "compressed": true + }, + { + "target": "healthbox_singles_opponent.json", + "compressed": true + }, + { + "target": "healthbox_singles_player.json", + "compressed": true + }, + { + "target": "healthbox_doubles_opponent_1.json", + "compressed": true + }, + { + "target": "healthbox_doubles_opponent_2.json", + "compressed": true + }, + { + "target": "healthbox_doubles_player_1.json", + "compressed": true + }, + { + "target": "healthbox_doubles_player_2.json", + "compressed": true + }, + { + "target": "ball_status_indicator_opponent.json", + "compressed": true + }, + { + "target": "ball_status_indicator_player.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000210.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000213.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000216.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000242.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000248.json", + "compressed": true + }, + { + "target": "battle_subscreen_cursor_corner.json", + "compressed": true + }, + { + "target": "healthbox_safari.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000257.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000267.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000268.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000269.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000270.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000271.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000272.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000273.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000274.json", + "compressed": true + }, + { + "target": "poke_ball_throw.json", + "compressed": true + }, + { + "target": "master_ball_throw.json", + "compressed": true + }, + { + "target": "ultra_ball_throw.json", + "compressed": true + }, + { + "target": "great_ball_throw.json", + "compressed": true + }, + { + "target": "safari_ball_throw.json", + "compressed": true + }, + { + "target": "net_ball_throw.json", + "compressed": true + }, + { + "target": "dive_ball_throw.json", + "compressed": true + }, + { + "target": "nest_ball_throw.json", + "compressed": true + }, + { + "target": "repeat_ball_throw.json", + "compressed": true + }, + { + "target": "timer_ball_throw.json", + "compressed": true + }, + { + "target": "luxury_ball_throw.json", + "compressed": true + }, + { + "target": "premier_ball_throw.json", + "compressed": true + }, + { + "target": "quick_ball_throw.json", + "compressed": true + }, + { + "target": "dusk_ball_throw.json", + "compressed": true + }, + { + "target": "heal_ball_throw.json", + "compressed": true + }, + { + "target": "cherish_ball_throw.json", + "compressed": true + }, + { + "target": "park_ball_throw.json", + "compressed": true + }, + { + "target": "bait_throw.json", + "compressed": true + }, + { + "target": "mud_throw.json", + "compressed": true + }, + { + "target": "party_gauge.json", + "compressed": true + } +] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/dive_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/dive_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/dive_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/dusk_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/dusk_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/dusk_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/great_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/great_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/great_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/heal_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/heal_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/heal_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_1.json b/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_1.json new file mode 100644 index 0000000000..275125c4e8 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_1.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 18 + }, + "maxX": 64, + "maxY": 36, + "minX": -64, + "minY": -28, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_2.json b/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_2.json new file mode 100644 index 0000000000..275125c4e8 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_2.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 18 + }, + "maxX": 64, + "maxY": 36, + "minX": -64, + "minY": -28, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_1.json b/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_1.json new file mode 100644 index 0000000000..275125c4e8 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_1.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 18 + }, + "maxX": 64, + "maxY": 36, + "minX": -64, + "minY": -28, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_2.json b/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_2.json new file mode 100644 index 0000000000..275125c4e8 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_2.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 18 + }, + "maxX": 64, + "maxY": 36, + "minX": -64, + "minY": -28, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_safari.json b/res/battle/graphic/pl_batt_obj/cells/healthbox_safari.json new file mode 100644 index 0000000000..37e1cdb478 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/healthbox_safari.json @@ -0,0 +1,60 @@ +{ + "labelEnabled": true, + "extended": false, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 18 + }, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_singles_opponent.json b/res/battle/graphic/pl_batt_obj/cells/healthbox_singles_opponent.json new file mode 100644 index 0000000000..275125c4e8 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/healthbox_singles_opponent.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 18 + }, + "maxX": 64, + "maxY": 36, + "minX": -64, + "minY": -28, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 228, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_singles_player.json b/res/battle/graphic/pl_batt_obj/cells/healthbox_singles_player.json new file mode 100644 index 0000000000..eaa07ccdf9 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/healthbox_singles_player.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 18 + }, + "maxX": 64, + "maxY": 32, + "minX": -64, + "minY": -32, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/luxury_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/luxury_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/luxury_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/master_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/master_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/master_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/meson.build b/res/battle/graphic/pl_batt_obj/cells/meson.build new file mode 100644 index 0000000000..2d948a00db --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/meson.build @@ -0,0 +1,75 @@ +pl_batt_obj_cells = files( + 'pl_batt_obj_00000077.json', + 'pl_batt_obj_00000113.json', + 'pl_batt_obj_00000116.json', + 'pl_batt_obj_00000122.json', + 'pl_batt_obj_00000125.json', + 'battle_terrain_player.json', + 'pl_batt_obj_00000181.json', + 'pl_batt_obj_00000184.json', + 'ball_status_indicator_opponent.json', + 'ball_status_indicator_player.json', + 'pl_batt_obj_00000210.json', + 'pl_batt_obj_00000213.json', + 'pl_batt_obj_00000216.json', + 'pl_batt_obj_00000248.json', + 'battle_subscreen_cursor_corner.json', + 'pl_batt_obj_00000267.json', + 'pl_batt_obj_00000268.json', + 'pl_batt_obj_00000269.json', + 'pl_batt_obj_00000270.json', + 'pl_batt_obj_00000271.json', + 'pl_batt_obj_00000272.json', + 'pl_batt_obj_00000273.json', + 'pl_batt_obj_00000274.json', + 'poke_ball_throw.json', + 'master_ball_throw.json', + 'ultra_ball_throw.json', + 'great_ball_throw.json', + 'safari_ball_throw.json', + 'net_ball_throw.json', + 'dive_ball_throw.json', + 'nest_ball_throw.json', + 'repeat_ball_throw.json', + 'timer_ball_throw.json', + 'luxury_ball_throw.json', + 'premier_ball_throw.json', + 'quick_ball_throw.json', + 'dusk_ball_throw.json', + 'heal_ball_throw.json', + 'cherish_ball_throw.json', + 'park_ball_throw.json', + 'bait_throw.json', + 'mud_throw.json', + 'party_gauge.json', + 'pl_batt_obj_00000119.json', + 'battle_terrain_opponent.json', + 'pl_batt_obj_00000178.json', + 'healthbox_singles_opponent.json', + 'healthbox_singles_player.json', + 'healthbox_doubles_opponent_1.json', + 'healthbox_doubles_opponent_2.json', + 'healthbox_doubles_player_1.json', + 'healthbox_doubles_player_2.json', + 'pl_batt_obj_00000242.json', + 'healthbox_safari.json', + 'pl_batt_obj_00000257.json' +) + +pl_batt_obj_cells_data = files('data.json') + +pl_batt_obj_ncer = [] +foreach infile : pl_batt_obj_cells + pl_batt_obj_ncer += custom_target( + input: [infile, pl_batt_obj_cells_data], + output: '@BASENAME0@.NCER', + command: [ + make_pl_batt_obj_cells_py, + '--nitrogfx', nitrogfx_exe.full_path(), + '--input', '@INPUT0@', + '--output', '@OUTPUT@', + '--datafile', '@INPUT1@', + '--private-dir', '@PRIVATE_DIR@' + ] + ) +endforeach \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/mud_throw.json b/res/battle/graphic/pl_batt_obj/cells/mud_throw.json new file mode 100644 index 0000000000..dc9f4cdecf --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/mud_throw.json @@ -0,0 +1,247 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 7, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/nest_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/nest_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/nest_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/net_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/net_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/net_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/park_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/park_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/park_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/party_gauge.json b/res/battle/graphic/pl_batt_obj/cells/party_gauge.json new file mode 100644 index 0000000000..486df50277 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/party_gauge.json @@ -0,0 +1,1127 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 27, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 22, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 26, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 28, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 30, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 34, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 38, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 42, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 46, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 24 + }, + "maxX": 96, + "maxY": 8, + "minX": -96, + "minY": 0, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 64, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 50, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 32, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 52, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 54, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 480, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 56, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 58, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 416, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 24 + }, + "maxX": 96, + "maxY": 8, + "minX": -96, + "minY": 0, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 416, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 50, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 52, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 480, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 54, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 56, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 32, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 58, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 64, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime8", "CellAnime7", "CellAnime6", "CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5"], + "labelCount": 9 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000077.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000077.json new file mode 100644 index 0000000000..2b7e4c5320 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000077.json @@ -0,0 +1,143 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000113.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000113.json new file mode 100644 index 0000000000..ae7be349ae --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000113.json @@ -0,0 +1,143 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 1, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 22, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000116.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000116.json new file mode 100644 index 0000000000..558cb0f517 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000116.json @@ -0,0 +1,99 @@ +{ + "labelEnabled": true, + "extended": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 18 + }, + "oamCount": 4, + "OAM": [{ + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 1, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 1, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000119.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000119.json new file mode 100644 index 0000000000..584f475b44 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000119.json @@ -0,0 +1,59 @@ +{ + "labelEnabled": true, + "extended": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 19 + }, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 456, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000122.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000122.json new file mode 100644 index 0000000000..951c1e6b35 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000122.json @@ -0,0 +1,79 @@ +{ + "labelEnabled": true, + "extended": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 10 + }, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000125.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000125.json new file mode 100644 index 0000000000..951c1e6b35 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000125.json @@ -0,0 +1,79 @@ +{ + "labelEnabled": true, + "extended": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 10 + }, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000178.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000178.json new file mode 100644 index 0000000000..9c5c284f8c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000178.json @@ -0,0 +1,40 @@ +{ + "labelEnabled": true, + "extended": false, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 5 + }, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000181.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000181.json new file mode 100644 index 0000000000..3973a93664 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000181.json @@ -0,0 +1,209 @@ +{ + "labelEnabled": true, + "extended": false, + "cellCount": 6, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 0 + }, + "oamCount": 0, + "OAM": [] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 3 + }, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 3 + }, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 1, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 3 + }, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 5 + }, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 3, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 5 + }, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 5, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000184.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000184.json new file mode 100644 index 0000000000..283af2a0c4 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000184.json @@ -0,0 +1,253 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 6, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 0 + }, + "maxX": -32768, + "maxY": -32768, + "minX": 32767, + "minY": 32767, + "oamCount": 0, + "OAM": [] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 8, + "maxY": 8, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 8, + "maxY": 8, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 7, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 9, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 8, + "maxY": 8, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000210.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000210.json new file mode 100644 index 0000000000..394a091c0f --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000210.json @@ -0,0 +1,379 @@ +{ + "labelEnabled": true, + "extended": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 25 + }, + "oamCount": 18, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 80, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 424, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 48, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 208, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 208, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 22, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 208, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 48, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 26, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 208, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 30, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 80, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 208, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 80, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 464, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 208, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 464, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 22, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 208, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 432, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 432, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 424, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 208, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 424, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 52, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000213.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000213.json new file mode 100644 index 0000000000..d667c90183 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000213.json @@ -0,0 +1,199 @@ +{ + "labelEnabled": true, + "extended": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 13 + }, + "oamCount": 9, + "OAM": [{ + "Attr0": { + "YCoordinate": 16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 480, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 232, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 32, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 32, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 232, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 22, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 224, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 26, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000216.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000216.json new file mode 100644 index 0000000000..368c435e99 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000216.json @@ -0,0 +1,259 @@ +{ + "labelEnabled": true, + "extended": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 17 + }, + "oamCount": 12, + "OAM": [{ + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 48, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 48, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 9, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 13, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 17, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 48, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 21, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 464, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 25, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 456, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 29, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 456, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 30, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 456, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 34, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 464, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 38, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000242.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000242.json new file mode 100644 index 0000000000..9c5c284f8c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000242.json @@ -0,0 +1,40 @@ +{ + "labelEnabled": true, + "extended": false, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": false, + "boundingSphereRadius": 5 + }, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000248.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000248.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000248.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000257.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000257.json new file mode 100644 index 0000000000..69140da161 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000257.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": false, + "cellCount": 1, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 36 + }, + "maxX": 128, + "maxY": 64, + "minX": 0, + "minY": 0, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json new file mode 100644 index 0000000000..6e3fc67ab6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json @@ -0,0 +1,682 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": true, + "cellCount": 5, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1, + "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], + "partitionCount": 12 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json new file mode 100644 index 0000000000..6e3fc67ab6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json @@ -0,0 +1,682 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": true, + "cellCount": 5, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1, + "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], + "partitionCount": 12 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json new file mode 100644 index 0000000000..6e3fc67ab6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json @@ -0,0 +1,682 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": true, + "cellCount": 5, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1, + "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], + "partitionCount": 12 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json new file mode 100644 index 0000000000..6e3fc67ab6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json @@ -0,0 +1,682 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": true, + "cellCount": 5, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1, + "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], + "partitionCount": 12 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json new file mode 100644 index 0000000000..6e3fc67ab6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json @@ -0,0 +1,682 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": true, + "cellCount": 5, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1, + "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], + "partitionCount": 12 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json new file mode 100644 index 0000000000..6e3fc67ab6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json @@ -0,0 +1,682 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": true, + "cellCount": 5, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1, + "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], + "partitionCount": 12 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json new file mode 100644 index 0000000000..6e3fc67ab6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json @@ -0,0 +1,682 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": true, + "cellCount": 5, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1, + "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], + "partitionCount": 12 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json new file mode 100644 index 0000000000..6e3fc67ab6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json @@ -0,0 +1,682 @@ +{ + "labelEnabled": true, + "extended": true, + "partitionEnabled": true, + "cellCount": 5, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 14 + }, + "maxX": 40, + "maxY": 40, + "minX": -40, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 472, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 56, + "maxY": 40, + "minX": -24, + "minY": -40, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 216, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 40, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1, + "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], + "partitionCount": 12 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/poke_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/poke_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/poke_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/premier_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/premier_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/premier_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/quick_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/quick_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/quick_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/repeat_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/repeat_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/repeat_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/safari_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/safari_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/safari_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/timer_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/timer_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/timer_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/ultra_ball_throw.json b/res/battle/graphic/pl_batt_obj/cells/ultra_ball_throw.json new file mode 100644 index 0000000000..817bb77e91 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/cells/ultra_ball_throw.json @@ -0,0 +1,349 @@ +{ + "labelEnabled": true, + "extended": true, + "cellCount": 10, + "mappingType": 1, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 8, + "maxY": 8, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 16, + "maxY": 16, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index 921418af85..7fed645f85 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -1,6 +1,7 @@ subdir('prebuilt') subdir('palettes') subdir('sprites') +subdir('cells') pl_batt_order = files('order.txt') @@ -10,7 +11,8 @@ nitrofs_files += custom_target('pl_batt_obj.narc', pl_batt_order, pl_batt_obj_nclr, pl_batt_obj_built, - pl_batt_obj_ncgr + pl_batt_obj_ncgr, + pl_batt_obj_ncer ], command: [ knarc_exe, diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NCER deleted file mode 100644 index 1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%67&GzG}!VeoNs^l<^I0|9Oz76W2MAa+j8$#Klf%uO{wFbxq* RBLvf!Atb^z6l6CD006_{Fl7J$ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NCER deleted file mode 100644 index b2e993a397ebf33b1d703433aa8759aff1ca2910..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmWG?b@u!JkAd+90|SEq12coSldE$Dkj=ut$RGiv(E%d^8wW^C00=+)|L`BgXG7!j zpz(!}_#YTPG%_%NNT7ZosQ@Mo7<`-@eO!R*K!6*F#ei55h@De&avbwAb5jivOhW|I Q2*EUF2#IhF1=$S(031m%SpWb4 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NCER deleted file mode 100644 index 21c6855690d506c74b8f26427bf827320d329d8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmWG?b@u!JkAd+90|SEq12coSldE$Dkj=ut$RGiv(E%d^GY3eF0|SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67Rq@W|KH;hNG{h=I4*v{y0rl+V8dk)h2JHBU9i9dK>jZaY?n@4 zyz(M1$Q|Kj;Z@=E+|~Q*!W+Vy!rQ`o!iT~G;TOWk!Y9J-gwKTE3r~eV3x5&*D*R3O zyYSBycfec!LZ9Im%?bc?_h-d($Ta}5#9U)KOxz%zZ!pWuEoOyTWo|QTOpm$4++)_6 zKJ$RtU>-7$m`!GjdCbK9DHV5+e%wVuj2l$TWPn^G=g2I<9jZ*z%tF)5Qqv45n(-CQ zC^dvpphqA0wp5$gHSB%t7Iq(-Hh+aZ#SZ6bs-GSn=K~Y_CiYBhn|NYk$HY?;yC$B& LWE$Pj&rkISD&*s? diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000077.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000077.NCER deleted file mode 100644 index ce7759de1945b7640bdef19ecdb2c2340e88c503..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmWG?b@u!JkAbnBfq_AQftkVE$<;Xo$YumW2`~*LkN_J49|wr50faaH10lnWgA5Ee z8YCJN7=8dr6$S~18;u%3@<*c%&;$tw0|p-_M;~#h8P2IWIgWXmxv2&WArY>jJWyc( DzS$b6 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000113.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000113.NCER deleted file mode 100644 index 77c7f3f8f18e5c7f8b7dd4b5e84754fc16adc53c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmWG?b@u!JkAbnBfq_AQftkVE$<;Xo$YumW2_Ve`#K?e+fsX^k*8svB|ACO<#z6*# z8x0Z-0t`QZq!5FI!;MA}Ao-(F3}}Lcg9L+*lcSF~)DY*?oE*oz%-mE1hL8x?P#&l- E0IZZ6MF0Q* diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000116.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000116.NCER deleted file mode 100644 index dfbc44d7fb3f25f97d3d02ee55683bfdc0c6d380..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmWG?b@u!JkAbn6fq_AQftkVE$<^5b$Yum$2`CMu;DCie2+V%Kz;J+p;Q_ cPL4j}P!-OpIXRAbnYpP33?UJ&p*&Dw03~1#_y7O^ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000122.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000122.NCER deleted file mode 100644 index db89a58eb293eca715658d7dbf89a1d63edcbd94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmWG?b@u!JkAX3lfq_AQftkVE$<^5k$Yum$2`CMu;DDKd3(WrEaHEld;fKSIMiz!2 i3=$3;3_ebdKH^Yy&Z#*$j(M56sRj%o5w4*;P+GILW67(yakLwTUW0G#Cw!~g&Q diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000181.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000181.NCER deleted file mode 100644 index 9ab7d88daf24d61098677f05ecc0d5a2ac5b1c5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmWG?b@u!JkAZP50|SEq12coSldE$Tkj)0f5$&F7+4vE zptKy2{=x7AXv7bPAB>D(k_k*Q1I0NQSio#nFq@6R$H~!09H;{XoKtgh9P=`BQw?qEjbw3 diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000184.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000184.NCER deleted file mode 100644 index 711cd0e1fed73def5646c1f4a42af19fcbfe25ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmWG?b@u!JkAd+q0|SEq12coSldJOvAe)VWkwF4TGXgOh-~jU*7#jZ9|F36cU`!jF!(q*`iKMdgMf2tPL5+cD9Bn6003D&Gz4g+4R{I4}r&XjtLMBB0@5 z;J^VS1sr&QB+win`GHYL-~x~>0we_-#DJuMgA|bbz$hmm0Mx4>Z~;iF099Ua diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000216.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000216.NCER deleted file mode 100644 index 1c0aacbff97e41b185f72ed39ed9fed9087f006d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmWG?b@u!JkAZP90|SEq12coSldE$9kj)6h5890VL#1b#3W zFmMPkG#EH=3fusS@B+yXj)DR=fFhzmH5VKufoe`L$^zA#aFhdzpKw$Hs=45(Cg9`b b=pzob#5px5$1yK6H`Rb4B*Hb62PzBzN_8Mv diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000242.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000242.NCER deleted file mode 100644 index cfe70eb10c694fc66a8fe5bda7f4e974a9e39726..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmWG?b@u!JkAX3ffq_AQftkVE$<GILW67(yakLwTUW0G#Cw!~g&Q diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000248.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000248.NCER deleted file mode 100644 index 1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%67-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000268.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000268.NCER deleted file mode 100644 index 7143524813b90c410a0276e5f5bb412415a6a396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000269.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000269.NCER deleted file mode 100644 index 7143524813b90c410a0276e5f5bb412415a6a396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000270.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000270.NCER deleted file mode 100644 index 7143524813b90c410a0276e5f5bb412415a6a396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000271.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000271.NCER deleted file mode 100644 index 7143524813b90c410a0276e5f5bb412415a6a396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000272.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000272.NCER deleted file mode 100644 index 7143524813b90c410a0276e5f5bb412415a6a396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000273.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000273.NCER deleted file mode 100644 index 7143524813b90c410a0276e5f5bb412415a6a396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000274.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000274.NCER deleted file mode 100644 index 7143524813b90c410a0276e5f5bb412415a6a396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmWG?b@u!JkAbnBk%2*gftkVE$<;Xo$Yy0=WRPHB0Fn$0G9Us9*ckXYKuirFyz&3W ze-K{-!XV*rqfrA${%F(z zxYCZmI!8NQ7%BP&XI=0DJ;n7XSbN diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NCER b/res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NCER deleted file mode 100644 index 1d13ddb36d7cbfbe50ad35c0bf35f0f8a6887424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmWG?b@u!JkAcySk%2*gftkVE$<_G}0|NsW10#b3kOm5)07eF84v+u`5dQf8<3EVc zhQ{YX;|rnjLFOXsmqX*Lpz*cP_y#C^HV!i&UjPU{{QvO(2g46X1_ltx1SVO)Bpa9n zx)>SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67SXxPD8%67 Date: Fri, 18 Oct 2024 10:52:57 -0500 Subject: [PATCH 18/26] build all NANRs for pl_batt_obj using nitrogfx --- .../graphic/pl_batt_obj/anims/bait_throw.json | 55 +++ .../anims/ball_status_indicator_opponent.json | 66 +++ .../anims/ball_status_indicator_player.json | 66 +++ .../anims/battle_subscreen_cursor_corner.json | 158 +++++++ .../anims/battle_terrain_opponent.json | 24 + .../anims/battle_terrain_player.json | 24 + .../pl_batt_obj/anims/cherish_ball_throw.json | 97 ++++ .../graphic/pl_batt_obj/anims/data.json | 222 +++++++++ .../pl_batt_obj/anims/dive_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/dusk_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/great_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/heal_ball_throw.json | 97 ++++ .../anims/healthbox_doubles_opponent_1.json | 24 + .../anims/healthbox_doubles_opponent_2.json | 24 + .../anims/healthbox_doubles_player_1.json | 24 + .../anims/healthbox_doubles_player_2.json | 24 + .../pl_batt_obj/anims/healthbox_safari.json | 24 + .../anims/healthbox_singles_opponent.json | 24 + .../anims/healthbox_singles_player.json | 24 + .../pl_batt_obj/anims/luxury_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/master_ball_throw.json | 97 ++++ .../graphic/pl_batt_obj/anims/meson.build | 75 +++ .../graphic/pl_batt_obj/anims/mud_throw.json | 76 +++ .../pl_batt_obj/anims/nest_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/net_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/park_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/party_gauge.json | 334 +++++++++++++ .../anims/pl_batt_obj_00000078.json | 24 + .../anims/pl_batt_obj_00000114.json | 24 + .../anims/pl_batt_obj_00000115.json | 24 + .../anims/pl_batt_obj_00000118.json | 24 + .../anims/pl_batt_obj_00000123.json | 24 + .../anims/pl_batt_obj_00000126.json | 24 + .../anims/pl_batt_obj_00000177.json | 24 + .../anims/pl_batt_obj_00000180.json | 52 +++ .../anims/pl_batt_obj_00000183.json | 59 +++ .../anims/pl_batt_obj_00000212.json | 24 + .../anims/pl_batt_obj_00000215.json | 24 + .../anims/pl_batt_obj_00000218.json | 24 + .../anims/pl_batt_obj_00000243.json | 24 + .../anims/pl_batt_obj_00000249.json | 97 ++++ .../anims/pl_batt_obj_00000258.json | 24 + .../anims/pl_batt_obj_00000275.json | 52 +++ .../anims/pl_batt_obj_00000276.json | 52 +++ .../anims/pl_batt_obj_00000277.json | 52 +++ .../anims/pl_batt_obj_00000278.json | 52 +++ .../anims/pl_batt_obj_00000279.json | 52 +++ .../anims/pl_batt_obj_00000280.json | 52 +++ .../anims/pl_batt_obj_00000281.json | 52 +++ .../anims/pl_batt_obj_00000282.json | 52 +++ .../pl_batt_obj/anims/poke_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/premier_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/quick_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/repeat_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/safari_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/timer_ball_throw.json | 97 ++++ .../pl_batt_obj/anims/ultra_ball_throw.json | 97 ++++ res/battle/graphic/pl_batt_obj/meson.build | 4 +- .../pl_batt_obj/prebuilt/bait_throw.NANR | Bin 178 -> 0 bytes .../ball_status_indicator_opponent.NANR | Bin 240 -> 0 bytes .../ball_status_indicator_player.NANR | Bin 240 -> 0 bytes .../battle_subscreen_cursor_corner.NANR | Bin 416 -> 0 bytes .../prebuilt/battle_terrain_opponent.NANR | Bin 111 -> 0 bytes .../prebuilt/battle_terrain_player.NANR | Bin 111 -> 0 bytes .../prebuilt/cherish_ball_throw.NANR | Bin 238 -> 0 bytes .../graphic/pl_batt_obj/prebuilt/data.json | 442 ------------------ .../pl_batt_obj/prebuilt/dive_ball_throw.NANR | Bin 238 -> 0 bytes .../pl_batt_obj/prebuilt/dusk_ball_throw.NANR | Bin 238 -> 0 bytes .../prebuilt/great_ball_throw.NANR | Bin 238 -> 0 bytes .../pl_batt_obj/prebuilt/heal_ball_throw.NANR | Bin 238 -> 0 bytes .../healthbox_doubles_opponent_1.NANR | Bin 111 -> 0 bytes .../healthbox_doubles_opponent_2.NANR | Bin 111 -> 0 bytes .../prebuilt/healthbox_doubles_player_1.NANR | Bin 111 -> 0 bytes .../prebuilt/healthbox_doubles_player_2.NANR | Bin 111 -> 0 bytes .../prebuilt/healthbox_safari.NANR | Bin 111 -> 0 bytes .../prebuilt/healthbox_singles_opponent.NANR | Bin 111 -> 0 bytes .../prebuilt/healthbox_singles_player.NANR | Bin 111 -> 0 bytes .../prebuilt/luxury_ball_throw.NANR | Bin 238 -> 0 bytes .../prebuilt/master_ball_throw.NANR | Bin 238 -> 0 bytes .../graphic/pl_batt_obj/prebuilt/meson.build | 75 --- .../pl_batt_obj/prebuilt/mud_throw.NANR | Bin 210 -> 0 bytes .../pl_batt_obj/prebuilt/nest_ball_throw.NANR | Bin 238 -> 0 bytes .../pl_batt_obj/prebuilt/net_ball_throw.NANR | Bin 238 -> 0 bytes .../pl_batt_obj/prebuilt/park_ball_throw.NANR | Bin 238 -> 0 bytes .../pl_batt_obj/prebuilt/party_gauge.NANR | Bin 815 -> 0 bytes .../prebuilt/pl_batt_obj_00000078.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000114.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000115.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000118.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000123.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000126.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000177.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000180.NANR | Bin 151 -> 0 bytes .../prebuilt/pl_batt_obj_00000183.NANR | Bin 159 -> 0 bytes .../prebuilt/pl_batt_obj_00000212.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000215.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000218.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000243.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000249.NANR | Bin 238 -> 0 bytes .../prebuilt/pl_batt_obj_00000258.NANR | Bin 111 -> 0 bytes .../prebuilt/pl_batt_obj_00000275.NANR | Bin 151 -> 0 bytes .../prebuilt/pl_batt_obj_00000276.NANR | Bin 151 -> 0 bytes .../prebuilt/pl_batt_obj_00000277.NANR | Bin 151 -> 0 bytes .../prebuilt/pl_batt_obj_00000278.NANR | Bin 151 -> 0 bytes .../prebuilt/pl_batt_obj_00000279.NANR | Bin 151 -> 0 bytes .../prebuilt/pl_batt_obj_00000280.NANR | Bin 151 -> 0 bytes .../prebuilt/pl_batt_obj_00000281.NANR | Bin 151 -> 0 bytes .../prebuilt/pl_batt_obj_00000282.NANR | Bin 151 -> 0 bytes .../pl_batt_obj/prebuilt/poke_ball_throw.NANR | Bin 238 -> 0 bytes .../prebuilt/premier_ball_throw.NANR | Bin 238 -> 0 bytes .../prebuilt/quick_ball_throw.NANR | Bin 238 -> 0 bytes .../prebuilt/repeat_ball_throw.NANR | Bin 238 -> 0 bytes .../prebuilt/safari_ball_throw.NANR | Bin 238 -> 0 bytes .../prebuilt/timer_ball_throw.NANR | Bin 238 -> 0 bytes .../prebuilt/ultra_ball_throw.NANR | Bin 238 -> 0 bytes ...prebuilts.py => make_pl_batt_obj_anims.py} | 23 +- tools/scripts/pl_batt_obj/meson.build | 4 +- 117 files changed, 3846 insertions(+), 531 deletions(-) create mode 100644 res/battle/graphic/pl_batt_obj/anims/bait_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/data.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/meson.build create mode 100644 res/battle/graphic/pl_batt_obj/anims/mud_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/party_gauge.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000243.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000258.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json create mode 100644 res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_opponent.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_opponent.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_player.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/cherish_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/data.json delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/dive_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/dusk_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/great_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/heal_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_1.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_2.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_1.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_player_2.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_safari.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_opponent.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/healthbox_singles_player.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/luxury_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/master_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/meson.build delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/mud_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/nest_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/net_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/park_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/party_gauge.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000078.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000114.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000115.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000118.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000123.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000126.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000177.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000180.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000183.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000212.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000215.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000218.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000243.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000249.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000258.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000275.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000276.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000277.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000278.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000279.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000280.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000281.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000282.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/premier_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/quick_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/repeat_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/safari_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/timer_ball_throw.NANR delete mode 100644 res/battle/graphic/pl_batt_obj/prebuilt/ultra_ball_throw.NANR rename tools/scripts/pl_batt_obj/{make_pl_batt_obj_prebuilts.py => make_pl_batt_obj_anims.py} (68%) diff --git a/res/battle/graphic/pl_batt_obj/anims/bait_throw.json b/res/battle/graphic/pl_batt_obj/anims/bait_throw.json new file mode 100644 index 0000000000..458661c93e --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/bait_throw.json @@ -0,0 +1,55 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 5, + "resultCount": 4, + "sequences": [{ + "frameCount": 4, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 60, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json new file mode 100644 index 0000000000..6a55e9dbf6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json @@ -0,0 +1,66 @@ +{ + "labelEnabled": true, + "sequenceCount": 4, + "frameCount": 4, + "resultCount": 4, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 1 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 2 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 3 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }, { + "dataType": 0, + "padded": true, + "index": 1 + }, { + "dataType": 0, + "padded": true, + "index": 2 + }, { + "dataType": 0, + "padded": true, + "index": 3 + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json new file mode 100644 index 0000000000..6a55e9dbf6 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json @@ -0,0 +1,66 @@ +{ + "labelEnabled": true, + "sequenceCount": 4, + "frameCount": 4, + "resultCount": 4, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 1 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 2 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 3 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }, { + "dataType": 0, + "padded": true, + "index": 1 + }, { + "dataType": 0, + "padded": true, + "index": 2 + }, { + "dataType": 0, + "padded": true, + "index": 3 + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json b/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json new file mode 100644 index 0000000000..9b049a6dfc --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json @@ -0,0 +1,158 @@ +{ + "labelEnabled": true, + "sequenceCount": 4, + "frameCount": 16, + "resultCount": 12, + "sequences": [{ + "frameCount": 4, + "unk02": 0, + "dataType": 2, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 0 + }, { + "frameDelay": 6, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 6, + "resultId": 1 + }] + }, { + "frameCount": 4, + "unk02": 0, + "dataType": 2, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 3 + }, { + "frameDelay": 6, + "resultId": 4 + }, { + "frameDelay": 6, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 4 + }] + }, { + "frameCount": 4, + "unk02": 0, + "dataType": 2, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 6, + "resultId": 7 + }, { + "frameDelay": 6, + "resultId": 8 + }, { + "frameDelay": 6, + "resultId": 7 + }] + }, { + "frameCount": 4, + "unk02": 0, + "dataType": 2, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 9 + }, { + "frameDelay": 6, + "resultId": 10 + }, { + "frameDelay": 6, + "resultId": 11 + }, { + "frameDelay": 6, + "resultId": 10 + }] + }], + "animationResults": [{ + "dataType": 2, + "padded": false, + "index": 0, + "positionX": 0, + "positionY": 0 + }, { + "dataType": 2, + "padded": false, + "index": 0, + "positionX": -1, + "positionY": -1 + }, { + "dataType": 2, + "padded": false, + "index": 0, + "positionX": -2, + "positionY": -2 + }, { + "dataType": 2, + "padded": false, + "index": 1, + "positionX": 0, + "positionY": 0 + }, { + "dataType": 2, + "padded": false, + "index": 1, + "positionX": 1, + "positionY": -1 + }, { + "dataType": 2, + "padded": false, + "index": 1, + "positionX": 2, + "positionY": -2 + }, { + "dataType": 2, + "padded": false, + "index": 2, + "positionX": 0, + "positionY": 0 + }, { + "dataType": 2, + "padded": false, + "index": 2, + "positionX": -1, + "positionY": 1 + }, { + "dataType": 2, + "padded": false, + "index": 2, + "positionX": -2, + "positionY": 2 + }, { + "dataType": 2, + "padded": false, + "index": 3, + "positionX": 0, + "positionY": 0 + }, { + "dataType": 2, + "padded": false, + "index": 3, + "positionX": 1, + "positionY": 1 + }, { + "dataType": 2, + "padded": false, + "index": 3, + "positionX": 2, + "positionY": 2 + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json new file mode 100644 index 0000000000..0e1f342224 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime2"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/data.json b/res/battle/graphic/pl_batt_obj/anims/data.json new file mode 100644 index 0000000000..1bf322731d --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/data.json @@ -0,0 +1,222 @@ +[ + { + "target": "pl_batt_obj_00000078.json", + "compressed": false + }, + { + "target": "pl_batt_obj_00000114.json", + "compressed": false + }, + { + "target": "pl_batt_obj_00000115.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000118.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000123.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000126.json", + "compressed": true + }, + { + "target": "battle_terrain_player.json", + "compressed": true + }, + { + "target": "battle_terrain_opponent.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000177.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000180.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000183.json", + "compressed": true + }, + { + "target": "healthbox_singles_opponent.json", + "compressed": true + }, + { + "target": "healthbox_singles_player.json", + "compressed": true + }, + { + "target": "healthbox_doubles_opponent_1.json", + "compressed": true + }, + { + "target": "healthbox_doubles_opponent_2.json", + "compressed": true + }, + { + "target": "healthbox_doubles_player_1.json", + "compressed": true + }, + { + "target": "healthbox_doubles_player_2.json", + "compressed": true + }, + { + "target": "ball_status_indicator_opponent.json", + "compressed": true + }, + { + "target": "ball_status_indicator_player.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000212.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000215.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000218.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000243.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000249.json", + "compressed": true + }, + { + "target": "battle_subscreen_cursor_corner.json", + "compressed": true + }, + { + "target": "healthbox_safari.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000258.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000275.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000276.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000277.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000278.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000279.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000280.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000281.json", + "compressed": true + }, + { + "target": "pl_batt_obj_00000282.json", + "compressed": true + }, + { + "target": "poke_ball_throw.json", + "compressed": true + }, + { + "target": "master_ball_throw.json", + "compressed": true + }, + { + "target": "ultra_ball_throw.json", + "compressed": true + }, + { + "target": "great_ball_throw.json", + "compressed": true + }, + { + "target": "safari_ball_throw.json", + "compressed": true + }, + { + "target": "net_ball_throw.json", + "compressed": true + }, + { + "target": "dive_ball_throw.json", + "compressed": true + }, + { + "target": "nest_ball_throw.json", + "compressed": true + }, + { + "target": "repeat_ball_throw.json", + "compressed": true + }, + { + "target": "timer_ball_throw.json", + "compressed": true + }, + { + "target": "luxury_ball_throw.json", + "compressed": true + }, + { + "target": "premier_ball_throw.json", + "compressed": true + }, + { + "target": "quick_ball_throw.json", + "compressed": true + }, + { + "target": "dusk_ball_throw.json", + "compressed": true + }, + { + "target": "heal_ball_throw.json", + "compressed": true + }, + { + "target": "cherish_ball_throw.json", + "compressed": true + }, + { + "target": "park_ball_throw.json", + "compressed": true + }, + { + "target": "bait_throw.json", + "compressed": true + }, + { + "target": "mud_throw.json", + "compressed": true + }, + { + "target": "party_gauge.json", + "compressed": true + } +] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json new file mode 100644 index 0000000000..68950170bb --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 2, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json new file mode 100644 index 0000000000..68950170bb --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 2, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/meson.build b/res/battle/graphic/pl_batt_obj/anims/meson.build new file mode 100644 index 0000000000..3efae666a0 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/meson.build @@ -0,0 +1,75 @@ +pl_batt_obj_anims = files( + 'pl_batt_obj_00000078.json', + 'pl_batt_obj_00000114.json', + 'pl_batt_obj_00000115.json', + 'pl_batt_obj_00000118.json', + 'pl_batt_obj_00000123.json', + 'pl_batt_obj_00000126.json', + 'battle_terrain_player.json', + 'battle_terrain_opponent.json', + 'pl_batt_obj_00000177.json', + 'pl_batt_obj_00000180.json', + 'pl_batt_obj_00000183.json', + 'healthbox_singles_opponent.json', + 'healthbox_singles_player.json', + 'healthbox_doubles_opponent_1.json', + 'healthbox_doubles_opponent_2.json', + 'healthbox_doubles_player_1.json', + 'healthbox_doubles_player_2.json', + 'ball_status_indicator_opponent.json', + 'ball_status_indicator_player.json', + 'pl_batt_obj_00000212.json', + 'pl_batt_obj_00000215.json', + 'pl_batt_obj_00000218.json', + 'pl_batt_obj_00000243.json', + 'pl_batt_obj_00000249.json', + 'battle_subscreen_cursor_corner.json', + 'healthbox_safari.json', + 'pl_batt_obj_00000258.json', + 'pl_batt_obj_00000275.json', + 'pl_batt_obj_00000276.json', + 'pl_batt_obj_00000277.json', + 'pl_batt_obj_00000278.json', + 'pl_batt_obj_00000279.json', + 'pl_batt_obj_00000280.json', + 'pl_batt_obj_00000281.json', + 'pl_batt_obj_00000282.json', + 'poke_ball_throw.json', + 'master_ball_throw.json', + 'ultra_ball_throw.json', + 'great_ball_throw.json', + 'safari_ball_throw.json', + 'net_ball_throw.json', + 'dive_ball_throw.json', + 'nest_ball_throw.json', + 'repeat_ball_throw.json', + 'timer_ball_throw.json', + 'luxury_ball_throw.json', + 'premier_ball_throw.json', + 'quick_ball_throw.json', + 'dusk_ball_throw.json', + 'heal_ball_throw.json', + 'cherish_ball_throw.json', + 'park_ball_throw.json', + 'bait_throw.json', + 'mud_throw.json', + 'party_gauge.json' +) + +pl_batt_obj_anims_data = files('data.json') + +pl_batt_obj_nanr = [] +foreach infile : pl_batt_obj_anims + pl_batt_obj_nanr += custom_target( + input: [infile, pl_batt_obj_anims_data], + output: '@BASENAME0@.NANR', + command: [ + make_pl_batt_obj_anims_py, + '--nitrogfx', nitrogfx_exe.full_path(), + '--input', '@INPUT0@', + '--output', '@OUTPUT@', + '--datafile', '@INPUT1@', + '--private-dir', '@PRIVATE_DIR@' + ] + ) +endforeach \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/mud_throw.json b/res/battle/graphic/pl_batt_obj/anims/mud_throw.json new file mode 100644 index 0000000000..224cde5e92 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/mud_throw.json @@ -0,0 +1,76 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 8, + "resultCount": 7, + "sequences": [{ + "frameCount": 4, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }] + }, { + "frameCount": 4, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 6, + "resultId": 0 + }, { + "frameDelay": 6, + "resultId": 4 + }, { + "frameDelay": 6, + "resultId": 5 + }, { + "frameDelay": 50, + "resultId": 6 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": true, + "index": 6 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/party_gauge.json b/res/battle/graphic/pl_batt_obj/anims/party_gauge.json new file mode 100644 index 0000000000..90b61e0e8b --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/party_gauge.json @@ -0,0 +1,334 @@ +{ + "labelEnabled": true, + "sequenceCount": 9, + "frameCount": 51, + "resultCount": 27, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 1, + "resultId": 1 + }, { + "frameDelay": 1, + "resultId": 2 + }, { + "frameDelay": 1, + "resultId": 3 + }, { + "frameDelay": 1, + "resultId": 4 + }, { + "frameDelay": 1, + "resultId": 5 + }, { + "frameDelay": 1, + "resultId": 6 + }, { + "frameDelay": 1, + "resultId": 7 + }] + }, { + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 8 + }, { + "frameDelay": 1, + "resultId": 9 + }, { + "frameDelay": 1, + "resultId": 10 + }, { + "frameDelay": 1, + "resultId": 11 + }, { + "frameDelay": 1, + "resultId": 12 + }, { + "frameDelay": 1, + "resultId": 13 + }, { + "frameDelay": 1, + "resultId": 14 + }, { + "frameDelay": 1, + "resultId": 15 + }] + }, { + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 16 + }, { + "frameDelay": 1, + "resultId": 17 + }, { + "frameDelay": 1, + "resultId": 18 + }, { + "frameDelay": 1, + "resultId": 19 + }, { + "frameDelay": 1, + "resultId": 20 + }, { + "frameDelay": 1, + "resultId": 21 + }, { + "frameDelay": 1, + "resultId": 22 + }, { + "frameDelay": 1, + "resultId": 23 + }] + }, { + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 1, + "resultId": 7 + }, { + "frameDelay": 1, + "resultId": 6 + }, { + "frameDelay": 1, + "resultId": 5 + }, { + "frameDelay": 1, + "resultId": 4 + }, { + "frameDelay": 1, + "resultId": 3 + }, { + "frameDelay": 1, + "resultId": 2 + }, { + "frameDelay": 1, + "resultId": 1 + }] + }, { + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 8 + }, { + "frameDelay": 1, + "resultId": 15 + }, { + "frameDelay": 1, + "resultId": 14 + }, { + "frameDelay": 1, + "resultId": 13 + }, { + "frameDelay": 1, + "resultId": 12 + }, { + "frameDelay": 1, + "resultId": 11 + }, { + "frameDelay": 1, + "resultId": 10 + }, { + "frameDelay": 1, + "resultId": 9 + }] + }, { + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 16 + }, { + "frameDelay": 1, + "resultId": 23 + }, { + "frameDelay": 1, + "resultId": 22 + }, { + "frameDelay": 1, + "resultId": 21 + }, { + "frameDelay": 1, + "resultId": 20 + }, { + "frameDelay": 1, + "resultId": 19 + }, { + "frameDelay": 1, + "resultId": 18 + }, { + "frameDelay": 1, + "resultId": 17 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 24 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 25 + }] + }, { + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 26 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 15 + }, { + "dataType": 0, + "padded": false, + "index": 14 + }, { + "dataType": 0, + "padded": false, + "index": 13 + }, { + "dataType": 0, + "padded": false, + "index": 12 + }, { + "dataType": 0, + "padded": false, + "index": 11 + }, { + "dataType": 0, + "padded": false, + "index": 10 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }, { + "dataType": 0, + "padded": false, + "index": 16 + }, { + "dataType": 0, + "padded": false, + "index": 23 + }, { + "dataType": 0, + "padded": false, + "index": 22 + }, { + "dataType": 0, + "padded": false, + "index": 21 + }, { + "dataType": 0, + "padded": false, + "index": 20 + }, { + "dataType": 0, + "padded": false, + "index": 19 + }, { + "dataType": 0, + "padded": false, + "index": 18 + }, { + "dataType": 0, + "padded": false, + "index": 17 + }, { + "dataType": 0, + "padded": true, + "index": 24 + }, { + "dataType": 0, + "padded": true, + "index": 25 + }, { + "dataType": 0, + "padded": true, + "index": 26 + }], + "labels": ["CellAnime8", "CellAnime7", "CellAnime6", "CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5"], + "labelCount": 9 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json new file mode 100644 index 0000000000..e7c70429ca --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 16, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 6, + "resultId": 3 + }, { + "frameDelay": 6, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json new file mode 100644 index 0000000000..0c3121757c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json @@ -0,0 +1,59 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 6, + "resultCount": 6, + "sequences": [{ + "frameCount": 6, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 0, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 16, + "resultId": 4 + }, { + "frameDelay": 6, + "resultId": 5 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000243.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000243.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000243.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json new file mode 100644 index 0000000000..a2c2d179c9 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000258.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000258.json new file mode 100644 index 0000000000..c3f7f3178a --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000258.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "resultCount": 1, + "sequences": [{ + "frameCount": 1, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": true, + "index": 0 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json new file mode 100644 index 0000000000..bbf6da54ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 9, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 30, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json new file mode 100644 index 0000000000..bbf6da54ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 9, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 30, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json new file mode 100644 index 0000000000..bbf6da54ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 9, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 30, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json new file mode 100644 index 0000000000..bbf6da54ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 9, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 30, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json new file mode 100644 index 0000000000..bbf6da54ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 9, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 30, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json new file mode 100644 index 0000000000..bbf6da54ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 9, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 30, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json new file mode 100644 index 0000000000..bbf6da54ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 9, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 30, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json new file mode 100644 index 0000000000..bbf6da54ff --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json @@ -0,0 +1,52 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 5, + "resultCount": 5, + "sequences": [{ + "frameCount": 5, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 9, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 30, + "resultId": 4 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": true, + "index": 4 + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json new file mode 100644 index 0000000000..68950170bb --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 2, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json new file mode 100644 index 0000000000..7b0b234c7c --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 11, + "resultCount": 10, + "sequences": [{ + "frameCount": 8, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }] + }, { + "frameCount": 3, + "unk02": 0, + "dataType": 0, + "unk06": 1, + "unk08": 1, + "frameData": [{ + "frameDelay": 10, + "resultId": 0 + }, { + "frameDelay": 10, + "resultId": 8 + }, { + "frameDelay": 50, + "resultId": 9 + }] + }], + "animationResults": [{ + "dataType": 0, + "padded": false, + "index": 0 + }, { + "dataType": 0, + "padded": false, + "index": 1 + }, { + "dataType": 0, + "padded": false, + "index": 2 + }, { + "dataType": 0, + "padded": false, + "index": 3 + }, { + "dataType": 0, + "padded": false, + "index": 4 + }, { + "dataType": 0, + "padded": false, + "index": 5 + }, { + "dataType": 0, + "padded": false, + "index": 6 + }, { + "dataType": 0, + "padded": false, + "index": 7 + }, { + "dataType": 0, + "padded": false, + "index": 8 + }, { + "dataType": 0, + "padded": false, + "index": 9 + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index 7fed645f85..6582647535 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -1,7 +1,7 @@ -subdir('prebuilt') subdir('palettes') subdir('sprites') subdir('cells') +subdir('anims') pl_batt_order = files('order.txt') @@ -10,7 +10,7 @@ nitrofs_files += custom_target('pl_batt_obj.narc', input: [ pl_batt_order, pl_batt_obj_nclr, - pl_batt_obj_built, + pl_batt_obj_nanr, pl_batt_obj_ncgr, pl_batt_obj_ncer ], diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/bait_throw.NANR deleted file mode 100644 index 610a4b8aeda1cdee578c64144a816b50a0e09176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmWIYbM*WFkAZO$0|SEq12coSpOa$&kj=!v${+!xEr2)yh+%*Q%wPn{LjWTZUjZt{ z#PEI}NFGFk)Pra?C=F6#1LQL>fXrZK@NshVQ3DAA0XGmkr{?51=4Ixl8X%a43?UJ& Kp*&zU3=9CLJQ(W$ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_opponent.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_opponent.NANR deleted file mode 100644 index 2ea3db82778bd35fc441fee413c134dab541f83d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmWIYbM*WFkAd+60|SEq12coSpOfPRAe#jUC4h7U5LW;(3^0Njj0{Xr0c1W0Pz;$b zfW`-z2Ldb%@At7lX^?_)SMj0 ayv*EG0|e6$!8AfJjTu5BTth+Tg8%^5{3Wme diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/ball_status_indicator_player.NANR deleted file mode 100644 index 2ea3db82778bd35fc441fee413c134dab541f83d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmWIYbM*WFkAd+60|SEq12coSpOfPRAe#jUC4h7U5LW;(3^0Njj0{Xr0c1W0Pz;$b zfW`-z2Ldb%@At7lX^?_)SMj0 ayv*EG0|e6$!8AfJjTu5BTth+Tg8%^5{3Wme diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/battle_subscreen_cursor_corner.NANR deleted file mode 100644 index 3886912219ee8642805dc8b571c4b84bb5cab206..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmZ9IF$%&!5JhJKW0M04h-+V zzpxu}%}wqssgELxD4|bAFT0 zW8u>CM0_huJwJ+Hg#7({U+0933e(gM!?eyiB|TG-`@1IVwDe4FncN1_GZp>^Q{(iU kne)DVfF|G!yTIf^eP8@d&T`&91u0iAzZ_5c6? diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_opponent.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/battle_terrain_opponent.NANR deleted file mode 100644 index 862d5d2b22f12ae2cb0ecde6cac694cbe97e918a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmWIYbM*WFkAX3tfq_AQftkVE&&kmS$YumW2_UTj#0EeN1B_q>BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdI2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/data.json b/res/battle/graphic/pl_batt_obj/prebuilt/data.json deleted file mode 100644 index 87574e3113..0000000000 --- a/res/battle/graphic/pl_batt_obj/prebuilt/data.json +++ /dev/null @@ -1,442 +0,0 @@ -[ - { - "target": "pl_batt_obj_00000077.NCER", - "compressed": false - }, - { - "target": "pl_batt_obj_00000078.NANR", - "compressed": false - }, - { - "target": "pl_batt_obj_00000113.NCER", - "compressed": false - }, - { - "target": "pl_batt_obj_00000114.NANR", - "compressed": false - }, - { - "target": "pl_batt_obj_00000115.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000116.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000118.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000119.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000122.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000123.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000125.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000126.NANR", - "compressed": true - }, - { - "target": "battle_terrain_player.NCER", - "compressed": true - }, - { - "target": "battle_terrain_player.NANR", - "compressed": true - }, - { - "target": "battle_terrain_opponent.NCER", - "compressed": true - }, - { - "target": "battle_terrain_opponent.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000177.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000178.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000180.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000181.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000183.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000184.NCER", - "compressed": true - }, - { - "target": "healthbox_singles_opponent.NANR", - "compressed": true - }, - { - "target": "healthbox_singles_opponent.NCER", - "compressed": true - }, - { - "target": "healthbox_singles_player.NANR", - "compressed": true - }, - { - "target": "healthbox_singles_player.NCER", - "compressed": true - }, - { - "target": "healthbox_doubles_opponent_1.NANR", - "compressed": true - }, - { - "target": "healthbox_doubles_opponent_1.NCER", - "compressed": true - }, - { - "target": "healthbox_doubles_opponent_2.NANR", - "compressed": true - }, - { - "target": "healthbox_doubles_opponent_2.NCER", - "compressed": true - }, - { - "target": "healthbox_doubles_player_1.NANR", - "compressed": true - }, - { - "target": "healthbox_doubles_player_1.NCER", - "compressed": true - }, - { - "target": "healthbox_doubles_player_2.NANR", - "compressed": true - }, - { - "target": "healthbox_doubles_player_2.NCER", - "compressed": true - }, - { - "target": "ball_status_indicator_opponent.NCER", - "compressed": true - }, - { - "target": "ball_status_indicator_opponent.NANR", - "compressed": true - }, - { - "target": "ball_status_indicator_player.NCER", - "compressed": true - }, - { - "target": "ball_status_indicator_player.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000210.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000212.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000213.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000215.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000216.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000218.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000242.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000243.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000248.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000249.NANR", - "compressed": true - }, - { - "target": "battle_subscreen_cursor_corner.NCER", - "compressed": true - }, - { - "target": "battle_subscreen_cursor_corner.NANR", - "compressed": true - }, - { - "target": "healthbox_safari.NCER", - "compressed": true - }, - { - "target": "healthbox_safari.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000257.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000258.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000267.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000268.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000269.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000270.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000271.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000272.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000273.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000274.NCER", - "compressed": true - }, - { - "target": "pl_batt_obj_00000275.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000276.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000277.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000278.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000279.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000280.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000281.NANR", - "compressed": true - }, - { - "target": "pl_batt_obj_00000282.NANR", - "compressed": true - }, - { - "target": "poke_ball_throw.NANR", - "compressed": true - }, - { - "target": "poke_ball_throw.NCER", - "compressed": true - }, - { - "target": "master_ball_throw.NANR", - "compressed": true - }, - { - "target": "master_ball_throw.NCER", - "compressed": true - }, - { - "target": "ultra_ball_throw.NANR", - "compressed": true - }, - { - "target": "ultra_ball_throw.NCER", - "compressed": true - }, - { - "target": "great_ball_throw.NANR", - "compressed": true - }, - { - "target": "great_ball_throw.NCER", - "compressed": true - }, - { - "target": "safari_ball_throw.NANR", - "compressed": true - }, - { - "target": "safari_ball_throw.NCER", - "compressed": true - }, - { - "target": "net_ball_throw.NANR", - "compressed": true - }, - { - "target": "net_ball_throw.NCER", - "compressed": true - }, - { - "target": "dive_ball_throw.NANR", - "compressed": true - }, - { - "target": "dive_ball_throw.NCER", - "compressed": true - }, - { - "target": "nest_ball_throw.NANR", - "compressed": true - }, - { - "target": "nest_ball_throw.NCER", - "compressed": true - }, - { - "target": "repeat_ball_throw.NANR", - "compressed": true - }, - { - "target": "repeat_ball_throw.NCER", - "compressed": true - }, - { - "target": "timer_ball_throw.NANR", - "compressed": true - }, - { - "target": "timer_ball_throw.NCER", - "compressed": true - }, - { - "target": "luxury_ball_throw.NANR", - "compressed": true - }, - { - "target": "luxury_ball_throw.NCER", - "compressed": true - }, - { - "target": "premier_ball_throw.NANR", - "compressed": true - }, - { - "target": "premier_ball_throw.NCER", - "compressed": true - }, - { - "target": "quick_ball_throw.NANR", - "compressed": true - }, - { - "target": "quick_ball_throw.NCER", - "compressed": true - }, - { - "target": "dusk_ball_throw.NANR", - "compressed": true - }, - { - "target": "dusk_ball_throw.NCER", - "compressed": true - }, - { - "target": "heal_ball_throw.NANR", - "compressed": true - }, - { - "target": "heal_ball_throw.NCER", - "compressed": true - }, - { - "target": "cherish_ball_throw.NANR", - "compressed": true - }, - { - "target": "cherish_ball_throw.NCER", - "compressed": true - }, - { - "target": "park_ball_throw.NANR", - "compressed": true - }, - { - "target": "park_ball_throw.NCER", - "compressed": true - }, - { - "target": "bait_throw.NANR", - "compressed": true - }, - { - "target": "bait_throw.NCER", - "compressed": true - }, - { - "target": "mud_throw.NANR", - "compressed": true - }, - { - "target": "mud_throw.NCER", - "compressed": true - }, - { - "target": "party_gauge.NCER", - "compressed": true - }, - { - "target": "party_gauge.NANR", - "compressed": true - } -] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/dive_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/dive_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/dusk_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/dusk_ball_throw.NANR deleted file mode 100644 index 8c57632fc1563bc2923ef7bcba719b7a4a666df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2g%?71G`a$AcP?`ry^Fe7K#lQuW7l6`2K-vh%XJ7!?$;`mQz{Y)nM7V~6YyklPmqH{{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/great_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/great_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/heal_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/heal_ball_throw.NANR deleted file mode 100644 index 8c57632fc1563bc2923ef7bcba719b7a4a666df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2g%?71G`a$AcP?`ry^Fe7K#lQuW7l6`2K-vh%XJ7!?$;`mQz{Y)nM7V~6YyklPmqH{{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_1.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/healthbox_doubles_opponent_1.NANR deleted file mode 100644 index a066aec11a353f778d21c772579e731d195ed1d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmWIYbM*WFkAX3tfq_AQftkVE&&kmS$YumW2_UTj#0EeN1B_q>BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdI2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/master_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/master_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/meson.build b/res/battle/graphic/pl_batt_obj/prebuilt/meson.build deleted file mode 100644 index 7d223cf4a1..0000000000 --- a/res/battle/graphic/pl_batt_obj/prebuilt/meson.build +++ /dev/null @@ -1,75 +0,0 @@ -pl_batt_obj_nanr = files( - 'pl_batt_obj_00000078.NANR', - 'pl_batt_obj_00000114.NANR', - 'pl_batt_obj_00000115.NANR', - 'pl_batt_obj_00000118.NANR', - 'pl_batt_obj_00000123.NANR', - 'pl_batt_obj_00000126.NANR', - 'battle_terrain_player.NANR', - 'battle_terrain_opponent.NANR', - 'pl_batt_obj_00000177.NANR', - 'pl_batt_obj_00000180.NANR', - 'pl_batt_obj_00000183.NANR', - 'healthbox_singles_opponent.NANR', - 'healthbox_singles_player.NANR', - 'healthbox_doubles_opponent_1.NANR', - 'healthbox_doubles_opponent_2.NANR', - 'healthbox_doubles_player_1.NANR', - 'healthbox_doubles_player_2.NANR', - 'ball_status_indicator_opponent.NANR', - 'ball_status_indicator_player.NANR', - 'pl_batt_obj_00000212.NANR', - 'pl_batt_obj_00000215.NANR', - 'pl_batt_obj_00000218.NANR', - 'pl_batt_obj_00000243.NANR', - 'pl_batt_obj_00000249.NANR', - 'battle_subscreen_cursor_corner.NANR', - 'healthbox_safari.NANR', - 'pl_batt_obj_00000258.NANR', - 'pl_batt_obj_00000275.NANR', - 'pl_batt_obj_00000276.NANR', - 'pl_batt_obj_00000277.NANR', - 'pl_batt_obj_00000278.NANR', - 'pl_batt_obj_00000279.NANR', - 'pl_batt_obj_00000280.NANR', - 'pl_batt_obj_00000281.NANR', - 'pl_batt_obj_00000282.NANR', - 'poke_ball_throw.NANR', - 'master_ball_throw.NANR', - 'ultra_ball_throw.NANR', - 'great_ball_throw.NANR', - 'safari_ball_throw.NANR', - 'net_ball_throw.NANR', - 'dive_ball_throw.NANR', - 'nest_ball_throw.NANR', - 'repeat_ball_throw.NANR', - 'timer_ball_throw.NANR', - 'luxury_ball_throw.NANR', - 'premier_ball_throw.NANR', - 'quick_ball_throw.NANR', - 'dusk_ball_throw.NANR', - 'heal_ball_throw.NANR', - 'cherish_ball_throw.NANR', - 'park_ball_throw.NANR', - 'bait_throw.NANR', - 'mud_throw.NANR', - 'party_gauge.NANR' -) - -pl_batt_obj_prebuilts_data = files('data.json') - -pl_batt_obj_built = [] -foreach infile : pl_batt_obj_nanr - pl_batt_obj_built += custom_target( - input: [infile, pl_batt_obj_prebuilts_data], - output: '@BASENAME0@.NANR', - command: [ - make_pl_batt_obj_prebuilts_py, - '--nitrogfx', nitrogfx_exe.full_path(), - '--input', '@INPUT0@', - '--output', '@OUTPUT@', - '--datafile', '@INPUT1@', - '--private-dir', '@PRIVATE_DIR@' - ] - ) -endforeach \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/mud_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/mud_throw.NANR deleted file mode 100644 index f973a076d885590cbdbd7f59297a163ba7a287d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmWIYbM*WFkAd+L0|SEq12coSpOfPRAe)JSgFymFTL5td5W@fqn865?hX5F#5y(}5 ziZL;~-v^Qh(I9yc%?71GO4xvW4k*n9rFnp~5m20g0c18a0}BHyP~Dj`K2DB4YCt&< d;09vn)SMj0yv*EG0|e8MAtb^z6l4Mj005@yARGVy diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/nest_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/nest_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/net_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/net_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/park_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/park_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/party_gauge.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/party_gauge.NANR deleted file mode 100644 index ed9257d8de88176c5f0c26bd642f4568f8a58697..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 815 zcmZ9KK~BOz7=>Rgq5@(?L?y;AIFR_Yjl3x{hYC2EE*$Y$yhd4jP4t_ z=c~qTwG@L@6$B4jlcr3nCD!`vl8%Jte}Wx6p%-brz^q+Dp*GuYbarrXKg&* zVpUnaZrpq0K5pb$&igLQd26w{tXo!}bu}0cBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIkj==z${+!xHGnt(h+%*g%wS|-f(Za=0fzVc zKztS;%>ty^fHWJF=77>56PbYKvoM@F_xnJ6 z7KZoxSfDgW9f;2Xqy>O97m#KH(jb$WfcCI3url~KIr@kL#X-P1H7Cb0FEcmQfFUHp KHIxS;$^Zbpt`>^` diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000212.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000212.NANR deleted file mode 100644 index a066aec11a353f778d21c772579e731d195ed1d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmWIYbM*WFkAX3tfq_AQftkVE&&kmS$YumW2_UTj#0EeN1B_q>BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIBLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdI%tc|Ir~NHK5$BLfpm07$biyx+&b gaORAUlcSF~RNOf=C&w`_GdIkj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000276.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000276.NANR deleted file mode 100644 index dbf426d4c77f62991d6d0e62628d278d9786b56f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000277.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000277.NANR deleted file mode 100644 index dbf426d4c77f62991d6d0e62628d278d9786b56f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000278.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000278.NANR deleted file mode 100644 index dbf426d4c77f62991d6d0e62628d278d9786b56f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000279.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000279.NANR deleted file mode 100644 index dbf426d4c77f62991d6d0e62628d278d9786b56f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000280.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000280.NANR deleted file mode 100644 index dbf426d4c77f62991d6d0e62628d278d9786b56f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000281.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000281.NANR deleted file mode 100644 index dbf426d4c77f62991d6d0e62628d278d9786b56f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000282.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/pl_batt_obj_00000282.NANR deleted file mode 100644 index dbf426d4c77f62991d6d0e62628d278d9786b56f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmWIYbM*WFkAZPI0|SEq12coSpOa$>kj==z${+!xHGnt(h+%*g%wPn{BLE}A`+ZD6 zE+>#?0n#i$nhi>G0BJcOA7mmE(0mq#GiQ999DT%r;vnFhnv>(0mzkStzz`DQ8p;C^ GWdHyqixye{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/poke_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/premier_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/premier_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/quick_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/quick_ball_throw.NANR deleted file mode 100644 index 8c57632fc1563bc2923ef7bcba719b7a4a666df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2g%?71G`a$AcP?`ry^Fe7K#lQuW7l6`2K-vh%XJ7!?$;`mQz{Y)nM7V~6YyklPmqH{{ diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/repeat_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/repeat_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/safari_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/safari_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/timer_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/timer_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/res/battle/graphic/pl_batt_obj/prebuilt/ultra_ball_throw.NANR b/res/battle/graphic/pl_batt_obj/prebuilt/ultra_ball_throw.NANR deleted file mode 100644 index 891de6dba49d650acfa95e806377e1f7f8ba8cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmWIYbM*WFkAd+W0|SEq12coSpOfPnAe)JSn?V9dTLAF{Acg@BFoO{&4*|?jJ|mEJ zfCvHQ-tPm+gJ>2Y%?6~|pnQ;ikT@5V=7GxdLHR(6feR=v0HuY1v=NZczyPw7nSq6Y t6=)ti0|x^qgO8J=j~Yk=5O4#rb81eGV_s%%ssVy&$Pg0Y8Va%n1OS^7BwGLg diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py similarity index 68% rename from tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py rename to tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py index 4a31b10f64..d31785c264 100644 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_prebuilts.py +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py @@ -8,18 +8,18 @@ import compress argparser = argparse.ArgumentParser( - prog='pl_batt_obj.narc prebuilt file fixer', - description='Copies prebuilt files to NARC build directory and compresses if required.' + prog='pl_batt_obj.narc cell builder and compressor', + description='Builds NANR anim files and compresses if requested.' ) argparser.add_argument('--nitrogfx', required=True, help='Path to nitrogfx executable') argparser.add_argument('--input', required=True, - help='Input file to make adjustments to.') + help='Input NCLR file to make adjustments to.') argparser.add_argument('--output', required=True, - help='Output file to write to.') + help='Output NCLR file to write to.') argparser.add_argument('--private-dir', required=True, help='Path to the private directory (where binaries will be made)') @@ -48,14 +48,17 @@ file_props = props if file_props == None: - raise Exception(f"Input prebuilt file {input_file.name} is not listed in data map {args.datafile}") + raise Exception(f"Input anim file {input_file.name} is not listed in data map {args.datafile}") -tmp_file = input_file +tmp_file = dest_dir / output_file.name + +ngfx_args = [args.nitrogfx, input_file, tmp_file, "-newparser"] +subprocess.run(ngfx_args) if 'compressed' in file_props and file_props['compressed'] == True: - tmp_file = dest_dir / output_file.with_suffix(".lz").name - with open(input_file, mode="rb") as f: - with open(tmp_file, mode="wb") as f2: + with open(tmp_file, mode="rb") as f: + with open(tmp_file.with_suffix(".lz"), mode="wb") as f2: compress.compress(f.read(), f2) + tmp_file = tmp_file.with_suffix(".lz") -shutil.copy(tmp_file, output_file.with_suffix(input_file.suffix.lower())) \ No newline at end of file +shutil.copy(tmp_file, output_file.with_suffix(".nanr")) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/meson.build b/tools/scripts/pl_batt_obj/meson.build index a170f4762d..f103a910ff 100644 --- a/tools/scripts/pl_batt_obj/meson.build +++ b/tools/scripts/pl_batt_obj/meson.build @@ -1,4 +1,4 @@ make_pl_batt_obj_palettes_py = find_program('make_pl_batt_obj_palettes.py', native: true) -make_pl_batt_obj_prebuilts_py = find_program('make_pl_batt_obj_prebuilts.py', native: true) make_pl_batt_obj_sprites_py = find_program('make_pl_batt_obj_sprites.py', native: true) -make_pl_batt_obj_cells_py = find_program('make_pl_batt_obj_cells.py', native: true) \ No newline at end of file +make_pl_batt_obj_cells_py = find_program('make_pl_batt_obj_cells.py', native: true) +make_pl_batt_obj_anims_py = find_program('make_pl_batt_obj_anims.py', native: true) \ No newline at end of file From c43f29421387de439f2fb7e67303fbf429b0b485 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Fri, 18 Oct 2024 13:45:02 -0500 Subject: [PATCH 19/26] rename back sprites for players, update levelup background with naix members --- ...j_00000258.json => bg_party_level_up.json} | 0 .../graphic/pl_batt_obj/anims/data.json | 2 +- .../graphic/pl_batt_obj/anims/meson.build | 2 +- ...j_00000257.json => bg_party_level_up.json} | 0 .../graphic/pl_batt_obj/cells/data.json | 2 +- .../graphic/pl_batt_obj/cells/meson.build | 2 +- res/battle/graphic/pl_batt_obj/order.txt | 40 ++++++++--------- ...obj_00000082.pal => bg_party_level_up.pal} | 0 .../graphic/pl_batt_obj/palettes/data.json | 18 ++++---- .../graphic/pl_batt_obj/palettes/meson.build | 18 ++++---- ...obj_00000085.pal => player_barry_back.pal} | 0 ..._obj_00000089.pal => player_buck_back.pal} | 0 ...bj_00000086.pal => player_cheryl_back.pal} | 0 ..._obj_00000084.pal => player_dawn_back.pal} | 0 ...obj_00000083.pal => player_lucas_back.pal} | 0 ...bj_00000088.pal => player_marley_back.pal} | 0 ..._obj_00000090.pal => player_mira_back.pal} | 0 ...obj_00000087.pal => player_riley_back.pal} | 0 .../pl_batt_obj/sprites/bg_party_level_up.png | Bin 0 -> 253 bytes .../graphic/pl_batt_obj/sprites/data.json | 42 +++++++++++------- .../graphic/pl_batt_obj/sprites/meson.build | 18 ++++---- .../sprites/pl_batt_obj_00000256.png | Bin 263 -> 0 bytes .../sprites/pl_batt_obj_00000259.png | Bin 4397 -> 0 bytes .../sprites/pl_batt_obj_00000260.png | Bin 4222 -> 0 bytes .../sprites/pl_batt_obj_00000261.png | Bin 3944 -> 0 bytes .../sprites/pl_batt_obj_00000262.png | Bin 4456 -> 0 bytes .../sprites/pl_batt_obj_00000263.png | Bin 4360 -> 0 bytes .../sprites/pl_batt_obj_00000264.png | Bin 3861 -> 0 bytes .../sprites/pl_batt_obj_00000265.png | Bin 3449 -> 0 bytes .../sprites/pl_batt_obj_00000266.png | Bin 3652 -> 0 bytes .../pl_batt_obj/sprites/player_barry_back.png | Bin 0 -> 3525 bytes .../pl_batt_obj/sprites/player_buck_back.png | Bin 0 -> 3046 bytes .../sprites/player_cheryl_back.png | Bin 0 -> 4029 bytes .../pl_batt_obj/sprites/player_dawn_back.png | Bin 0 -> 3830 bytes .../pl_batt_obj/sprites/player_lucas_back.png | Bin 0 -> 3850 bytes .../sprites/player_marley_back.png | Bin 0 -> 3479 bytes .../pl_batt_obj/sprites/player_mira_back.png | Bin 0 -> 3244 bytes .../pl_batt_obj/sprites/player_riley_back.png | Bin 0 -> 3768 bytes src/battle/battle_script.c | 9 ++-- src/battle/ov16_02268520.c | 2 +- .../pl_batt_obj/make_pl_batt_obj_sprites.py | 3 ++ 41 files changed, 85 insertions(+), 73 deletions(-) rename res/battle/graphic/pl_batt_obj/anims/{pl_batt_obj_00000258.json => bg_party_level_up.json} (100%) rename res/battle/graphic/pl_batt_obj/cells/{pl_batt_obj_00000257.json => bg_party_level_up.json} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000082.pal => bg_party_level_up.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000085.pal => player_barry_back.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000089.pal => player_buck_back.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000086.pal => player_cheryl_back.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000084.pal => player_dawn_back.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000083.pal => player_lucas_back.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000088.pal => player_marley_back.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000090.pal => player_mira_back.pal} (100%) rename res/battle/graphic/pl_batt_obj/palettes/{pl_batt_obj_00000087.pal => player_riley_back.pal} (100%) create mode 100644 res/battle/graphic/pl_batt_obj/sprites/bg_party_level_up.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000256.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000259.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000260.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000261.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000262.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000263.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000264.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000265.png delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000266.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/player_barry_back.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/player_buck_back.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/player_cheryl_back.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/player_dawn_back.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/player_lucas_back.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/player_marley_back.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/player_mira_back.png create mode 100644 res/battle/graphic/pl_batt_obj/sprites/player_riley_back.png diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000258.json b/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000258.json rename to res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json diff --git a/res/battle/graphic/pl_batt_obj/anims/data.json b/res/battle/graphic/pl_batt_obj/anims/data.json index 1bf322731d..11591f6e14 100644 --- a/res/battle/graphic/pl_batt_obj/anims/data.json +++ b/res/battle/graphic/pl_batt_obj/anims/data.json @@ -104,7 +104,7 @@ "compressed": true }, { - "target": "pl_batt_obj_00000258.json", + "target": "bg_party_level_up.json", "compressed": true }, { diff --git a/res/battle/graphic/pl_batt_obj/anims/meson.build b/res/battle/graphic/pl_batt_obj/anims/meson.build index 3efae666a0..56328f4a88 100644 --- a/res/battle/graphic/pl_batt_obj/anims/meson.build +++ b/res/battle/graphic/pl_batt_obj/anims/meson.build @@ -25,7 +25,7 @@ pl_batt_obj_anims = files( 'pl_batt_obj_00000249.json', 'battle_subscreen_cursor_corner.json', 'healthbox_safari.json', - 'pl_batt_obj_00000258.json', + 'bg_party_level_up.json', 'pl_batt_obj_00000275.json', 'pl_batt_obj_00000276.json', 'pl_batt_obj_00000277.json', diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000257.json b/res/battle/graphic/pl_batt_obj/cells/bg_party_level_up.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000257.json rename to res/battle/graphic/pl_batt_obj/cells/bg_party_level_up.json diff --git a/res/battle/graphic/pl_batt_obj/cells/data.json b/res/battle/graphic/pl_batt_obj/cells/data.json index 25cdb301ca..8d59b70b14 100644 --- a/res/battle/graphic/pl_batt_obj/cells/data.json +++ b/res/battle/graphic/pl_batt_obj/cells/data.json @@ -104,7 +104,7 @@ "compressed": true }, { - "target": "pl_batt_obj_00000257.json", + "target": "bg_party_level_up.json", "compressed": true }, { diff --git a/res/battle/graphic/pl_batt_obj/cells/meson.build b/res/battle/graphic/pl_batt_obj/cells/meson.build index 2d948a00db..56b3b19585 100644 --- a/res/battle/graphic/pl_batt_obj/cells/meson.build +++ b/res/battle/graphic/pl_batt_obj/cells/meson.build @@ -53,7 +53,7 @@ pl_batt_obj_cells = files( 'healthbox_doubles_player_2.json', 'pl_batt_obj_00000242.json', 'healthbox_safari.json', - 'pl_batt_obj_00000257.json' + 'bg_party_level_up.json' ) pl_batt_obj_cells_data = files('data.json') diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/order.txt index 9da6155caf..5ac150b00b 100644 --- a/res/battle/graphic/pl_batt_obj/order.txt +++ b/res/battle/graphic/pl_batt_obj/order.txt @@ -80,15 +80,15 @@ pl_batt_obj_00000078.nanr pl_batt_obj_00000079.nclr battle_subscreen_cursor_corner.nclr healthbox_safari.nclr -pl_batt_obj_00000082.nclr -pl_batt_obj_00000083.nclr -pl_batt_obj_00000084.nclr -pl_batt_obj_00000085.nclr -pl_batt_obj_00000086.nclr -pl_batt_obj_00000087.nclr -pl_batt_obj_00000088.nclr -pl_batt_obj_00000089.nclr -pl_batt_obj_00000090.nclr +bg_party_level_up.nclr +player_lucas_back.nclr +player_dawn_back.nclr +player_barry_back.nclr +player_cheryl_back.nclr +player_riley_back.nclr +player_marley_back.nclr +player_buck_back.nclr +player_mira_back.nclr poke_ball_throw.nclr master_ball_throw.nclr ultra_ball_throw.nclr @@ -254,17 +254,17 @@ battle_subscreen_cursor_corner.nanr healthbox_safari.ncgr healthbox_safari.ncer healthbox_safari.nanr -pl_batt_obj_00000256.ncgr -pl_batt_obj_00000257.ncer -pl_batt_obj_00000258.nanr -pl_batt_obj_00000259.ncgr -pl_batt_obj_00000260.ncgr -pl_batt_obj_00000261.ncgr -pl_batt_obj_00000262.ncgr -pl_batt_obj_00000263.ncgr -pl_batt_obj_00000264.ncgr -pl_batt_obj_00000265.ncgr -pl_batt_obj_00000266.ncgr +bg_party_level_up.ncgr +bg_party_level_up.ncer +bg_party_level_up.nanr +player_lucas_back.ncgr +player_dawn_back.ncgr +player_barry_back.ncgr +player_cheryl_back.ncgr +player_riley_back.ncgr +player_marley_back.ncgr +player_buck_back.ncgr +player_mira_back.ncgr pl_batt_obj_00000267.ncer pl_batt_obj_00000268.ncer pl_batt_obj_00000269.ncer diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000082.pal b/res/battle/graphic/pl_batt_obj/palettes/bg_party_level_up.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000082.pal rename to res/battle/graphic/pl_batt_obj/palettes/bg_party_level_up.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/data.json b/res/battle/graphic/pl_batt_obj/palettes/data.json index 986903a646..59afa1a271 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/data.json +++ b/res/battle/graphic/pl_batt_obj/palettes/data.json @@ -119,56 +119,56 @@ "invert_size": false }, { - "target": "pl_batt_obj_00000083.pal", + "target": "player_lucas_back.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000084.pal", + "target": "player_dawn_back.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000085.pal", + "target": "player_barry_back.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000086.pal", + "target": "player_cheryl_back.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000087.pal", + "target": "player_riley_back.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000088.pal", + "target": "player_marley_back.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000089.pal", + "target": "player_buck_back.pal", "bitdepth": 4, "pad": false, "pcmp": false, "invert_size": false }, { - "target": "pl_batt_obj_00000090.pal", + "target": "player_mira_back.pal", "bitdepth": 4, "pad": false, "pcmp": false, @@ -609,7 +609,7 @@ "invert_size": true }, { - "target": "pl_batt_obj_00000082.pal", + "target": "bg_party_level_up.pal", "bitdepth": 4, "pad": false, "pcmp": true, diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/pl_batt_obj/palettes/meson.build index 5a0cdf880d..197f1cd876 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/meson.build +++ b/res/battle/graphic/pl_batt_obj/palettes/meson.build @@ -78,15 +78,15 @@ pl_batt_obj_palettes = files( 'pl_batt_obj_00000079.pal', 'battle_subscreen_cursor_corner.pal', 'healthbox_safari.pal', - 'pl_batt_obj_00000082.pal', - 'pl_batt_obj_00000083.pal', - 'pl_batt_obj_00000084.pal', - 'pl_batt_obj_00000085.pal', - 'pl_batt_obj_00000086.pal', - 'pl_batt_obj_00000087.pal', - 'pl_batt_obj_00000088.pal', - 'pl_batt_obj_00000089.pal', - 'pl_batt_obj_00000090.pal', + 'bg_party_level_up.pal', + 'player_lucas_back.pal', + 'player_dawn_back.pal', + 'player_barry_back.pal', + 'player_cheryl_back.pal', + 'player_riley_back.pal', + 'player_marley_back.pal', + 'player_buck_back.pal', + 'player_mira_back.pal', 'poke_ball_throw.pal', 'master_ball_throw.pal', 'ultra_ball_throw.pal', diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000085.pal b/res/battle/graphic/pl_batt_obj/palettes/player_barry_back.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000085.pal rename to res/battle/graphic/pl_batt_obj/palettes/player_barry_back.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000089.pal b/res/battle/graphic/pl_batt_obj/palettes/player_buck_back.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000089.pal rename to res/battle/graphic/pl_batt_obj/palettes/player_buck_back.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000086.pal b/res/battle/graphic/pl_batt_obj/palettes/player_cheryl_back.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000086.pal rename to res/battle/graphic/pl_batt_obj/palettes/player_cheryl_back.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000084.pal b/res/battle/graphic/pl_batt_obj/palettes/player_dawn_back.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000084.pal rename to res/battle/graphic/pl_batt_obj/palettes/player_dawn_back.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000083.pal b/res/battle/graphic/pl_batt_obj/palettes/player_lucas_back.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000083.pal rename to res/battle/graphic/pl_batt_obj/palettes/player_lucas_back.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000088.pal b/res/battle/graphic/pl_batt_obj/palettes/player_marley_back.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000088.pal rename to res/battle/graphic/pl_batt_obj/palettes/player_marley_back.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000090.pal b/res/battle/graphic/pl_batt_obj/palettes/player_mira_back.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000090.pal rename to res/battle/graphic/pl_batt_obj/palettes/player_mira_back.pal diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000087.pal b/res/battle/graphic/pl_batt_obj/palettes/player_riley_back.pal similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000087.pal rename to res/battle/graphic/pl_batt_obj/palettes/player_riley_back.pal diff --git a/res/battle/graphic/pl_batt_obj/sprites/bg_party_level_up.png b/res/battle/graphic/pl_batt_obj/sprites/bg_party_level_up.png new file mode 100644 index 0000000000000000000000000000000000000000..f1218b75d1cfff1126efa8d0baa1601ee116710a GIT binary patch literal 253 zcmVZjuwVq5fCCizg%j;%+f9c81q!}GsSsO0&+z{g6EYL#nFXUm zBd!78tKuQx-{STtP?$#;a2_a7@D=cIP&)*U4`eJ4ACS-Gl}Q@100000NkvXXu0mjf DD^+6m literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/data.json b/res/battle/graphic/pl_batt_obj/sprites/data.json index a9ea951bc4..f5c57da13d 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/data.json +++ b/res/battle/graphic/pl_batt_obj/sprites/data.json @@ -599,66 +599,74 @@ "mapping_type": 64 }, { - "target": "pl_batt_obj_00000256.png", + "target": "bg_party_level_up.png", "compressed": true, "clobber_size": true, "mapping_type": 64 }, { - "target": "pl_batt_obj_00000259.png", + "target": "player_lucas_back.png", "compressed": true, "clobber_size": true, "mapping_type": 64, - "vram": true + "vram": true, + "tiles": 500 }, { - "target": "pl_batt_obj_00000260.png", + "target": "player_dawn_back.png", "compressed": true, "clobber_size": true, "mapping_type": 64, - "vram": true + "vram": true, + "tiles": 500 }, { - "target": "pl_batt_obj_00000261.png", + "target": "player_barry_back.png", "compressed": true, "clobber_size": true, "mapping_type": 64, - "vram": true + "vram": true, + "tiles": 500 }, { - "target": "pl_batt_obj_00000262.png", + "target": "player_cheryl_back.png", "compressed": true, "clobber_size": true, "mapping_type": 64, - "vram": true + "vram": true, + "tiles": 500 }, { - "target": "pl_batt_obj_00000263.png", + "target": "player_riley_back.png", "compressed": true, "clobber_size": true, "mapping_type": 64, - "vram": true + "vram": true, + "tiles": 500 }, { - "target": "pl_batt_obj_00000264.png", + "target": "player_marley_back.png", "compressed": true, "clobber_size": true, "mapping_type": 64, - "vram": true + "vram": true, + "tiles": 500 }, { - "target": "pl_batt_obj_00000265.png", + "target": "player_buck_back.png", "compressed": true, "clobber_size": true, "mapping_type": 64, - "vram": true + "vram": true, + "tiles": 500 }, { - "target": "pl_batt_obj_00000266.png", + "target": "player_mira_back.png", "compressed": true, "clobber_size": true, "mapping_type": 64, - "vram": true + "vram": true, + "tiles": 500 }, { "target": "poke_ball_throw.png", diff --git a/res/battle/graphic/pl_batt_obj/sprites/meson.build b/res/battle/graphic/pl_batt_obj/sprites/meson.build index a5ab4450a0..e2f55c25e4 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/meson.build +++ b/res/battle/graphic/pl_batt_obj/sprites/meson.build @@ -94,15 +94,15 @@ pl_batt_obj_sprites = files( 'pl_batt_obj_00000247.png', 'battle_subscreen_cursor_corner.png', 'healthbox_safari.png', - 'pl_batt_obj_00000256.png', - 'pl_batt_obj_00000259.png', - 'pl_batt_obj_00000260.png', - 'pl_batt_obj_00000261.png', - 'pl_batt_obj_00000262.png', - 'pl_batt_obj_00000263.png', - 'pl_batt_obj_00000264.png', - 'pl_batt_obj_00000265.png', - 'pl_batt_obj_00000266.png', + 'bg_party_level_up.png', + 'player_lucas_back.png', + 'player_dawn_back.png', + 'player_barry_back.png', + 'player_cheryl_back.png', + 'player_riley_back.png', + 'player_marley_back.png', + 'player_buck_back.png', + 'player_mira_back.png', 'poke_ball_throw.png', 'master_ball_throw.png', 'ultra_ball_throw.png', diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000256.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000256.png deleted file mode 100644 index a7729010d3c6383d2d64db6def71f23fbac44bdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^91ILBKnMgj9ji2e)HzQV$B>BDx6>Z-HY*6Y<=41R z;EgiVFc;#?Yxv6`y)w$zCs^<6yW`vw+jrJDHoA$_I{18Wcv7X*;xKXMN$cc}_Y7=p zI;%c8eX^)jJA3Yj@p)?}2Z_q`iQMyCw;$V+Bp?2H+on|?4n%+QNc;YF@1zTcV%6b> zj-P+$)zw}XeUhB?uUl_g>58U;T>pg=7*~GRX1vF7o_EIE?1*aVRic;jx%PjHD_xp?6?2M#=5Tu^A^`GH!9S!FZ{l`>|V5wf!dSDOa5lA4_Giy?t#L;ee>e?fPCob L>gTe~DWM4f5r%M$ diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000259.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000259.png deleted file mode 100644 index 489e99128ccd612abd94581f4a8bd089c28c505d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4397 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 UvNFhsZ2$lO07*qoM6N<$g7!p9wEzGB diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000261.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000261.png deleted file mode 100644 index 33c4064bfbc80c5d1d4bf83f14ae1f3f24e1edc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3944 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%0A6pzBAKT&&zz)!mFEVpdd-bzyG^8zB8|3&) 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 diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000263.png b/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000263.png deleted file mode 100644 index 0103cf6c136d5127d3b666c911068584416afda7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4360 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 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_buck_back.png b/res/battle/graphic/pl_batt_obj/sprites/player_buck_back.png new file mode 100644 index 0000000000000000000000000000000000000000..f9689aafb67195cd72e7c293059f6ca04a60457e GIT binary patch literal 3046 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 literal 0 HcmV?d00001 diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_dawn_back.png b/res/battle/graphic/pl_batt_obj/sprites/player_dawn_back.png new file mode 100644 index 0000000000000000000000000000000000000000..6a37c7eb9f603618d54e2342cea30be0734470d8 GIT binary patch literal 3830 zcma)<={wYo!^OX|F$UR}j1WckVJx>Anz1iq&6cI?WF2H|gBfdC%AR3pLXjf75RHk1 z$em-h_wSLdAT`n){n#kpx?Wx|aRLjVB4ZDwj{_gAq10Qw1q{B`h$ z`?$Y?vccOM4fN0k0%-#}I{Sg#B->5`agk5aA zW6;#TT@OvTLM=j3Ru`<5`a5L*?EtP)85flu-pz_m&!XyLv>MyOuNCrKX^*}9R7Z50 zk`n@fis7J~a_H>|0re{XZtO|; z)dqX|!B!J1BC#O(rnn$Th4^M~dTyIkJV!3Hq_*-b%nW4+dknMWi+?92thS80D>6v8 z)$-!|{Mm{0H!SHWkg0J}g>sDqkPQPG&-}`Qd5FEjXqn%t#{%Rm&FuVX1fG*@A}n`_ z0}9|zcC?av@J$~^C&+X0Lv~X|*af1bh16(j$ZI4+@m^!miv&CJ_CfFyq5WoHKUifL zDWCA8=D^9dbR5XiS6o!T3Zcz)aeNC}thbHu3Ksw^FCon$zWZLtmCnV)o@al`Lk?nx zf>nS)VZgO!v1a?AVCmIdN&V?4m}Q!x-Lcfoo^CA<{Zw+&;f=wMn-FeZ`t|83qcNWO z%YaM9^RHK?_V`};0qZhSG>4c-pz(t_<*x6T4Y)VTlw7Xhfnn#p4cs_#KUC(r!y1rK&@IQV_7#{V<51J}t9l2UPt@XLZ7zxTk~Vn9{z z18J$nOo&J)fB%=`brP_1kJm?`*%tgrwmat{%Da#AytxJ=qkB;h&rCrottmmI zUTGeSuSUIzYEqHl6wbMIW#O{l!TD3S=Sd>nc|5RiYMG==ADYf~;nX&JUq9kuOB~x@m_WaexMY6lPk!jX$#BX7y5Oj~ z0FZ*NLB(v3(jHfnVz>Dl-tN#xKe(DU+W&vH>VCy(;=HkiuEAzkPH|lNbQDtgN4E85 zSBSzg!hq2*hhQw6A#%1u1>vhv&Sz$e-Cq*UZ}}P z*m05m zK%)=}bt753>deU%zl-V;a%QE)K!!pffKk0+1WhMCgvKysTDbEK?hDv~?`5CD1IgtD z+#GPi+j&Fj=DH~9Fjlz%sXr31p^R$z0kzVlke}m`iSOR0Lj(Fv+ATS_$v;MZouhIt zj&|qUs|E`i%jZGTyNI7Lw$j}~^zUgVnt5YE9KiP~ik2k8<6JU~@eZBHPEn_^#Q}Yy zw3ApnItsRks({&)sA=l(m%h0bk;%k^kGRirl>!K~HF%%5v=Y?~T9#;8kjP{PUk300 zb62nM?F(3*51VofDCn9!NJ8ap$Sj4Pnn&r!U=c0*TIQbb5rWLeLba*Xd4%Wtt>vO4 zdp1ucg=#G%_H}Op2r+c!@GZTNo5;*nAu^#AN#3A_G6vIUj7b_tmlbP15`E@BAyj0H z^XR!Y9!O@>93r$2)I9;_BzJUW28>@D4Fpu7+7t%<{ z-#NcQEbF%H!NG*^*smhkwmrg;{v@EVy}fO;tjCc`H$rc1)8nspZyto1EPVYYAT6yo z_HtcheQ&aQFQY>;NhApS5D#FTL+gxnXmViCvZnOGXqrWZt6$dkoD%@@5SFzBQ%iI>$t8>d)yr%hFbx$fk z6i5ts5YKElp`GJq>5jgE7=I{wEd20t!~0KmET5VjH!E3?i(mDF10*xe3#q?GvRiNY z9W4fAp9FovL~5c6Hiy)lqaB(DqiaewuYqL*$Z|8&h?h7@8|NfgHh%qy)<1oh&XRx~ z77(m4$6Nc%hkGY1UtC+3T>+XYLESKOSNj5y2Jk)&>=pa3+679y2vrffDE!6J@+8!x zfnoHyLCyoE3v55h*0w*f+)c3D+%H&ez10k5J{X`6QvQ!Azmmx-+TIQfb0h?FXjq?m zEz}0Fp`i1y7`f1{X2l6Mi20~xt6YeFAP0{Q-M(UFQ@HraizNvS1;RTU0csuj{XU_; z^pb4cSX@UV*i$yH`6I%fE}-kb;lE)+p{@Mfk zTK!pOv^m*oO!tyCTn*<@AYv#Xt6drgE}YU?34aMpD47+P#es{-__J~8pT%i)XXC1; zj4Ig?2GG)*70g>qSY-MhDRc8?Z=-XU zRA*ViY2u32svkBHPLI@#BtH=b*+ahR$X|w03kvc(#gda|&}s@!G8Ey@mEe`7z*pjy zQSSbpF1|B+tH#{*onm&i58B%+2xpcBt5@eVO^>qY?E(r9!oB47(8S+8b#Aav z)x?*fLpU;`bD;Vy&;NyRI;N=G<){^?LlZys<)y^4%)QqRjiO$va20s}ah{Tr3FaXC z=u7D&-xO>4t{!4j+$|q&dmSd@e3vkGTXhL1mq336oR~pY8P>zEp74nkAoc zY4;n5CF-+P^~WIu7qldjKOX}t{J(AO3y%k57SCM^Z=&4T7$Ii%H+U!UcL(przZT9^8d@@Azi!$a46~12^%c!IHKOC} zTz6i(L*fHzeCW&0E|M}Za#m?!HZC{Cg~goBx!pv1l%np9fwV?FYh~=iC?epk(HqqC z`76*vVh|4O7sR(S@VN5t+T%gp!^WC*Kc9~nQ~gGaCuxsaHojGXWKE=RsWQ@6tlXv9 zwk^U!YZyhjR@q9;sZ&v1I_X!X$MG?k6oi9E*^L)m-Qc@R-ZTpwz^@+oc9zA0th2od z=VX0iuLhOLN5)cf>@s@K@C8II#Y@F|Rf({66Yo{f?^%YDaGC43Euu7y-1~D*m@hjP z{%(*&S-+D$??MtX9_oL$q5XW{AdS}-CKYBCJ(TV6J(QK%;(rrvl()*KMCd9m;XBL) ztLp3ni)On>*)#y3f9AyJq8llOA?+X@zP1@#aRLy7))1;0FTmtsn;#h@$+L?h#4{)&DSqkwy8|1Dg9C%8?OW zmxO%WNL#RyL{-x8eL+E13N2#>azGqJ|K(|$tyzaz>~ynGdj)wDkyKak7v;m=p@@eq zbb%c^ye9C?*Oez1xbGOB2alZ$+0xbk)&{S?g}&yAm~w@p!c@pqdLpFuLK`oh%6MZ&GU3vQhQzN`IcxU1S+|1P|-S4@*h;<4`D1w-FDD@#YLhc;j#%b hM;JI0JYq;WLfS{ctrwvmV6l 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

1Y>`?oCz&1q?wXmf&7VjVgU;}_wwigcBirWbGC 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[0] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_0226E6C4); diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 3eeae11c6a..edef815ae3 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -170,7 +170,7 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) SpriteRenderer_LoadCharResObjFromOpenNarc(v0, v1, v10, v3, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v4); SpriteRenderer_LoadPalette(BattleSystem_PaletteSys(param0->unk_04), 2, v0, v1, v10, sBattleTerrainPaletteFileIndex[param0->unk_09][v9], 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20009); - PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), 27, sBattleTerrainPaletteFileIndex[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); + PaletteData_LoadBufferFromFileStart(BattleSystem_PaletteSys(param0->unk_04), NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, sBattleTerrainPaletteFileIndex[param0->unk_09][v9], 5, 0, 0x20, 0x7 * 0x10); SpriteRenderer_LoadCellResObjFromOpenNarc(v0, v1, v10, v5, 1, v6); SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, v1, v10, v7, 1, v8); NARC_dtor(v10); diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py index 6f0e463d6e..9527a9524f 100644 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py @@ -62,6 +62,9 @@ ngfx_args.append('-version101') if 'vram' in file_props and file_props['vram'] == True: ngfx_args.append('-vram') +if 'tiles' in file_props: + ngfx_args.append('-num_tiles') + ngfx_args.append(str(file_props['tiles'])) subprocess.run(ngfx_args) From f427b7a001de9a54fb309b3a6baf5646dd89bf73 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Sun, 20 Oct 2024 13:26:52 -0500 Subject: [PATCH 20/26] fix some issues with anim/cell definitions, update a couple source locs to use naix --- .../graphic/pl_batt_obj/anims/bait_throw.json | 30 ++-- .../anims/ball_status_indicator_opponent.json | 46 +++--- .../anims/ball_status_indicator_player.json | 46 +++--- .../anims/battle_subscreen_cursor_corner.json | 70 ++++---- .../anims/battle_terrain_opponent.json | 13 +- .../anims/battle_terrain_player.json | 13 +- .../pl_batt_obj/anims/bg_party_level_up.json | 13 +- .../pl_batt_obj/anims/cherish_ball_throw.json | 48 +++--- .../graphic/pl_batt_obj/anims/data.json | 2 +- .../pl_batt_obj/anims/dive_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/dusk_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/great_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/heal_ball_throw.json | 48 +++--- .../anims/healthbox_doubles_opponent_1.json | 13 +- .../anims/healthbox_doubles_opponent_2.json | 13 +- .../anims/healthbox_doubles_player_1.json | 13 +- .../anims/healthbox_doubles_player_2.json | 13 +- .../pl_batt_obj/anims/healthbox_safari.json | 13 +- .../anims/healthbox_singles_opponent.json | 13 +- .../anims/healthbox_singles_player.json | 13 +- .../pl_batt_obj/anims/luxury_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/master_ball_throw.json | 48 +++--- .../graphic/pl_batt_obj/anims/meson.build | 2 +- ..._obj_00000243.json => move_type_icon.json} | 13 +- .../graphic/pl_batt_obj/anims/mud_throw.json | 39 ++--- .../pl_batt_obj/anims/nest_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/net_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/park_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/party_gauge.json | 155 ++++++++---------- .../anims/pl_batt_obj_00000078.json | 13 +- .../anims/pl_batt_obj_00000114.json | 13 +- .../anims/pl_batt_obj_00000115.json | 13 +- .../anims/pl_batt_obj_00000118.json | 13 +- .../anims/pl_batt_obj_00000123.json | 13 +- .../anims/pl_batt_obj_00000126.json | 13 +- .../anims/pl_batt_obj_00000177.json | 13 +- .../anims/pl_batt_obj_00000180.json | 25 ++- .../anims/pl_batt_obj_00000183.json | 28 ++-- .../anims/pl_batt_obj_00000212.json | 13 +- .../anims/pl_batt_obj_00000215.json | 13 +- .../anims/pl_batt_obj_00000218.json | 13 +- .../anims/pl_batt_obj_00000249.json | 48 +++--- .../anims/pl_batt_obj_00000275.json | 25 ++- .../anims/pl_batt_obj_00000276.json | 25 ++- .../anims/pl_batt_obj_00000277.json | 25 ++- .../anims/pl_batt_obj_00000278.json | 25 ++- .../anims/pl_batt_obj_00000279.json | 25 ++- .../anims/pl_batt_obj_00000280.json | 25 ++- .../anims/pl_batt_obj_00000281.json | 25 ++- .../anims/pl_batt_obj_00000282.json | 25 ++- .../pl_batt_obj/anims/poke_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/premier_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/quick_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/repeat_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/safari_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/timer_ball_throw.json | 48 +++--- .../pl_batt_obj/anims/ultra_ball_throw.json | 48 +++--- .../graphic/pl_batt_obj/cells/data.json | 2 +- .../graphic/pl_batt_obj/cells/meson.build | 2 +- ..._obj_00000242.json => move_type_icon.json} | 0 .../cells/pl_batt_obj_00000267.json | 21 ++- .../cells/pl_batt_obj_00000268.json | 21 ++- .../cells/pl_batt_obj_00000269.json | 21 ++- .../cells/pl_batt_obj_00000270.json | 21 ++- .../cells/pl_batt_obj_00000271.json | 21 ++- .../cells/pl_batt_obj_00000272.json | 21 ++- .../cells/pl_batt_obj_00000273.json | 21 ++- .../cells/pl_batt_obj_00000274.json | 21 ++- res/battle/graphic/pl_batt_obj/meson.build | 1 + res/battle/graphic/pl_batt_obj/order.txt | 4 +- src/overlay017/ov17_02252AB0.c | 10 +- src/overlay087/ov87_021D106C.c | 10 +- .../pl_batt_obj/make_pl_batt_obj_anims.py | 2 +- 73 files changed, 897 insertions(+), 1082 deletions(-) rename res/battle/graphic/pl_batt_obj/anims/{pl_batt_obj_00000243.json => move_type_icon.json} (71%) rename res/battle/graphic/pl_batt_obj/cells/{pl_batt_obj_00000242.json => move_type_icon.json} (100%) diff --git a/res/battle/graphic/pl_batt_obj/anims/bait_throw.json b/res/battle/graphic/pl_batt_obj/anims/bait_throw.json index 458661c93e..428b5810e5 100644 --- a/res/battle/graphic/pl_batt_obj/anims/bait_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/bait_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 5, - "resultCount": 4, "sequences": [{ "frameCount": 4, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -24,32 +23,29 @@ }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 60, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }], + "resultCount": 4, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json index 6a55e9dbf6..3a296a6bba 100644 --- a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json +++ b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json @@ -2,65 +2,61 @@ "labelEnabled": true, "sequenceCount": 4, "frameCount": 4, - "resultCount": 4, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 1 }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 2 }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 3 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 3 }], + "resultCount": 4, "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], "labelCount": 4 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json index 6a55e9dbf6..3a296a6bba 100644 --- a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json +++ b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json @@ -2,65 +2,61 @@ "labelEnabled": true, "sequenceCount": 4, "frameCount": 4, - "resultCount": 4, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 1 }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 2 }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 3 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 3 }], + "resultCount": 4, "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], "labelCount": 4 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json b/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json index 9b049a6dfc..217a849acd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json +++ b/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 4, "frameCount": 16, - "resultCount": 12, "sequences": [{ "frameCount": 4, - "unk02": 0, - "dataType": 2, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 2, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 6, "resultId": 0 @@ -24,10 +23,10 @@ }] }, { "frameCount": 4, - "unk02": 0, - "dataType": 2, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 2, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 6, "resultId": 3 @@ -43,10 +42,10 @@ }] }, { "frameCount": 4, - "unk02": 0, - "dataType": 2, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 2, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 6, "resultId": 6 @@ -62,10 +61,10 @@ }] }, { "frameCount": 4, - "unk02": 0, - "dataType": 2, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 2, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 6, "resultId": 9 @@ -81,78 +80,67 @@ }] }], "animationResults": [{ - "dataType": 2, - "padded": false, + "resultType": 2, "index": 0, "positionX": 0, "positionY": 0 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 0, "positionX": -1, "positionY": -1 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 0, "positionX": -2, "positionY": -2 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 1, "positionX": 0, "positionY": 0 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 1, "positionX": 1, "positionY": -1 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 1, "positionX": 2, "positionY": -2 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 2, "positionX": 0, "positionY": 0 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 2, "positionX": -1, "positionY": 1 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 2, "positionX": -2, "positionY": 2 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 3, "positionX": 0, "positionY": 0 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 3, "positionX": 1, "positionY": 1 }, { - "dataType": 2, - "padded": false, + "resultType": 2, "index": 3, "positionX": 2, "positionY": 2 }], + "resultCount": 12, "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], "labelCount": 4 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json index 0e1f342224..f6413d0d07 100644 --- a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json +++ b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime2"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json +++ b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json b/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json +++ b/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/data.json b/res/battle/graphic/pl_batt_obj/anims/data.json index 11591f6e14..1bcec7c0f8 100644 --- a/res/battle/graphic/pl_batt_obj/anims/data.json +++ b/res/battle/graphic/pl_batt_obj/anims/data.json @@ -88,7 +88,7 @@ "compressed": true }, { - "target": "pl_batt_obj_00000243.json", + "target": "move_type_icon.json", "compressed": true }, { diff --git a/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json index 68950170bb..d2bc97b3a5 100644 --- a/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json index 68950170bb..d2bc97b3a5 100644 --- a/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/meson.build b/res/battle/graphic/pl_batt_obj/anims/meson.build index 56328f4a88..80bc9c240d 100644 --- a/res/battle/graphic/pl_batt_obj/anims/meson.build +++ b/res/battle/graphic/pl_batt_obj/anims/meson.build @@ -21,7 +21,7 @@ pl_batt_obj_anims = files( 'pl_batt_obj_00000212.json', 'pl_batt_obj_00000215.json', 'pl_batt_obj_00000218.json', - 'pl_batt_obj_00000243.json', + 'move_type_icon.json', 'pl_batt_obj_00000249.json', 'battle_subscreen_cursor_corner.json', 'healthbox_safari.json', diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000243.json b/res/battle/graphic/pl_batt_obj/anims/move_type_icon.json similarity index 71% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000243.json rename to res/battle/graphic/pl_batt_obj/anims/move_type_icon.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000243.json +++ b/res/battle/graphic/pl_batt_obj/anims/move_type_icon.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/mud_throw.json b/res/battle/graphic/pl_batt_obj/anims/mud_throw.json index 224cde5e92..6eef63f5fb 100644 --- a/res/battle/graphic/pl_batt_obj/anims/mud_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/mud_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 8, - "resultCount": 7, "sequences": [{ "frameCount": 4, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -24,10 +23,10 @@ }] }, { "frameCount": 4, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 6, "resultId": 0 @@ -43,34 +42,28 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 6 }], + "resultCount": 7, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/party_gauge.json b/res/battle/graphic/pl_batt_obj/anims/party_gauge.json index 90b61e0e8b..c067cd0ea4 100644 --- a/res/battle/graphic/pl_batt_obj/anims/party_gauge.json +++ b/res/battle/graphic/pl_batt_obj/anims/party_gauge.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 9, "frameCount": 51, - "resultCount": 27, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 1, "resultId": 8 @@ -67,10 +66,10 @@ }] }, { "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 1, "resultId": 16 @@ -98,10 +97,10 @@ }] }, { "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -129,10 +128,10 @@ }] }, { "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 1, "resultId": 8 @@ -160,10 +159,10 @@ }] }, { "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 1, "resultId": 16 @@ -191,144 +190,118 @@ }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 24 }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 25 }] }, { "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 26 }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 15 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 14 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 13 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 12 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 11 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 10 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 16 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 23 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 22 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 21 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 20 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 19 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 18 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 17 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 24 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 25 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 26 }], + "resultCount": 27, "labels": ["CellAnime8", "CellAnime7", "CellAnime6", "CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5"], "labelCount": 9 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json index e7c70429ca..7acc18ae7b 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 16, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json index 0c3121757c..15b51fdfb6 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 6, - "resultCount": 6, "sequences": [{ "frameCount": 6, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 0, "resultId": 0 @@ -30,30 +29,25 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }], + "resultCount": 6, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json index c3f7f3178a..877d94c41f 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json @@ -2,23 +2,22 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 1, - "resultCount": 1, "sequences": [{ "frameCount": 1, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 4, "resultId": 0 }] }], "animationResults": [{ - "dataType": 0, - "padded": true, + "resultType": 0, "index": 0 }], + "resultCount": 1, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json index a2c2d179c9..e5581886f8 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json index bbf6da54ff..73a09b9b9a 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json index bbf6da54ff..73a09b9b9a 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json index bbf6da54ff..73a09b9b9a 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json index bbf6da54ff..73a09b9b9a 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json index bbf6da54ff..73a09b9b9a 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json index bbf6da54ff..73a09b9b9a 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json index bbf6da54ff..73a09b9b9a 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json index bbf6da54ff..73a09b9b9a 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 1, "frameCount": 5, - "resultCount": 5, "sequences": [{ "frameCount": 5, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 1, "resultId": 0 @@ -27,26 +26,22 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": true, + "resultType": 0, "index": 4 }], + "resultCount": 5, "labels": ["CellAnime0"], "labelCount": 1 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json index 68950170bb..d2bc97b3a5 100644 --- a/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json index 7b0b234c7c..75b651d177 100644 --- a/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json @@ -2,13 +2,12 @@ "labelEnabled": true, "sequenceCount": 2, "frameCount": 11, - "resultCount": 10, "sequences": [{ "frameCount": 8, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 2, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 2, "frameData": [{ "frameDelay": 2, "resultId": 0 @@ -36,10 +35,10 @@ }] }, { "frameCount": 3, - "unk02": 0, - "dataType": 0, - "unk06": 1, - "unk08": 1, + "loopStartFrame": 0, + "animationType": 0, + "animationType2": 1, + "playbackMode": 1, "frameData": [{ "frameDelay": 10, "resultId": 0 @@ -52,46 +51,37 @@ }] }], "animationResults": [{ - "dataType": 0, - "padded": false, + "resultType": 0, "index": 0 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 1 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 2 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 3 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 4 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 5 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 6 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 7 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 8 }, { - "dataType": 0, - "padded": false, + "resultType": 0, "index": 9 }], + "resultCount": 10, "labels": ["CellAnime0", "CellAnime1"], "labelCount": 2 } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/data.json b/res/battle/graphic/pl_batt_obj/cells/data.json index 8d59b70b14..56b92dec07 100644 --- a/res/battle/graphic/pl_batt_obj/cells/data.json +++ b/res/battle/graphic/pl_batt_obj/cells/data.json @@ -88,7 +88,7 @@ "compressed": true }, { - "target": "pl_batt_obj_00000242.json", + "target": "move_type_icon.json", "compressed": true }, { diff --git a/res/battle/graphic/pl_batt_obj/cells/meson.build b/res/battle/graphic/pl_batt_obj/cells/meson.build index 56b3b19585..958ba9509d 100644 --- a/res/battle/graphic/pl_batt_obj/cells/meson.build +++ b/res/battle/graphic/pl_batt_obj/cells/meson.build @@ -51,7 +51,7 @@ pl_batt_obj_cells = files( 'healthbox_doubles_opponent_2.json', 'healthbox_doubles_player_1.json', 'healthbox_doubles_player_2.json', - 'pl_batt_obj_00000242.json', + 'move_type_icon.json', 'healthbox_safari.json', 'bg_party_level_up.json' ) diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000242.json b/res/battle/graphic/pl_batt_obj/cells/move_type_icon.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000242.json rename to res/battle/graphic/pl_batt_obj/cells/move_type_icon.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json index 6e3fc67ab6..0dc6523b57 100644 --- a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json @@ -1,7 +1,7 @@ { "labelEnabled": true, "extended": true, - "partitionEnabled": true, + "vramTransferEnabled": true, "cellCount": 5, "mappingType": 1, "cells": [{ @@ -677,6 +677,21 @@ }], "labels": ["CellAnime0"], "labelCount": 1, - "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], - "partitionCount": 12 + "vramTransferMaxSize": 3200, + "transferData": [{ + "offset": 0, + "size": 3200 + }, { + "offset": 3200, + "size": 3200 + }, { + "offset": 6400, + "size": 3200 + }, { + "offset": 9600, + "size": 3200 + }, { + "offset": 12800, + "size": 3200 + }] } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json index 6e3fc67ab6..0dc6523b57 100644 --- a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json @@ -1,7 +1,7 @@ { "labelEnabled": true, "extended": true, - "partitionEnabled": true, + "vramTransferEnabled": true, "cellCount": 5, "mappingType": 1, "cells": [{ @@ -677,6 +677,21 @@ }], "labels": ["CellAnime0"], "labelCount": 1, - "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], - "partitionCount": 12 + "vramTransferMaxSize": 3200, + "transferData": [{ + "offset": 0, + "size": 3200 + }, { + "offset": 3200, + "size": 3200 + }, { + "offset": 6400, + "size": 3200 + }, { + "offset": 9600, + "size": 3200 + }, { + "offset": 12800, + "size": 3200 + }] } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json index 6e3fc67ab6..0dc6523b57 100644 --- a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json @@ -1,7 +1,7 @@ { "labelEnabled": true, "extended": true, - "partitionEnabled": true, + "vramTransferEnabled": true, "cellCount": 5, "mappingType": 1, "cells": [{ @@ -677,6 +677,21 @@ }], "labels": ["CellAnime0"], "labelCount": 1, - "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], - "partitionCount": 12 + "vramTransferMaxSize": 3200, + "transferData": [{ + "offset": 0, + "size": 3200 + }, { + "offset": 3200, + "size": 3200 + }, { + "offset": 6400, + "size": 3200 + }, { + "offset": 9600, + "size": 3200 + }, { + "offset": 12800, + "size": 3200 + }] } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json index 6e3fc67ab6..0dc6523b57 100644 --- a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json @@ -1,7 +1,7 @@ { "labelEnabled": true, "extended": true, - "partitionEnabled": true, + "vramTransferEnabled": true, "cellCount": 5, "mappingType": 1, "cells": [{ @@ -677,6 +677,21 @@ }], "labels": ["CellAnime0"], "labelCount": 1, - "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], - "partitionCount": 12 + "vramTransferMaxSize": 3200, + "transferData": [{ + "offset": 0, + "size": 3200 + }, { + "offset": 3200, + "size": 3200 + }, { + "offset": 6400, + "size": 3200 + }, { + "offset": 9600, + "size": 3200 + }, { + "offset": 12800, + "size": 3200 + }] } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json index 6e3fc67ab6..0dc6523b57 100644 --- a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json @@ -1,7 +1,7 @@ { "labelEnabled": true, "extended": true, - "partitionEnabled": true, + "vramTransferEnabled": true, "cellCount": 5, "mappingType": 1, "cells": [{ @@ -677,6 +677,21 @@ }], "labels": ["CellAnime0"], "labelCount": 1, - "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], - "partitionCount": 12 + "vramTransferMaxSize": 3200, + "transferData": [{ + "offset": 0, + "size": 3200 + }, { + "offset": 3200, + "size": 3200 + }, { + "offset": 6400, + "size": 3200 + }, { + "offset": 9600, + "size": 3200 + }, { + "offset": 12800, + "size": 3200 + }] } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json index 6e3fc67ab6..0dc6523b57 100644 --- a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json @@ -1,7 +1,7 @@ { "labelEnabled": true, "extended": true, - "partitionEnabled": true, + "vramTransferEnabled": true, "cellCount": 5, "mappingType": 1, "cells": [{ @@ -677,6 +677,21 @@ }], "labels": ["CellAnime0"], "labelCount": 1, - "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], - "partitionCount": 12 + "vramTransferMaxSize": 3200, + "transferData": [{ + "offset": 0, + "size": 3200 + }, { + "offset": 3200, + "size": 3200 + }, { + "offset": 6400, + "size": 3200 + }, { + "offset": 9600, + "size": 3200 + }, { + "offset": 12800, + "size": 3200 + }] } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json index 6e3fc67ab6..0dc6523b57 100644 --- a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json @@ -1,7 +1,7 @@ { "labelEnabled": true, "extended": true, - "partitionEnabled": true, + "vramTransferEnabled": true, "cellCount": 5, "mappingType": 1, "cells": [{ @@ -677,6 +677,21 @@ }], "labels": ["CellAnime0"], "labelCount": 1, - "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], - "partitionCount": 12 + "vramTransferMaxSize": 3200, + "transferData": [{ + "offset": 0, + "size": 3200 + }, { + "offset": 3200, + "size": 3200 + }, { + "offset": 6400, + "size": 3200 + }, { + "offset": 9600, + "size": 3200 + }, { + "offset": 12800, + "size": 3200 + }] } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json index 6e3fc67ab6..0dc6523b57 100644 --- a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json +++ b/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json @@ -1,7 +1,7 @@ { "labelEnabled": true, "extended": true, - "partitionEnabled": true, + "vramTransferEnabled": true, "cellCount": 5, "mappingType": 1, "cells": [{ @@ -677,6 +677,21 @@ }], "labels": ["CellAnime0"], "labelCount": 1, - "partitions": [3200, 8, 0, 3200, 3200, 3200, 6400, 3200, 9600, 3200, 12800, 3200], - "partitionCount": 12 + "vramTransferMaxSize": 3200, + "transferData": [{ + "offset": 0, + "size": 3200 + }, { + "offset": 3200, + "size": 3200 + }, { + "offset": 6400, + "size": 3200 + }, { + "offset": 9600, + "size": 3200 + }, { + "offset": 12800, + "size": 3200 + }] } \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index 6582647535..f0467cb5db 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -19,6 +19,7 @@ nitrofs_files += custom_target('pl_batt_obj.narc', '-d', '@PRIVATE_DIR@', '-o', '@INPUT0@', '--naix', + '--verbose', '-p', '@OUTPUT@' ], diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/order.txt index 5ac150b00b..ca932766b2 100644 --- a/res/battle/graphic/pl_batt_obj/order.txt +++ b/res/battle/graphic/pl_batt_obj/order.txt @@ -240,8 +240,8 @@ type_icon_steel.ncgr contest_icon_tough.ncgr contest_icon_cool.ncgr type_icon_water.ncgr -pl_batt_obj_00000242.ncer -pl_batt_obj_00000243.nanr +move_type_icon.ncer +move_type_icon.nanr move_class_physical.ncgr move_class_status.ncgr move_class_special.ncgr diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c index 0833cba989..376cc04cb9 100644 --- a/src/overlay017/ov17_02252AB0.c +++ b/src/overlay017/ov17_02252AB0.c @@ -13,6 +13,8 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "unk_0200C6E4.h" +#include "narc.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" typedef struct UnkStruct_ov17_02252B48_t { CellActorData *unk_00[5]; @@ -41,10 +43,10 @@ static const SpriteTemplate Unk_ov17_02254D9C = { void ov17_02252AB0(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, u32 param3, u32 param4, u32 param5, u32 param6) { - sub_0200CD7C(param2, 3, param0, param1, 27, 80, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); - sub_0200CBDC(param0, param1, 27, 250, 1, NNS_G2D_VRAM_TYPE_2DSUB, param3); - sub_0200CE0C(param0, param1, 27, 251, 1, param5); - sub_0200CE3C(param0, param1, 27, 252, 1, param6); + sub_0200CD7C(param2, 3, param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_nclr, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); + sub_0200CBDC(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_ncgr, 1, NNS_G2D_VRAM_TYPE_2DSUB, param3); + sub_0200CE0C(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_ncer, 1, param5); + sub_0200CE3C(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_nanr, 1, param6); } void ov17_02252B20(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index e4895af384..4866bb5b90 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -33,6 +33,8 @@ #include "unk_020131EC.h" #include "unk_02017728.h" +#include "narc.h" + typedef struct UnkStruct_ov87_021D106C_t { UnkStruct_ov87_021D0D80 *unk_00; const UnkStruct_ov87_021D12C0 *unk_04; @@ -443,8 +445,8 @@ static void ov87_021D1818(UnkStruct_ov87_021D106C *param0) NNSG2dAnimBankData *v1; int v2; - param0->unk_1DC = Graphics_GetCellBank(27, 77, 0, &v0, 61); - param0->unk_1E0 = Graphics_GetAnimBank(27, 78, 0, &v1, 61); + param0->unk_1DC = Graphics_GetCellBank(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 77, 0, &v0, 61); + param0->unk_1E0 = Graphics_GetAnimBank(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 78, 0, &v1, 61); MI_CpuClearFast(param0->unk_200, sizeof(param0->unk_200)); @@ -504,8 +506,8 @@ static void ov87_021D18A0(UnkStruct_ov87_021D106C *param0, NNSG2dCellDataBank *p v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; v2.heapID = 61; - v7 = Graphics_GetCharData(27, 76, 0, &v5, 61); - v8 = Graphics_GetPlttData(27, 75, &v6, 61); + v7 = Graphics_GetCharData(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 76, 0, &v5, 61); + v8 = Graphics_GetPlttData(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 75, &v6, 61); for (v9 = 0; v9 < 6; v9++) { NNS_G2dInitImageProxy(&v3); diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py index d31785c264..c7c07e6d83 100644 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py +++ b/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py @@ -52,7 +52,7 @@ tmp_file = dest_dir / output_file.name -ngfx_args = [args.nitrogfx, input_file, tmp_file, "-newparser"] +ngfx_args = [args.nitrogfx, input_file, tmp_file] subprocess.run(ngfx_args) if 'compressed' in file_props and file_props['compressed'] == True: From cb7b584164522b9d72f1dd8b7b094949db128a63 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Sun, 20 Oct 2024 13:37:47 -0500 Subject: [PATCH 21/26] format on files using new naix fields --- src/overlay017/ov17_02252AB0.c | 4 ++-- src/overlay087/ov87_021D106C.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c index 376cc04cb9..d4c56d3e59 100644 --- a/src/overlay017/ov17_02252AB0.c +++ b/src/overlay017/ov17_02252AB0.c @@ -8,13 +8,13 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" +#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" + #include "heap.h" #include "palette.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_0200C6E4.h" -#include "narc.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" typedef struct UnkStruct_ov17_02252B48_t { CellActorData *unk_00[5]; diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index 4866bb5b90..5a79ecad86 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -20,6 +20,7 @@ #include "gx_layers.h" #include "heap.h" #include "message.h" +#include "narc.h" #include "pokemon.h" #include "render_window.h" #include "strbuf.h" @@ -33,8 +34,6 @@ #include "unk_020131EC.h" #include "unk_02017728.h" -#include "narc.h" - typedef struct UnkStruct_ov87_021D106C_t { UnkStruct_ov87_021D0D80 *unk_00; const UnkStruct_ov87_021D12C0 *unk_04; From 15a5e944d80c22873eb70527846f1e3923d783cf Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Mon, 28 Oct 2024 11:36:00 -0500 Subject: [PATCH 22/26] use new generators to produce NARC contents --- .../graphic/pl_batt_obj/anims/bait_throw.json | 8 +- .../anims/ball_status_indicator_opponent.json | 16 +- .../anims/ball_status_indicator_player.json | 16 +- .../anims/battle_subscreen_cursor_corner.json | 16 +- .../anims/battle_terrain_opponent.json | 4 +- .../anims/battle_terrain_player.json | 4 +- .../pl_batt_obj/anims/bg_party_level_up.json | 4 +- .../pl_batt_obj/anims/cherish_ball_throw.json | 8 +- .../graphic/pl_batt_obj/anims/data.json | 222 ------ .../pl_batt_obj/anims/dive_ball_throw.json | 8 +- .../pl_batt_obj/anims/dusk_ball_throw.json | 8 +- .../pl_batt_obj/anims/great_ball_throw.json | 8 +- .../pl_batt_obj/anims/heal_ball_throw.json | 8 +- .../anims/healthbox_doubles_opponent_1.json | 4 +- .../anims/healthbox_doubles_opponent_2.json | 4 +- .../anims/healthbox_doubles_player_1.json | 4 +- .../anims/healthbox_doubles_player_2.json | 4 +- .../pl_batt_obj/anims/healthbox_safari.json | 4 +- .../anims/healthbox_singles_opponent.json | 4 +- .../anims/healthbox_singles_player.json | 4 +- .../pl_batt_obj/anims/luxury_ball_throw.json | 8 +- .../pl_batt_obj/anims/master_ball_throw.json | 8 +- .../graphic/pl_batt_obj/anims/meson.build | 27 +- .../pl_batt_obj/anims/move_type_icon.json | 4 +- .../graphic/pl_batt_obj/anims/mud_throw.json | 8 +- .../pl_batt_obj/anims/nest_ball_throw.json | 8 +- .../pl_batt_obj/anims/net_ball_throw.json | 8 +- .../pl_batt_obj/anims/park_ball_throw.json | 8 +- .../pl_batt_obj/anims/party_gauge.json | 36 +- .../anims/pl_batt_obj_00000078.json | 4 +- .../anims/pl_batt_obj_00000114.json | 4 +- .../anims/pl_batt_obj_00000115.json | 4 +- .../anims/pl_batt_obj_00000118.json | 4 +- .../anims/pl_batt_obj_00000123.json | 4 +- .../anims/pl_batt_obj_00000126.json | 4 +- .../anims/pl_batt_obj_00000177.json | 4 +- .../anims/pl_batt_obj_00000180.json | 4 +- .../anims/pl_batt_obj_00000183.json | 4 +- .../anims/pl_batt_obj_00000212.json | 4 +- .../anims/pl_batt_obj_00000215.json | 4 +- .../anims/pl_batt_obj_00000218.json | 4 +- .../anims/pl_batt_obj_00000249.json | 8 +- .../anims/pl_batt_obj_00000275.json | 4 +- .../anims/pl_batt_obj_00000276.json | 4 +- .../anims/pl_batt_obj_00000277.json | 4 +- .../anims/pl_batt_obj_00000278.json | 4 +- .../anims/pl_batt_obj_00000279.json | 4 +- .../anims/pl_batt_obj_00000280.json | 4 +- .../anims/pl_batt_obj_00000281.json | 4 +- .../anims/pl_batt_obj_00000282.json | 4 +- .../pl_batt_obj/anims/poke_ball_throw.json | 8 +- .../pl_batt_obj/anims/premier_ball_throw.json | 8 +- .../pl_batt_obj/anims/quick_ball_throw.json | 8 +- .../pl_batt_obj/anims/repeat_ball_throw.json | 8 +- .../pl_batt_obj/anims/safari_ball_throw.json | 8 +- .../pl_batt_obj/anims/timer_ball_throw.json | 8 +- .../pl_batt_obj/anims/ultra_ball_throw.json | 8 +- .../graphic/pl_batt_obj/cells/data.json | 222 ------ .../graphic/pl_batt_obj/cells/meson.build | 25 +- res/battle/graphic/pl_batt_obj/meson.build | 76 +- .../graphic/pl_batt_obj/palettes/meson.build | 76 +- .../{order.txt => pl_batt_obj.order} | 684 +++++++++--------- .../graphic/pl_batt_obj/sprites/meson.build | 116 +-- 63 files changed, 684 insertions(+), 1132 deletions(-) delete mode 100644 res/battle/graphic/pl_batt_obj/anims/data.json delete mode 100644 res/battle/graphic/pl_batt_obj/cells/data.json rename res/battle/graphic/pl_batt_obj/{order.txt => pl_batt_obj.order} (96%) diff --git a/res/battle/graphic/pl_batt_obj/anims/bait_throw.json b/res/battle/graphic/pl_batt_obj/anims/bait_throw.json index 428b5810e5..f63ca2f8e6 100644 --- a/res/battle/graphic/pl_batt_obj/anims/bait_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/bait_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 4, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -24,8 +24,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 60, diff --git a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json index 3a296a6bba..5c582554cb 100644 --- a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json +++ b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, @@ -15,8 +15,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, @@ -25,8 +25,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, @@ -35,8 +35,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json index 3a296a6bba..5c582554cb 100644 --- a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json +++ b/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, @@ -15,8 +15,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, @@ -25,8 +25,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, @@ -35,8 +35,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json b/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json index 217a849acd..c82287576d 100644 --- a/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json +++ b/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 4, "loopStartFrame": 0, - "animationType": 2, - "animationType2": 1, + "animationElement": 2, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 6, @@ -24,8 +24,8 @@ }, { "frameCount": 4, "loopStartFrame": 0, - "animationType": 2, - "animationType2": 1, + "animationElement": 2, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 6, @@ -43,8 +43,8 @@ }, { "frameCount": 4, "loopStartFrame": 0, - "animationType": 2, - "animationType2": 1, + "animationElement": 2, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 6, @@ -62,8 +62,8 @@ }, { "frameCount": 4, "loopStartFrame": 0, - "animationType": 2, - "animationType2": 1, + "animationElement": 2, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 6, diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json index f6413d0d07..5ba265e5cc 100644 --- a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json +++ b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json +++ b/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json b/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json +++ b/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/data.json b/res/battle/graphic/pl_batt_obj/anims/data.json deleted file mode 100644 index 1bcec7c0f8..0000000000 --- a/res/battle/graphic/pl_batt_obj/anims/data.json +++ /dev/null @@ -1,222 +0,0 @@ -[ - { - "target": "pl_batt_obj_00000078.json", - "compressed": false - }, - { - "target": "pl_batt_obj_00000114.json", - "compressed": false - }, - { - "target": "pl_batt_obj_00000115.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000118.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000123.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000126.json", - "compressed": true - }, - { - "target": "battle_terrain_player.json", - "compressed": true - }, - { - "target": "battle_terrain_opponent.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000177.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000180.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000183.json", - "compressed": true - }, - { - "target": "healthbox_singles_opponent.json", - "compressed": true - }, - { - "target": "healthbox_singles_player.json", - "compressed": true - }, - { - "target": "healthbox_doubles_opponent_1.json", - "compressed": true - }, - { - "target": "healthbox_doubles_opponent_2.json", - "compressed": true - }, - { - "target": "healthbox_doubles_player_1.json", - "compressed": true - }, - { - "target": "healthbox_doubles_player_2.json", - "compressed": true - }, - { - "target": "ball_status_indicator_opponent.json", - "compressed": true - }, - { - "target": "ball_status_indicator_player.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000212.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000215.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000218.json", - "compressed": true - }, - { - "target": "move_type_icon.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000249.json", - "compressed": true - }, - { - "target": "battle_subscreen_cursor_corner.json", - "compressed": true - }, - { - "target": "healthbox_safari.json", - "compressed": true - }, - { - "target": "bg_party_level_up.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000275.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000276.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000277.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000278.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000279.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000280.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000281.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000282.json", - "compressed": true - }, - { - "target": "poke_ball_throw.json", - "compressed": true - }, - { - "target": "master_ball_throw.json", - "compressed": true - }, - { - "target": "ultra_ball_throw.json", - "compressed": true - }, - { - "target": "great_ball_throw.json", - "compressed": true - }, - { - "target": "safari_ball_throw.json", - "compressed": true - }, - { - "target": "net_ball_throw.json", - "compressed": true - }, - { - "target": "dive_ball_throw.json", - "compressed": true - }, - { - "target": "nest_ball_throw.json", - "compressed": true - }, - { - "target": "repeat_ball_throw.json", - "compressed": true - }, - { - "target": "timer_ball_throw.json", - "compressed": true - }, - { - "target": "luxury_ball_throw.json", - "compressed": true - }, - { - "target": "premier_ball_throw.json", - "compressed": true - }, - { - "target": "quick_ball_throw.json", - "compressed": true - }, - { - "target": "dusk_ball_throw.json", - "compressed": true - }, - { - "target": "heal_ball_throw.json", - "compressed": true - }, - { - "target": "cherish_ball_throw.json", - "compressed": true - }, - { - "target": "park_ball_throw.json", - "compressed": true - }, - { - "target": "bait_throw.json", - "compressed": true - }, - { - "target": "mud_throw.json", - "compressed": true - }, - { - "target": "party_gauge.json", - "compressed": true - } -] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json index d2bc97b3a5..4329f2102c 100644 --- a/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json index d2bc97b3a5..4329f2102c 100644 --- a/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json +++ b/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/meson.build b/res/battle/graphic/pl_batt_obj/anims/meson.build index 80bc9c240d..b618070e56 100644 --- a/res/battle/graphic/pl_batt_obj/anims/meson.build +++ b/res/battle/graphic/pl_batt_obj/anims/meson.build @@ -1,6 +1,9 @@ -pl_batt_obj_anims = files( +anims_uncompressed = files( 'pl_batt_obj_00000078.json', - 'pl_batt_obj_00000114.json', + 'pl_batt_obj_00000114.json' +) + +anims_compressed = files ( 'pl_batt_obj_00000115.json', 'pl_batt_obj_00000118.json', 'pl_batt_obj_00000123.json', @@ -54,22 +57,4 @@ pl_batt_obj_anims = files( 'bait_throw.json', 'mud_throw.json', 'party_gauge.json' -) - -pl_batt_obj_anims_data = files('data.json') - -pl_batt_obj_nanr = [] -foreach infile : pl_batt_obj_anims - pl_batt_obj_nanr += custom_target( - input: [infile, pl_batt_obj_anims_data], - output: '@BASENAME0@.NANR', - command: [ - make_pl_batt_obj_anims_py, - '--nitrogfx', nitrogfx_exe.full_path(), - '--input', '@INPUT0@', - '--output', '@OUTPUT@', - '--datafile', '@INPUT1@', - '--private-dir', '@PRIVATE_DIR@' - ] - ) -endforeach \ No newline at end of file +) \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/move_type_icon.json b/res/battle/graphic/pl_batt_obj/anims/move_type_icon.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/move_type_icon.json +++ b/res/battle/graphic/pl_batt_obj/anims/move_type_icon.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/mud_throw.json b/res/battle/graphic/pl_batt_obj/anims/mud_throw.json index 6eef63f5fb..c1a68f266d 100644 --- a/res/battle/graphic/pl_batt_obj/anims/mud_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/mud_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 4, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -24,8 +24,8 @@ }, { "frameCount": 4, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 6, diff --git a/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/party_gauge.json b/res/battle/graphic/pl_batt_obj/anims/party_gauge.json index c067cd0ea4..ed29d1668b 100644 --- a/res/battle/graphic/pl_batt_obj/anims/party_gauge.json +++ b/res/battle/graphic/pl_batt_obj/anims/party_gauge.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 1, @@ -36,8 +36,8 @@ }, { "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 1, @@ -67,8 +67,8 @@ }, { "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 1, @@ -98,8 +98,8 @@ }, { "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 1, @@ -129,8 +129,8 @@ }, { "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 1, @@ -160,8 +160,8 @@ }, { "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 1, @@ -191,8 +191,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, @@ -201,8 +201,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, @@ -211,8 +211,8 @@ }, { "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json index 7acc18ae7b..fa4997f1b4 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 16, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json index 15b51fdfb6..50c246eabb 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 6, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 0, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json index 877d94c41f..2cd09ec5dd 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 1, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 4, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json index e5581886f8..0613867b32 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json index 73a09b9b9a..207b518362 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 1, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json index 73a09b9b9a..207b518362 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 1, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json index 73a09b9b9a..207b518362 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 1, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json index 73a09b9b9a..207b518362 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 1, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json index 73a09b9b9a..207b518362 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 1, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json index 73a09b9b9a..207b518362 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 1, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json index 73a09b9b9a..207b518362 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 1, diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json index 73a09b9b9a..207b518362 100644 --- a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json +++ b/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 5, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 1, diff --git a/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json index d2bc97b3a5..4329f2102c 100644 --- a/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json b/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json index 75b651d177..40dc5fa639 100644 --- a/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json +++ b/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json @@ -5,8 +5,8 @@ "sequences": [{ "frameCount": 8, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 2, "frameData": [{ "frameDelay": 2, @@ -36,8 +36,8 @@ }, { "frameCount": 3, "loopStartFrame": 0, - "animationType": 0, - "animationType2": 1, + "animationElement": 0, + "animationType": 1, "playbackMode": 1, "frameData": [{ "frameDelay": 10, diff --git a/res/battle/graphic/pl_batt_obj/cells/data.json b/res/battle/graphic/pl_batt_obj/cells/data.json deleted file mode 100644 index 56b92dec07..0000000000 --- a/res/battle/graphic/pl_batt_obj/cells/data.json +++ /dev/null @@ -1,222 +0,0 @@ -[ - { - "target": "pl_batt_obj_00000077.json", - "compressed": false - }, - { - "target": "pl_batt_obj_00000113.json", - "compressed": false - }, - { - "target": "pl_batt_obj_00000116.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000119.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000122.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000125.json", - "compressed": true - }, - { - "target": "battle_terrain_player.json", - "compressed": true - }, - { - "target": "battle_terrain_opponent.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000178.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000181.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000184.json", - "compressed": true - }, - { - "target": "healthbox_singles_opponent.json", - "compressed": true - }, - { - "target": "healthbox_singles_player.json", - "compressed": true - }, - { - "target": "healthbox_doubles_opponent_1.json", - "compressed": true - }, - { - "target": "healthbox_doubles_opponent_2.json", - "compressed": true - }, - { - "target": "healthbox_doubles_player_1.json", - "compressed": true - }, - { - "target": "healthbox_doubles_player_2.json", - "compressed": true - }, - { - "target": "ball_status_indicator_opponent.json", - "compressed": true - }, - { - "target": "ball_status_indicator_player.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000210.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000213.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000216.json", - "compressed": true - }, - { - "target": "move_type_icon.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000248.json", - "compressed": true - }, - { - "target": "battle_subscreen_cursor_corner.json", - "compressed": true - }, - { - "target": "healthbox_safari.json", - "compressed": true - }, - { - "target": "bg_party_level_up.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000267.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000268.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000269.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000270.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000271.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000272.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000273.json", - "compressed": true - }, - { - "target": "pl_batt_obj_00000274.json", - "compressed": true - }, - { - "target": "poke_ball_throw.json", - "compressed": true - }, - { - "target": "master_ball_throw.json", - "compressed": true - }, - { - "target": "ultra_ball_throw.json", - "compressed": true - }, - { - "target": "great_ball_throw.json", - "compressed": true - }, - { - "target": "safari_ball_throw.json", - "compressed": true - }, - { - "target": "net_ball_throw.json", - "compressed": true - }, - { - "target": "dive_ball_throw.json", - "compressed": true - }, - { - "target": "nest_ball_throw.json", - "compressed": true - }, - { - "target": "repeat_ball_throw.json", - "compressed": true - }, - { - "target": "timer_ball_throw.json", - "compressed": true - }, - { - "target": "luxury_ball_throw.json", - "compressed": true - }, - { - "target": "premier_ball_throw.json", - "compressed": true - }, - { - "target": "quick_ball_throw.json", - "compressed": true - }, - { - "target": "dusk_ball_throw.json", - "compressed": true - }, - { - "target": "heal_ball_throw.json", - "compressed": true - }, - { - "target": "cherish_ball_throw.json", - "compressed": true - }, - { - "target": "park_ball_throw.json", - "compressed": true - }, - { - "target": "bait_throw.json", - "compressed": true - }, - { - "target": "mud_throw.json", - "compressed": true - }, - { - "target": "party_gauge.json", - "compressed": true - } -] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/cells/meson.build b/res/battle/graphic/pl_batt_obj/cells/meson.build index 958ba9509d..9a7273a3bb 100644 --- a/res/battle/graphic/pl_batt_obj/cells/meson.build +++ b/res/battle/graphic/pl_batt_obj/cells/meson.build @@ -1,6 +1,9 @@ -pl_batt_obj_cells = files( +cells_uncompressed = files( 'pl_batt_obj_00000077.json', - 'pl_batt_obj_00000113.json', + 'pl_batt_obj_00000113.json' +) + +cells_compressed = files( 'pl_batt_obj_00000116.json', 'pl_batt_obj_00000122.json', 'pl_batt_obj_00000125.json', @@ -55,21 +58,3 @@ pl_batt_obj_cells = files( 'healthbox_safari.json', 'bg_party_level_up.json' ) - -pl_batt_obj_cells_data = files('data.json') - -pl_batt_obj_ncer = [] -foreach infile : pl_batt_obj_cells - pl_batt_obj_ncer += custom_target( - input: [infile, pl_batt_obj_cells_data], - output: '@BASENAME0@.NCER', - command: [ - make_pl_batt_obj_cells_py, - '--nitrogfx', nitrogfx_exe.full_path(), - '--input', '@INPUT0@', - '--output', '@OUTPUT@', - '--datafile', '@INPUT1@', - '--private-dir', '@PRIVATE_DIR@' - ] - ) -endforeach \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index f0467cb5db..9ea9d80b5d 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -3,25 +3,71 @@ subdir('sprites') subdir('cells') subdir('anims') -pl_batt_order = files('order.txt') +nclr_normal = nclr_gen.process(palettes_normal, + extra_args: [ '-nopad', '-bitdepth', '4' ] +) +nclr_pcmp = nclr_gen.process(palettes_pcmp, + extra_args: [ '-nopad', '-bitdepth', '4', '-pcmp', '-invertsize' ] +) -nitrofs_files += custom_target('pl_batt_obj.narc', - output: 'pl_batt_obj.narc', +ncgr_uncompressed_64 = ncgr_gen.process(tiles_uncompressed_mapping_64, + extra_args: [ '-clobbersize', '-mappingtype', '64' ] +) +ncgr_uncompressed_128 = ncgr_gen.process(tiles_uncompressed_mapping_128, + extra_args: [ '-clobbersize', '-mappingtype', '128' ] +) +ncgr_compressed_64 = lz_gen.process(ncgr_gen.process(tiles_compressed_mapping_64, + extra_args: [ '-clobbersize', '-mappingtype', '64' ] +)) +ncgr_compressed_32 = lz_gen.process(ncgr_gen.process(tiles_compressed_mapping_32, + extra_args: [ '-clobbersize', '-mappingtype', '32' ] +)) +ncgr_compressed_64_v101 = lz_gen.process(ncgr_gen.process(tiles_compressed_mapping_64_v101, + extra_args: [ '-clobbersize', '-mappingtype', '64', '-version101' ] +)) +ncgr_compressed_32_v101 = lz_gen.process(ncgr_gen.process(tiles_compressed_mapping_32_v101, + extra_args: [ '-clobbersize', '-mappingtype', '32', '-version101' ] +)) +ncgr_compressed_vram = lz_gen.process(ncgr_gen.process(tiles_compressed_vram_transfer, + extra_args: [ '-clobbersize', '-mappingtype', '64', '-vram', '-num_tiles', '500' ] +)) + +ncer_uncompressed = ncer_gen.process(cells_uncompressed) +ncer_compressed = lz_gen.process(ncer_gen.process(cells_compressed)) + +nanr_uncompressed = nanr_gen.process(anims_uncompressed) +nanr_compressed = lz_gen.process(nanr_gen.process(anims_compressed)) + +pl_batt_obj_order = files('pl_batt_obj.order') +pl_batt_obj_narc = custom_target('pl_batt_obj.narc', + output: [ + 'pl_batt_obj.narc', + 'pl_batt_obj.naix', + ], input: [ - pl_batt_order, - pl_batt_obj_nclr, - pl_batt_obj_nanr, - pl_batt_obj_ncgr, - pl_batt_obj_ncer + nclr_normal, + nclr_pcmp, + ncgr_uncompressed_64, + ncgr_uncompressed_128, + ncgr_compressed_64, + ncgr_compressed_32, + ncgr_compressed_64_v101, + ncgr_compressed_32_v101, + ncgr_compressed_vram, + ncer_uncompressed, + ncer_compressed, + nanr_uncompressed, + nanr_compressed, + pl_batt_obj_order ], command: [ knarc_exe, '-d', '@PRIVATE_DIR@', - '-o', '@INPUT0@', + '-p', '@OUTPUT0@', + '--order', pl_batt_obj_order, '--naix', - '--verbose', - '-p', - '@OUTPUT@' - ], - build_always_stale: true -) \ No newline at end of file + ] +) + +nitrofs_files += pl_batt_obj_narc[0] +naix_headers += pl_batt_obj_narc[1] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/pl_batt_obj/palettes/meson.build index 197f1cd876..91c03b61ab 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/meson.build +++ b/res/battle/graphic/pl_batt_obj/palettes/meson.build @@ -1,5 +1,32 @@ -pl_batt_obj_palettes = files( +palettes_normal = files( 'pl_batt_obj_00000000.pal', + 'battle_terrain_tower_day.pal', + 'battle_terrain_tower_afternoon.pal', + 'battle_terrain_tower_night.pal', + 'battle_terrain_factory_day.pal', + 'battle_terrain_factory_afternoon.pal', + 'battle_terrain_factory_night.pal', + 'battle_terrain_arcade_day.pal', + 'battle_terrain_arcade_afternoon.pal', + 'battle_terrain_arcade_night.pal', + 'battle_terrain_castle_day.pal', + 'battle_terrain_castle_afternoon.pal', + 'battle_terrain_castle_night.pal', + 'battle_terrain_hall_day.pal', + 'battle_terrain_hall_afternoon.pal', + 'battle_terrain_hall_night.pal', + 'pl_batt_obj_00000070.pal', + 'player_lucas_back.pal', + 'player_dawn_back.pal', + 'player_barry_back.pal', + 'player_cheryl_back.pal', + 'player_riley_back.pal', + 'player_marley_back.pal', + 'player_buck_back.pal', + 'player_mira_back.pal' +) + +palettes_pcmp = files( 'battle_terrain_grass_day.pal', 'battle_terrain_grass_afternoon.pal', 'battle_terrain_grass_night.pal', @@ -51,25 +78,9 @@ pl_batt_obj_palettes = files( 'battle_terrain_distortion_world_day.pal', 'battle_terrain_distortion_world_afternoon.pal', 'battle_terrain_distortion_world_night.pal', - 'battle_terrain_tower_day.pal', - 'battle_terrain_tower_afternoon.pal', - 'battle_terrain_tower_night.pal', - 'battle_terrain_factory_day.pal', - 'battle_terrain_factory_afternoon.pal', - 'battle_terrain_factory_night.pal', - 'battle_terrain_arcade_day.pal', - 'battle_terrain_arcade_afternoon.pal', - 'battle_terrain_arcade_night.pal', - 'battle_terrain_castle_day.pal', - 'battle_terrain_castle_afternoon.pal', - 'battle_terrain_castle_night.pal', - 'battle_terrain_hall_day.pal', - 'battle_terrain_hall_afternoon.pal', - 'battle_terrain_hall_night.pal', 'battle_terrain_giratina_day.pal', 'battle_terrain_giratina_afternoon.pal', 'battle_terrain_giratina_night.pal', - 'pl_batt_obj_00000070.pal', 'healthbox_normal.pal', 'pl_batt_obj_00000072.pal', 'pl_batt_obj_00000073.pal', @@ -79,14 +90,6 @@ pl_batt_obj_palettes = files( 'battle_subscreen_cursor_corner.pal', 'healthbox_safari.pal', 'bg_party_level_up.pal', - 'player_lucas_back.pal', - 'player_dawn_back.pal', - 'player_barry_back.pal', - 'player_cheryl_back.pal', - 'player_riley_back.pal', - 'player_marley_back.pal', - 'player_buck_back.pal', - 'player_mira_back.pal', 'poke_ball_throw.pal', 'master_ball_throw.pal', 'ultra_ball_throw.pal', @@ -109,26 +112,3 @@ pl_batt_obj_palettes = files( 'party_gauge.pal', 'pl_batt_obj_00000111.pal' ) - -# for some reason, the pcmp file 'size' field is the real size subtracted from 512 -# (e.g., actual numColors=16, size should=32, but real size is 512-32=480) -# is this part of the standard? nitrogfx can't currently handle it. -# requires a Python script for a fix. - -pl_batt_obj_palette_data = files('data.json') - -pl_batt_obj_nclr = [] -foreach infile : pl_batt_obj_palettes - pl_batt_obj_nclr += custom_target( - input: [infile, pl_batt_obj_palette_data], - output: '@BASENAME0@.NCLR', - command: [ - make_pl_batt_obj_palettes_py, - '--nitrogfx', nitrogfx_exe.full_path(), - '--input', '@INPUT0@', - '--output', '@OUTPUT@', - '--datafile', '@INPUT1@', - '--private-dir', '@PRIVATE_DIR@' - ] - ) -endforeach \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/order.txt b/res/battle/graphic/pl_batt_obj/pl_batt_obj.order similarity index 96% rename from res/battle/graphic/pl_batt_obj/order.txt rename to res/battle/graphic/pl_batt_obj/pl_batt_obj.order index ca932766b2..9c1547efbd 100644 --- a/res/battle/graphic/pl_batt_obj/order.txt +++ b/res/battle/graphic/pl_batt_obj/pl_batt_obj.order @@ -1,343 +1,343 @@ -pl_batt_obj_00000000.nclr -battle_terrain_grass_day.nclr -battle_terrain_grass_afternoon.nclr -battle_terrain_grass_night.nclr -battle_terrain_surf_day.nclr -battle_terrain_surf_afternoon.nclr -battle_terrain_surf_night.nclr -battle_terrain_path_day.nclr -battle_terrain_path_afternoon.nclr -battle_terrain_path_night.nclr -battle_terrain_ice_day.nclr -battle_terrain_ice_afternoon.nclr -battle_terrain_ice_night.nclr -battle_terrain_mountain_day.nclr -battle_terrain_mountain_afternoon.nclr -battle_terrain_mountain_night.nclr -battle_terrain_snow_day.nclr -battle_terrain_snow_afternoon.nclr -battle_terrain_snow_night.nclr -battle_terrain_indoors_day.nclr -battle_terrain_indoors_afternoon.nclr -battle_terrain_indoors_night.nclr -battle_terrain_sand_day.nclr -battle_terrain_sand_afternoon.nclr -battle_terrain_sand_night.nclr -battle_terrain_mud_day.nclr -battle_terrain_mud_afternoon.nclr -battle_terrain_mud_night.nclr -battle_terrain_cave_day.nclr -battle_terrain_cave_afternoon.nclr -battle_terrain_cave_night.nclr -battle_terrain_puddle_day.nclr -battle_terrain_puddle_afternoon.nclr -battle_terrain_puddle_night.nclr -battle_terrain_elite4_aaron_day.nclr -battle_terrain_elite4_aaron_afternoon.nclr -battle_terrain_elite4_aaron_night.nclr -battle_terrain_elite4_bertha_day.nclr -battle_terrain_elite4_bertha_afternoon.nclr -battle_terrain_elite4_bertha_night.nclr -battle_terrain_elite4_flint_day.nclr -battle_terrain_elite4_flint_afternoon.nclr -battle_terrain_elite4_flint_night.nclr -battle_terrain_elite4_lucian_day.nclr -battle_terrain_elite4_lucian_afternoon.nclr -battle_terrain_elite4_lucian_night.nclr -battle_terrain_champion_day.nclr -battle_terrain_champion_afternoon.nclr -battle_terrain_champion_night.nclr -battle_terrain_distortion_world_day.nclr -battle_terrain_distortion_world_afternoon.nclr -battle_terrain_distortion_world_night.nclr -battle_terrain_tower_day.nclr -battle_terrain_tower_afternoon.nclr -battle_terrain_tower_night.nclr -battle_terrain_factory_day.nclr -battle_terrain_factory_afternoon.nclr -battle_terrain_factory_night.nclr -battle_terrain_arcade_day.nclr -battle_terrain_arcade_afternoon.nclr -battle_terrain_arcade_night.nclr -battle_terrain_castle_day.nclr -battle_terrain_castle_afternoon.nclr -battle_terrain_castle_night.nclr -battle_terrain_hall_day.nclr -battle_terrain_hall_afternoon.nclr -battle_terrain_hall_night.nclr -battle_terrain_giratina_day.nclr -battle_terrain_giratina_afternoon.nclr -battle_terrain_giratina_night.nclr -pl_batt_obj_00000070.nclr -healthbox_normal.nclr -pl_batt_obj_00000072.nclr -pl_batt_obj_00000073.nclr -icon_palettes.nclr -pl_batt_obj_00000075.nclr -pl_batt_obj_00000076.ncgr -pl_batt_obj_00000077.ncer -pl_batt_obj_00000078.nanr -pl_batt_obj_00000079.nclr -battle_subscreen_cursor_corner.nclr -healthbox_safari.nclr -bg_party_level_up.nclr -player_lucas_back.nclr -player_dawn_back.nclr -player_barry_back.nclr -player_cheryl_back.nclr -player_riley_back.nclr -player_marley_back.nclr -player_buck_back.nclr -player_mira_back.nclr -poke_ball_throw.nclr -master_ball_throw.nclr -ultra_ball_throw.nclr -great_ball_throw.nclr -safari_ball_throw.nclr -net_ball_throw.nclr -dive_ball_throw.nclr -nest_ball_throw.nclr -repeat_ball_throw.nclr -timer_ball_throw.nclr -luxury_ball_throw.nclr -premier_ball_throw.nclr -quick_ball_throw.nclr -dusk_ball_throw.nclr -heal_ball_throw.nclr -cherish_ball_throw.nclr -park_ball_throw.nclr -bait_throw.nclr -mud_throw.nclr -party_gauge.nclr -pl_batt_obj_00000111.nclr -pl_batt_obj_00000112.ncgr -pl_batt_obj_00000113.ncer -pl_batt_obj_00000114.nanr -pl_batt_obj_00000115.nanr -pl_batt_obj_00000116.ncer -pl_batt_obj_00000117.ncgr -pl_batt_obj_00000118.nanr -pl_batt_obj_00000119.ncer -pl_batt_obj_00000120.ncgr -pl_batt_obj_00000121.ncgr -pl_batt_obj_00000122.ncer -pl_batt_obj_00000123.nanr -pl_batt_obj_00000124.ncgr -pl_batt_obj_00000125.ncer -pl_batt_obj_00000126.nanr -battle_terrain_grass_player.ncgr -battle_terrain_player.ncer -battle_terrain_player.nanr -battle_terrain_grass_opponent.ncgr -battle_terrain_opponent.ncer -battle_terrain_opponent.nanr -battle_terrain_surf_player.ncgr -battle_terrain_surf_opponent.ncgr -battle_terrain_path_player.ncgr -battle_terrain_path_opponent.ncgr -battle_terrain_ice_player.ncgr -battle_terrain_ice_opponent.ncgr -battle_terrain_mountain_player.ncgr -battle_terrain_mountain_opponent.ncgr -battle_terrain_snow_player.ncgr -battle_terrain_snow_opponent.ncgr -battle_terrain_indoors_player.ncgr -battle_terrain_indoors_opponent.ncgr -battle_terrain_sand_player.ncgr -battle_terrain_sand_opponent.ncgr -battle_terrain_mud_player.ncgr -battle_terrain_mud_opponent.ncgr -battle_terrain_cave_player.ncgr -battle_terrain_cave_opponent.ncgr -battle_terrain_puddle_player.ncgr -battle_terrain_puddle_opponent.ncgr -battle_terrain_elite4_aaron_player.ncgr -battle_terrain_elite4_aaron_opponent.ncgr -battle_terrain_elite4_bertha_player.ncgr -battle_terrain_elite4_bertha_opponent.ncgr -battle_terrain_elite4_flint_player.ncgr -battle_terrain_elite4_flint_opponent.ncgr -battle_terrain_elite4_lucian_player.ncgr -battle_terrain_elite4_lucian_opponent.ncgr -battle_terrain_champion_player.ncgr -battle_terrain_champion_opponent.ncgr -battle_terrain_distortion_world_player.ncgr -battle_terrain_distortion_world_opponent.ncgr -battle_terrain_tower_player.ncgr -battle_terrain_tower_opponent.ncgr -battle_terrain_factory_player.ncgr -battle_terrain_factory_opponent.ncgr -battle_terrain_arcade_player.ncgr -battle_terrain_arcade_opponent.ncgr -battle_terrain_castle_player.ncgr -battle_terrain_castle_opponent.ncgr -battle_terrain_hall_player.ncgr -battle_terrain_hall_opponent.ncgr -battle_terrain_giratina_player.ncgr -battle_terrain_giratina_opponent.ncgr -pl_batt_obj_00000177.nanr -pl_batt_obj_00000178.ncer -pl_batt_obj_00000179.ncgr -pl_batt_obj_00000180.nanr -pl_batt_obj_00000181.ncer -pl_batt_obj_00000182.ncgr -pl_batt_obj_00000183.nanr -pl_batt_obj_00000184.ncer -pl_batt_obj_00000185.ncgr -healthbox_singles_opponent.nanr -healthbox_singles_opponent.ncer -healthbox_singles_opponent.ncgr -healthbox_singles_player.nanr -healthbox_singles_player.ncer -healthbox_singles_player.ncgr -healthbox_doubles_opponent_1.nanr -healthbox_doubles_opponent_1.ncer -healthbox_doubles_opponent_1.ncgr -healthbox_doubles_opponent_2.nanr -healthbox_doubles_opponent_2.ncer -healthbox_doubles_opponent_2.ncgr -healthbox_doubles_player_1.nanr -healthbox_doubles_player_1.ncer -healthbox_doubles_player_1.ncgr -healthbox_doubles_player_2.nanr -healthbox_doubles_player_2.ncer -healthbox_doubles_player_2.ncgr -ball_status_indicator_opponent.ncer -ball_status_indicator_opponent.ncgr -ball_status_indicator_opponent.nanr -ball_status_indicator_player.ncer -ball_status_indicator_player.ncgr -ball_status_indicator_player.nanr -pl_batt_obj_00000210.ncer -pl_batt_obj_00000211.ncgr -pl_batt_obj_00000212.nanr -pl_batt_obj_00000213.ncer -pl_batt_obj_00000214.ncgr -pl_batt_obj_00000215.nanr -pl_batt_obj_00000216.ncer -pl_batt_obj_00000217.ncgr -pl_batt_obj_00000218.nanr -contest_icon_beauty.ncgr -contest_icon_cute.ncgr -type_icon_dragon.ncgr -type_icon_electric.ncgr -type_icon_psychic.ncgr -type_icon_dark.ncgr -type_icon_fighting.ncgr -type_icon_fire.ncgr -type_icon_flying.ncgr -type_icon_ghost.ncgr -type_icon_ground.ncgr -type_icon_ice.ncgr -type_icon_bug.ncgr -contest_icon_smart.ncgr -type_icon_grass.ncgr -type_icon_normal.ncgr -type_icon_poison.ncgr -type_icon_mystery.ncgr -type_icon_rock.ncgr -type_icon_steel.ncgr -contest_icon_tough.ncgr -contest_icon_cool.ncgr -type_icon_water.ncgr -move_type_icon.ncer -move_type_icon.nanr -move_class_physical.ncgr -move_class_status.ncgr -move_class_special.ncgr -pl_batt_obj_00000247.ncgr -pl_batt_obj_00000248.ncer -pl_batt_obj_00000249.nanr -battle_subscreen_cursor_corner.ncgr -battle_subscreen_cursor_corner.ncer -battle_subscreen_cursor_corner.nanr -healthbox_safari.ncgr -healthbox_safari.ncer -healthbox_safari.nanr -bg_party_level_up.ncgr -bg_party_level_up.ncer -bg_party_level_up.nanr -player_lucas_back.ncgr -player_dawn_back.ncgr -player_barry_back.ncgr -player_cheryl_back.ncgr -player_riley_back.ncgr -player_marley_back.ncgr -player_buck_back.ncgr -player_mira_back.ncgr -pl_batt_obj_00000267.ncer -pl_batt_obj_00000268.ncer -pl_batt_obj_00000269.ncer -pl_batt_obj_00000270.ncer -pl_batt_obj_00000271.ncer -pl_batt_obj_00000272.ncer -pl_batt_obj_00000273.ncer -pl_batt_obj_00000274.ncer -pl_batt_obj_00000275.nanr -pl_batt_obj_00000276.nanr -pl_batt_obj_00000277.nanr -pl_batt_obj_00000278.nanr -pl_batt_obj_00000279.nanr -pl_batt_obj_00000280.nanr -pl_batt_obj_00000281.nanr -pl_batt_obj_00000282.nanr -poke_ball_throw.nanr -poke_ball_throw.ncer -poke_ball_throw.ncgr -master_ball_throw.nanr -master_ball_throw.ncer -master_ball_throw.ncgr -ultra_ball_throw.nanr -ultra_ball_throw.ncer -ultra_ball_throw.ncgr -great_ball_throw.nanr -great_ball_throw.ncer -great_ball_throw.ncgr -safari_ball_throw.nanr -safari_ball_throw.ncer -safari_ball_throw.ncgr -net_ball_throw.nanr -net_ball_throw.ncer -net_ball_throw.ncgr -dive_ball_throw.nanr -dive_ball_throw.ncer -dive_ball_throw.ncgr -nest_ball_throw.nanr -nest_ball_throw.ncer -nest_ball_throw.ncgr -repeat_ball_throw.nanr -repeat_ball_throw.ncer -repeat_ball_throw.ncgr -timer_ball_throw.nanr -timer_ball_throw.ncer -timer_ball_throw.ncgr -luxury_ball_throw.nanr -luxury_ball_throw.ncer -luxury_ball_throw.ncgr -premier_ball_throw.nanr -premier_ball_throw.ncer -premier_ball_throw.ncgr -quick_ball_throw.nanr -quick_ball_throw.ncer -quick_ball_throw.ncgr -dusk_ball_throw.nanr -dusk_ball_throw.ncer -dusk_ball_throw.ncgr -heal_ball_throw.nanr -heal_ball_throw.ncer -heal_ball_throw.ncgr -cherish_ball_throw.nanr -cherish_ball_throw.ncer -cherish_ball_throw.ncgr -park_ball_throw.nanr -park_ball_throw.ncer -park_ball_throw.ncgr -bait_throw.nanr -bait_throw.ncer -bait_throw.ncgr -mud_throw.nanr -mud_throw.ncer -mud_throw.ncgr -party_gauge.ncgr -party_gauge.ncer +pl_batt_obj_00000000.nclr +battle_terrain_grass_day.nclr +battle_terrain_grass_afternoon.nclr +battle_terrain_grass_night.nclr +battle_terrain_surf_day.nclr +battle_terrain_surf_afternoon.nclr +battle_terrain_surf_night.nclr +battle_terrain_path_day.nclr +battle_terrain_path_afternoon.nclr +battle_terrain_path_night.nclr +battle_terrain_ice_day.nclr +battle_terrain_ice_afternoon.nclr +battle_terrain_ice_night.nclr +battle_terrain_mountain_day.nclr +battle_terrain_mountain_afternoon.nclr +battle_terrain_mountain_night.nclr +battle_terrain_snow_day.nclr +battle_terrain_snow_afternoon.nclr +battle_terrain_snow_night.nclr +battle_terrain_indoors_day.nclr +battle_terrain_indoors_afternoon.nclr +battle_terrain_indoors_night.nclr +battle_terrain_sand_day.nclr +battle_terrain_sand_afternoon.nclr +battle_terrain_sand_night.nclr +battle_terrain_mud_day.nclr +battle_terrain_mud_afternoon.nclr +battle_terrain_mud_night.nclr +battle_terrain_cave_day.nclr +battle_terrain_cave_afternoon.nclr +battle_terrain_cave_night.nclr +battle_terrain_puddle_day.nclr +battle_terrain_puddle_afternoon.nclr +battle_terrain_puddle_night.nclr +battle_terrain_elite4_aaron_day.nclr +battle_terrain_elite4_aaron_afternoon.nclr +battle_terrain_elite4_aaron_night.nclr +battle_terrain_elite4_bertha_day.nclr +battle_terrain_elite4_bertha_afternoon.nclr +battle_terrain_elite4_bertha_night.nclr +battle_terrain_elite4_flint_day.nclr +battle_terrain_elite4_flint_afternoon.nclr +battle_terrain_elite4_flint_night.nclr +battle_terrain_elite4_lucian_day.nclr +battle_terrain_elite4_lucian_afternoon.nclr +battle_terrain_elite4_lucian_night.nclr +battle_terrain_champion_day.nclr +battle_terrain_champion_afternoon.nclr +battle_terrain_champion_night.nclr +battle_terrain_distortion_world_day.nclr +battle_terrain_distortion_world_afternoon.nclr +battle_terrain_distortion_world_night.nclr +battle_terrain_tower_day.nclr +battle_terrain_tower_afternoon.nclr +battle_terrain_tower_night.nclr +battle_terrain_factory_day.nclr +battle_terrain_factory_afternoon.nclr +battle_terrain_factory_night.nclr +battle_terrain_arcade_day.nclr +battle_terrain_arcade_afternoon.nclr +battle_terrain_arcade_night.nclr +battle_terrain_castle_day.nclr +battle_terrain_castle_afternoon.nclr +battle_terrain_castle_night.nclr +battle_terrain_hall_day.nclr +battle_terrain_hall_afternoon.nclr +battle_terrain_hall_night.nclr +battle_terrain_giratina_day.nclr +battle_terrain_giratina_afternoon.nclr +battle_terrain_giratina_night.nclr +pl_batt_obj_00000070.nclr +healthbox_normal.nclr +pl_batt_obj_00000072.nclr +pl_batt_obj_00000073.nclr +icon_palettes.nclr +pl_batt_obj_00000075.nclr +pl_batt_obj_00000076.ncgr +pl_batt_obj_00000077.ncer +pl_batt_obj_00000078.nanr +pl_batt_obj_00000079.nclr +battle_subscreen_cursor_corner.nclr +healthbox_safari.nclr +bg_party_level_up.nclr +player_lucas_back.nclr +player_dawn_back.nclr +player_barry_back.nclr +player_cheryl_back.nclr +player_riley_back.nclr +player_marley_back.nclr +player_buck_back.nclr +player_mira_back.nclr +poke_ball_throw.nclr +master_ball_throw.nclr +ultra_ball_throw.nclr +great_ball_throw.nclr +safari_ball_throw.nclr +net_ball_throw.nclr +dive_ball_throw.nclr +nest_ball_throw.nclr +repeat_ball_throw.nclr +timer_ball_throw.nclr +luxury_ball_throw.nclr +premier_ball_throw.nclr +quick_ball_throw.nclr +dusk_ball_throw.nclr +heal_ball_throw.nclr +cherish_ball_throw.nclr +park_ball_throw.nclr +bait_throw.nclr +mud_throw.nclr +party_gauge.nclr +pl_batt_obj_00000111.nclr +pl_batt_obj_00000112.ncgr +pl_batt_obj_00000113.ncer +pl_batt_obj_00000114.nanr +pl_batt_obj_00000115.nanr +pl_batt_obj_00000116.ncer +pl_batt_obj_00000117.ncgr +pl_batt_obj_00000118.nanr +pl_batt_obj_00000119.ncer +pl_batt_obj_00000120.ncgr +pl_batt_obj_00000121.ncgr +pl_batt_obj_00000122.ncer +pl_batt_obj_00000123.nanr +pl_batt_obj_00000124.ncgr +pl_batt_obj_00000125.ncer +pl_batt_obj_00000126.nanr +battle_terrain_grass_player.ncgr +battle_terrain_player.ncer +battle_terrain_player.nanr +battle_terrain_grass_opponent.ncgr +battle_terrain_opponent.ncer +battle_terrain_opponent.nanr +battle_terrain_surf_player.ncgr +battle_terrain_surf_opponent.ncgr +battle_terrain_path_player.ncgr +battle_terrain_path_opponent.ncgr +battle_terrain_ice_player.ncgr +battle_terrain_ice_opponent.ncgr +battle_terrain_mountain_player.ncgr +battle_terrain_mountain_opponent.ncgr +battle_terrain_snow_player.ncgr +battle_terrain_snow_opponent.ncgr +battle_terrain_indoors_player.ncgr +battle_terrain_indoors_opponent.ncgr +battle_terrain_sand_player.ncgr +battle_terrain_sand_opponent.ncgr +battle_terrain_mud_player.ncgr +battle_terrain_mud_opponent.ncgr +battle_terrain_cave_player.ncgr +battle_terrain_cave_opponent.ncgr +battle_terrain_puddle_player.ncgr +battle_terrain_puddle_opponent.ncgr +battle_terrain_elite4_aaron_player.ncgr +battle_terrain_elite4_aaron_opponent.ncgr +battle_terrain_elite4_bertha_player.ncgr +battle_terrain_elite4_bertha_opponent.ncgr +battle_terrain_elite4_flint_player.ncgr +battle_terrain_elite4_flint_opponent.ncgr +battle_terrain_elite4_lucian_player.ncgr +battle_terrain_elite4_lucian_opponent.ncgr +battle_terrain_champion_player.ncgr +battle_terrain_champion_opponent.ncgr +battle_terrain_distortion_world_player.ncgr +battle_terrain_distortion_world_opponent.ncgr +battle_terrain_tower_player.ncgr +battle_terrain_tower_opponent.ncgr +battle_terrain_factory_player.ncgr +battle_terrain_factory_opponent.ncgr +battle_terrain_arcade_player.ncgr +battle_terrain_arcade_opponent.ncgr +battle_terrain_castle_player.ncgr +battle_terrain_castle_opponent.ncgr +battle_terrain_hall_player.ncgr +battle_terrain_hall_opponent.ncgr +battle_terrain_giratina_player.ncgr +battle_terrain_giratina_opponent.ncgr +pl_batt_obj_00000177.nanr +pl_batt_obj_00000178.ncer +pl_batt_obj_00000179.ncgr +pl_batt_obj_00000180.nanr +pl_batt_obj_00000181.ncer +pl_batt_obj_00000182.ncgr +pl_batt_obj_00000183.nanr +pl_batt_obj_00000184.ncer +pl_batt_obj_00000185.ncgr +healthbox_singles_opponent.nanr +healthbox_singles_opponent.ncer +healthbox_singles_opponent.ncgr +healthbox_singles_player.nanr +healthbox_singles_player.ncer +healthbox_singles_player.ncgr +healthbox_doubles_opponent_1.nanr +healthbox_doubles_opponent_1.ncer +healthbox_doubles_opponent_1.ncgr +healthbox_doubles_opponent_2.nanr +healthbox_doubles_opponent_2.ncer +healthbox_doubles_opponent_2.ncgr +healthbox_doubles_player_1.nanr +healthbox_doubles_player_1.ncer +healthbox_doubles_player_1.ncgr +healthbox_doubles_player_2.nanr +healthbox_doubles_player_2.ncer +healthbox_doubles_player_2.ncgr +ball_status_indicator_opponent.ncer +ball_status_indicator_opponent.ncgr +ball_status_indicator_opponent.nanr +ball_status_indicator_player.ncer +ball_status_indicator_player.ncgr +ball_status_indicator_player.nanr +pl_batt_obj_00000210.ncer +pl_batt_obj_00000211.ncgr +pl_batt_obj_00000212.nanr +pl_batt_obj_00000213.ncer +pl_batt_obj_00000214.ncgr +pl_batt_obj_00000215.nanr +pl_batt_obj_00000216.ncer +pl_batt_obj_00000217.ncgr +pl_batt_obj_00000218.nanr +contest_icon_beauty.ncgr +contest_icon_cute.ncgr +type_icon_dragon.ncgr +type_icon_electric.ncgr +type_icon_psychic.ncgr +type_icon_dark.ncgr +type_icon_fighting.ncgr +type_icon_fire.ncgr +type_icon_flying.ncgr +type_icon_ghost.ncgr +type_icon_ground.ncgr +type_icon_ice.ncgr +type_icon_bug.ncgr +contest_icon_smart.ncgr +type_icon_grass.ncgr +type_icon_normal.ncgr +type_icon_poison.ncgr +type_icon_mystery.ncgr +type_icon_rock.ncgr +type_icon_steel.ncgr +contest_icon_tough.ncgr +contest_icon_cool.ncgr +type_icon_water.ncgr +move_type_icon.ncer +move_type_icon.nanr +move_class_physical.ncgr +move_class_status.ncgr +move_class_special.ncgr +pl_batt_obj_00000247.ncgr +pl_batt_obj_00000248.ncer +pl_batt_obj_00000249.nanr +battle_subscreen_cursor_corner.ncgr +battle_subscreen_cursor_corner.ncer +battle_subscreen_cursor_corner.nanr +healthbox_safari.ncgr +healthbox_safari.ncer +healthbox_safari.nanr +bg_party_level_up.ncgr +bg_party_level_up.ncer +bg_party_level_up.nanr +player_lucas_back.ncgr +player_dawn_back.ncgr +player_barry_back.ncgr +player_cheryl_back.ncgr +player_riley_back.ncgr +player_marley_back.ncgr +player_buck_back.ncgr +player_mira_back.ncgr +pl_batt_obj_00000267.ncer +pl_batt_obj_00000268.ncer +pl_batt_obj_00000269.ncer +pl_batt_obj_00000270.ncer +pl_batt_obj_00000271.ncer +pl_batt_obj_00000272.ncer +pl_batt_obj_00000273.ncer +pl_batt_obj_00000274.ncer +pl_batt_obj_00000275.nanr +pl_batt_obj_00000276.nanr +pl_batt_obj_00000277.nanr +pl_batt_obj_00000278.nanr +pl_batt_obj_00000279.nanr +pl_batt_obj_00000280.nanr +pl_batt_obj_00000281.nanr +pl_batt_obj_00000282.nanr +poke_ball_throw.nanr +poke_ball_throw.ncer +poke_ball_throw.ncgr +master_ball_throw.nanr +master_ball_throw.ncer +master_ball_throw.ncgr +ultra_ball_throw.nanr +ultra_ball_throw.ncer +ultra_ball_throw.ncgr +great_ball_throw.nanr +great_ball_throw.ncer +great_ball_throw.ncgr +safari_ball_throw.nanr +safari_ball_throw.ncer +safari_ball_throw.ncgr +net_ball_throw.nanr +net_ball_throw.ncer +net_ball_throw.ncgr +dive_ball_throw.nanr +dive_ball_throw.ncer +dive_ball_throw.ncgr +nest_ball_throw.nanr +nest_ball_throw.ncer +nest_ball_throw.ncgr +repeat_ball_throw.nanr +repeat_ball_throw.ncer +repeat_ball_throw.ncgr +timer_ball_throw.nanr +timer_ball_throw.ncer +timer_ball_throw.ncgr +luxury_ball_throw.nanr +luxury_ball_throw.ncer +luxury_ball_throw.ncgr +premier_ball_throw.nanr +premier_ball_throw.ncer +premier_ball_throw.ncgr +quick_ball_throw.nanr +quick_ball_throw.ncer +quick_ball_throw.ncgr +dusk_ball_throw.nanr +dusk_ball_throw.ncer +dusk_ball_throw.ncgr +heal_ball_throw.nanr +heal_ball_throw.ncer +heal_ball_throw.ncgr +cherish_ball_throw.nanr +cherish_ball_throw.ncer +cherish_ball_throw.ncgr +park_ball_throw.nanr +park_ball_throw.ncer +park_ball_throw.ncgr +bait_throw.nanr +bait_throw.ncer +bait_throw.ncgr +mud_throw.nanr +mud_throw.ncer +mud_throw.ncgr +party_gauge.ncgr +party_gauge.ncer party_gauge.nanr \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/sprites/meson.build b/res/battle/graphic/pl_batt_obj/sprites/meson.build index e2f55c25e4..b8ddf6309f 100644 --- a/res/battle/graphic/pl_batt_obj/sprites/meson.build +++ b/res/battle/graphic/pl_batt_obj/sprites/meson.build @@ -1,6 +1,12 @@ -pl_batt_obj_sprites = files( - 'pl_batt_obj_00000076.png', - 'pl_batt_obj_00000112.png', +tiles_uncompressed_mapping_64 = files( + 'pl_batt_obj_00000076.png' +) + +tiles_uncompressed_mapping_128 = files( + 'pl_batt_obj_00000112.png' +) + +tiles_compressed_mapping_64 = files( 'pl_batt_obj_00000117.png', 'pl_batt_obj_00000120.png', 'pl_batt_obj_00000121.png', @@ -51,20 +57,56 @@ pl_batt_obj_sprites = files( 'battle_terrain_hall_opponent.png', 'battle_terrain_giratina_player.png', 'battle_terrain_giratina_opponent.png', - 'pl_batt_obj_00000179.png', 'pl_batt_obj_00000182.png', 'pl_batt_obj_00000185.png', - 'healthbox_singles_opponent.png', - 'healthbox_singles_player.png', - 'healthbox_doubles_opponent_1.png', - 'healthbox_doubles_opponent_2.png', - 'healthbox_doubles_player_1.png', - 'healthbox_doubles_player_2.png', + 'pl_batt_obj_00000247.png', + 'healthbox_safari.png', + 'bg_party_level_up.png', + 'poke_ball_throw.png', + 'master_ball_throw.png', + 'ultra_ball_throw.png', + 'great_ball_throw.png', + 'safari_ball_throw.png', + 'net_ball_throw.png', + 'dive_ball_throw.png', + 'nest_ball_throw.png', + 'repeat_ball_throw.png', + 'timer_ball_throw.png', + 'luxury_ball_throw.png', + 'premier_ball_throw.png', + 'quick_ball_throw.png', + 'dusk_ball_throw.png', + 'heal_ball_throw.png', + 'cherish_ball_throw.png', + 'park_ball_throw.png', + 'bait_throw.png', + 'mud_throw.png', + 'party_gauge.png' +) + +tiles_compressed_mapping_32 = files( + 'pl_batt_obj_00000179.png', 'ball_status_indicator_opponent.png', 'ball_status_indicator_player.png', 'pl_batt_obj_00000211.png', 'pl_batt_obj_00000214.png', 'pl_batt_obj_00000217.png', + 'move_class_physical.png', + 'move_class_status.png', + 'move_class_special.png', + 'battle_subscreen_cursor_corner.png' +) + +tiles_compressed_mapping_64_v101 = files( + 'healthbox_singles_opponent.png', + 'healthbox_singles_player.png', + 'healthbox_doubles_opponent_1.png', + 'healthbox_doubles_opponent_2.png', + 'healthbox_doubles_player_1.png', + 'healthbox_doubles_player_2.png' +) + +tiles_compressed_mapping_32_v101 = files( 'contest_icon_beauty.png', 'contest_icon_cute.png', 'type_icon_dragon.png', @@ -87,14 +129,10 @@ pl_batt_obj_sprites = files( 'type_icon_steel.png', 'contest_icon_tough.png', 'contest_icon_cool.png', - 'type_icon_water.png', - 'move_class_physical.png', - 'move_class_status.png', - 'move_class_special.png', - 'pl_batt_obj_00000247.png', - 'battle_subscreen_cursor_corner.png', - 'healthbox_safari.png', - 'bg_party_level_up.png', + 'type_icon_water.png' +) + +tiles_compressed_vram_transfer = files( 'player_lucas_back.png', 'player_dawn_back.png', 'player_barry_back.png', @@ -102,43 +140,5 @@ pl_batt_obj_sprites = files( 'player_riley_back.png', 'player_marley_back.png', 'player_buck_back.png', - 'player_mira_back.png', - 'poke_ball_throw.png', - 'master_ball_throw.png', - 'ultra_ball_throw.png', - 'great_ball_throw.png', - 'safari_ball_throw.png', - 'net_ball_throw.png', - 'dive_ball_throw.png', - 'nest_ball_throw.png', - 'repeat_ball_throw.png', - 'timer_ball_throw.png', - 'luxury_ball_throw.png', - 'premier_ball_throw.png', - 'quick_ball_throw.png', - 'dusk_ball_throw.png', - 'heal_ball_throw.png', - 'cherish_ball_throw.png', - 'park_ball_throw.png', - 'bait_throw.png', - 'mud_throw.png', - 'party_gauge.png' -) - -pl_batt_obj_sprite_data = files('data.json') - -pl_batt_obj_ncgr = [] -foreach infile : pl_batt_obj_sprites - pl_batt_obj_ncgr += custom_target( - input: [infile, pl_batt_obj_sprite_data], - output: '@BASENAME0@.NCGR', - command: [ - make_pl_batt_obj_sprites_py, - '--nitrogfx', nitrogfx_exe.full_path(), - '--input', '@INPUT0@', - '--output', '@OUTPUT@', - '--datafile', '@INPUT1@', - '--private-dir', '@PRIVATE_DIR@' - ] - ) -endforeach \ No newline at end of file + 'player_mira_back.png' +) \ No newline at end of file From 0ef817347bf52f6dd8b7a453939c7b9c9bd25488 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Mon, 28 Oct 2024 13:06:31 -0500 Subject: [PATCH 23/26] convert to generators instead of Python for build, update NAIX fields to align --- res/battle/graphic/pl_batt_obj/meson.build | 2 + .../graphic/pl_batt_obj/palettes/data.json | 765 ----------------- .../graphic/pl_batt_obj/pl_batt_obj.ignore | 228 +++++ .../graphic/pl_batt_obj/pl_batt_obj.order | 686 +++++++-------- .../graphic/pl_batt_obj/sprites/data.json | 791 ------------------ src/battle/battle_icon.c | 54 +- src/battle/battle_script.c | 8 +- src/battle/healthbar.c | 48 +- src/battle/ov16_02268520.c | 152 ++-- src/battle/ov16_0226871C.c | 12 +- src/battle/ov16_0226DB7C.c | 8 +- src/battle/party_gauge.c | 8 +- src/overlay010/ov10_0221F800.c | 6 +- src/overlay012/ov12_02235E94.c | 40 +- src/overlay017/ov17_02252AB0.c | 8 +- src/overlay019/ov19_021DA92C.c | 1 - tools/scripts/meson.build | 2 - tools/scripts/pl_batt_obj/compress.py | 183 ---- .../pl_batt_obj/make_pl_batt_obj_anims.py | 64 -- .../pl_batt_obj/make_pl_batt_obj_cells.py | 64 -- .../pl_batt_obj/make_pl_batt_obj_palettes.py | 75 -- .../pl_batt_obj/make_pl_batt_obj_sprites.py | 77 -- tools/scripts/pl_batt_obj/meson.build | 4 - 23 files changed, 745 insertions(+), 2541 deletions(-) delete mode 100644 res/battle/graphic/pl_batt_obj/palettes/data.json create mode 100644 res/battle/graphic/pl_batt_obj/pl_batt_obj.ignore delete mode 100644 res/battle/graphic/pl_batt_obj/sprites/data.json delete mode 100644 tools/scripts/pl_batt_obj/compress.py delete mode 100644 tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py delete mode 100644 tools/scripts/pl_batt_obj/make_pl_batt_obj_cells.py delete mode 100644 tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py delete mode 100644 tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py delete mode 100644 tools/scripts/pl_batt_obj/meson.build diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/pl_batt_obj/meson.build index 9ea9d80b5d..cea9d99909 100644 --- a/res/battle/graphic/pl_batt_obj/meson.build +++ b/res/battle/graphic/pl_batt_obj/meson.build @@ -39,6 +39,7 @@ nanr_uncompressed = nanr_gen.process(anims_uncompressed) nanr_compressed = lz_gen.process(nanr_gen.process(anims_compressed)) pl_batt_obj_order = files('pl_batt_obj.order') +pl_batt_obj_ignore = files('pl_batt_obj.ignore') pl_batt_obj_narc = custom_target('pl_batt_obj.narc', output: [ 'pl_batt_obj.narc', @@ -65,6 +66,7 @@ pl_batt_obj_narc = custom_target('pl_batt_obj.narc', '-d', '@PRIVATE_DIR@', '-p', '@OUTPUT0@', '--order', pl_batt_obj_order, + '--ignore', pl_batt_obj_ignore, '--naix', ] ) diff --git a/res/battle/graphic/pl_batt_obj/palettes/data.json b/res/battle/graphic/pl_batt_obj/palettes/data.json deleted file mode 100644 index 59afa1a271..0000000000 --- a/res/battle/graphic/pl_batt_obj/palettes/data.json +++ /dev/null @@ -1,765 +0,0 @@ -[ - { - "target": "pl_batt_obj_00000000.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_tower_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_tower_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_tower_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_factory_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_factory_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_factory_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_arcade_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_arcade_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_arcade_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_castle_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_castle_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_castle_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_hall_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_hall_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_hall_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "pl_batt_obj_00000070.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "player_lucas_back.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "player_dawn_back.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "player_barry_back.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "player_cheryl_back.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "player_riley_back.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "player_marley_back.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "player_buck_back.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "player_mira_back.pal", - "bitdepth": 4, - "pad": false, - "pcmp": false, - "invert_size": false - }, - { - "target": "battle_terrain_grass_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_grass_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_grass_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_surf_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_surf_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_surf_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_path_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_path_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_path_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_ice_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_ice_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_ice_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_mountain_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_mountain_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_mountain_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_snow_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_snow_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_snow_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_indoors_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_indoors_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_indoors_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_sand_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_sand_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_sand_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_mud_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_mud_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_mud_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_cave_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_cave_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_cave_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_puddle_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_puddle_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_puddle_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_aaron_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_aaron_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_aaron_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_bertha_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_bertha_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_bertha_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_flint_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_flint_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_flint_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_lucian_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_lucian_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_elite4_lucian_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_champion_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_champion_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_champion_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_distortion_world_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_distortion_world_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_distortion_world_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_giratina_day.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_giratina_afternoon.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_terrain_giratina_night.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "healthbox_normal.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "pl_batt_obj_00000072.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "pl_batt_obj_00000073.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "icon_palettes.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "pl_batt_obj_00000075.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "pl_batt_obj_00000079.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "battle_subscreen_cursor_corner.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "healthbox_safari.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "bg_party_level_up.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "poke_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "master_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "ultra_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "great_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "safari_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "net_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "dive_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "nest_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "repeat_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "timer_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "luxury_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "premier_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "quick_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "dusk_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "heal_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "cherish_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "park_ball_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "bait_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "mud_throw.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "party_gauge.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - }, - { - "target": "pl_batt_obj_00000111.pal", - "bitdepth": 4, - "pad": false, - "pcmp": true, - "invert_size": true - } -] \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/pl_batt_obj.ignore b/res/battle/graphic/pl_batt_obj/pl_batt_obj.ignore new file mode 100644 index 0000000000..83eda70e04 --- /dev/null +++ b/res/battle/graphic/pl_batt_obj/pl_batt_obj.ignore @@ -0,0 +1,228 @@ +healthbox_doubles_opponent_2.NCER +battle_terrain_elite4_flint_opponent.NCGR +player_lucas_back.NCGR +pl_batt_obj_00000185.NCGR +battle_terrain_opponent.NANR +healthbox_doubles_opponent_1.NCGR +type_icon_steel.NCGR +battle_terrain_player.NCER +pl_batt_obj_00000210.NCER +battle_terrain_mountain_player.NCGR +safari_ball_throw.NCGR +battle_terrain_distortion_world_opponent.NCGR +battle_terrain_puddle_player.NCGR +pl_batt_obj_00000278.NANR +healthbox_singles_opponent.NCGR +move_type_icon.NANR +pl_batt_obj_00000180.NANR +bg_party_level_up.NANR +safari_ball_throw.NANR +healthbox_doubles_player_2.NANR +player_dawn_back.NCGR +mud_throw.NANR +type_icon_dark.NCGR +battle_terrain_tower_opponent.NCGR +premier_ball_throw.NCER +pl_batt_obj_00000268.NCER +battle_terrain_elite4_lucian_opponent.NCGR +move_class_status.NCGR +type_icon_bug.NCGR +pl_batt_obj_00000247.NCGR +mud_throw.NCGR +heal_ball_throw.NCGR +pl_batt_obj_00000116.NCER +pl_batt_obj_00000215.NANR +battle_terrain_snow_player.NCGR +battle_terrain_indoors_opponent.NCGR +healthbox_singles_player.NANR +pl_batt_obj_00000275.NANR +pl_batt_obj_00000213.NCER +pl_batt_obj_00000117.NCGR +poke_ball_throw.NANR +healthbox_doubles_opponent_2.NCGR +battle_subscreen_cursor_corner.NCER +battle_terrain_champion_opponent.NCGR +move_type_icon.NCER +player_marley_back.NCGR +pl_batt_obj_00000214.NCGR +battle_terrain_grass_player.NCGR +battle_terrain_factory_player.NCGR +pl_batt_obj_00000121.NCGR +move_class_special.NCGR +battle_terrain_puddle_opponent.NCGR +master_ball_throw.NCER +battle_terrain_surf_opponent.NCGR +healthbox_doubles_player_1.NCGR +pl_batt_obj_00000281.NANR +cherish_ball_throw.NCGR +battle_terrain_indoors_player.NCGR +pl_batt_obj_00000181.NCER +contest_icon_beauty.NCGR +healthbox_safari.NCGR +move_class_physical.NCGR +battle_terrain_sand_opponent.NCGR +bait_throw.NANR +player_cheryl_back.NCGR +poke_ball_throw.NCGR +bg_party_level_up.NCGR +battle_subscreen_cursor_corner.NANR +type_icon_grass.NCGR +pl_batt_obj_00000269.NCER +battle_terrain_giratina_opponent.NCGR +healthbox_singles_player.NCER +pl_batt_obj_00000279.NANR +heal_ball_throw.NANR +player_riley_back.NCGR +ball_status_indicator_opponent.NCER +healthbox_doubles_player_2.NCGR +battle_terrain_mud_player.NCGR +net_ball_throw.NCGR +pl_batt_obj_00000177.NANR +battle_terrain_castle_player.NCGR +quick_ball_throw.NCGR +nest_ball_throw.NCER +pl_batt_obj_00000123.NANR +healthbox_singles_player.NCGR +luxury_ball_throw.NCER +ball_status_indicator_player.NANR +great_ball_throw.NANR +repeat_ball_throw.NCER +pl_batt_obj_00000212.NANR +bait_throw.NCGR +pl_batt_obj_00000267.NCER +dusk_ball_throw.NCER +pl_batt_obj_00000119.NCER +cherish_ball_throw.NANR +battle_terrain_player.NANR +pl_batt_obj_00000126.NANR +pl_batt_obj_00000115.NANR +pl_batt_obj_00000184.NCER +battle_terrain_distortion_world_player.NCGR +battle_terrain_snow_opponent.NCGR +healthbox_safari.NCER +dusk_ball_throw.NANR +battle_terrain_elite4_lucian_player.NCGR +great_ball_throw.NCER +timer_ball_throw.NCGR +mud_throw.NCER +contest_icon_tough.NCGR +battle_terrain_mountain_opponent.NCGR +contest_icon_cute.NCGR +dive_ball_throw.NANR +type_icon_poison.NCGR +timer_ball_throw.NANR +heal_ball_throw.NCER +nest_ball_throw.NANR +pl_batt_obj_00000122.NCER +battle_terrain_path_opponent.NCGR +pl_batt_obj_00000125.NCER +party_gauge.NANR +healthbox_singles_opponent.NCER +battle_terrain_arcade_opponent.NCGR +poke_ball_throw.NCER +repeat_ball_throw.NCGR +net_ball_throw.NCER +pl_batt_obj_00000179.NCGR +battle_subscreen_cursor_corner.NCGR +battle_terrain_ice_player.NCGR +pl_batt_obj_00000182.NCGR +bait_throw.NCER +battle_terrain_sand_player.NCGR +ultra_ball_throw.NCGR +repeat_ball_throw.NANR +pl_batt_obj_00000178.NCER +healthbox_doubles_player_2.NCER +battle_terrain_castle_opponent.NCGR +park_ball_throw.NANR +premier_ball_throw.NANR +party_gauge.NCGR +premier_ball_throw.NCGR +type_icon_rock.NCGR +pl_batt_obj_00000280.NANR +great_ball_throw.NCGR +ball_status_indicator_player.NCGR +quick_ball_throw.NANR +pl_batt_obj_00000276.NANR +safari_ball_throw.NCER +pl_batt_obj_00000183.NANR +type_icon_ice.NCGR +type_icon_electric.NCGR +battle_terrain_grass_opponent.NCGR +contest_icon_smart.NCGR +park_ball_throw.NCER +pl_batt_obj_00000120.NCGR +battle_terrain_champion_player.NCGR +pl_batt_obj_00000270.NCER +player_barry_back.NCGR +battle_terrain_ice_opponent.NCGR +pl_batt_obj_00000271.NCER +healthbox_doubles_player_1.NCER +pl_batt_obj_00000248.NCER +type_icon_dragon.NCGR +pl_batt_obj_00000277.NANR +battle_terrain_path_player.NCGR +player_buck_back.NCGR +battle_terrain_hall_opponent.NCGR +dive_ball_throw.NCGR +type_icon_water.NCGR +healthbox_doubles_player_1.NANR +battle_terrain_factory_opponent.NCGR +battle_terrain_cave_player.NCGR +healthbox_doubles_opponent_1.NANR +battle_terrain_hall_player.NCGR +park_ball_throw.NCGR +healthbox_doubles_opponent_1.NCER +dive_ball_throw.NCER +battle_terrain_giratina_player.NCGR +type_icon_fighting.NCGR +pl_batt_obj_00000249.NANR +pl_batt_obj_00000273.NCER +pl_batt_obj_00000272.NCER +pl_batt_obj_00000124.NCGR +pl_batt_obj_00000118.NANR +battle_terrain_tower_player.NCGR +luxury_ball_throw.NCGR +healthbox_doubles_opponent_2.NANR +type_icon_ghost.NCGR +pl_batt_obj_00000216.NCER +type_icon_fire.NCGR +party_gauge.NCER +pl_batt_obj_00000274.NCER +type_icon_normal.NCGR +contest_icon_cool.NCGR +cherish_ball_throw.NCER +battle_terrain_elite4_bertha_player.NCGR +pl_batt_obj_00000211.NCGR +healthbox_safari.NANR +player_mira_back.NCGR +luxury_ball_throw.NANR +master_ball_throw.NCGR +type_icon_flying.NCGR +quick_ball_throw.NCER +ball_status_indicator_opponent.NANR +battle_terrain_mud_opponent.NCGR +battle_terrain_cave_opponent.NCGR +ultra_ball_throw.NANR +ultra_ball_throw.NCER +healthbox_singles_opponent.NANR +battle_terrain_arcade_player.NCGR +pl_batt_obj_00000282.NANR +type_icon_ground.NCGR +ball_status_indicator_opponent.NCGR +net_ball_throw.NANR +timer_ball_throw.NCER +pl_batt_obj_00000218.NANR +type_icon_psychic.NCGR +nest_ball_throw.NCGR +battle_terrain_elite4_bertha_opponent.NCGR +battle_terrain_elite4_aaron_player.NCGR +battle_terrain_surf_player.NCGR +battle_terrain_elite4_aaron_opponent.NCGR +ball_status_indicator_player.NCER +pl_batt_obj_00000217.NCGR +battle_terrain_opponent.NCER +battle_terrain_elite4_flint_player.NCGR +bg_party_level_up.NCER +master_ball_throw.NANR +type_icon_mystery.NCGR +dusk_ball_throw.NCGR \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/pl_batt_obj.order b/res/battle/graphic/pl_batt_obj/pl_batt_obj.order index 9c1547efbd..00dd4d5b77 100644 --- a/res/battle/graphic/pl_batt_obj/pl_batt_obj.order +++ b/res/battle/graphic/pl_batt_obj/pl_batt_obj.order @@ -1,343 +1,343 @@ -pl_batt_obj_00000000.nclr -battle_terrain_grass_day.nclr -battle_terrain_grass_afternoon.nclr -battle_terrain_grass_night.nclr -battle_terrain_surf_day.nclr -battle_terrain_surf_afternoon.nclr -battle_terrain_surf_night.nclr -battle_terrain_path_day.nclr -battle_terrain_path_afternoon.nclr -battle_terrain_path_night.nclr -battle_terrain_ice_day.nclr -battle_terrain_ice_afternoon.nclr -battle_terrain_ice_night.nclr -battle_terrain_mountain_day.nclr -battle_terrain_mountain_afternoon.nclr -battle_terrain_mountain_night.nclr -battle_terrain_snow_day.nclr -battle_terrain_snow_afternoon.nclr -battle_terrain_snow_night.nclr -battle_terrain_indoors_day.nclr -battle_terrain_indoors_afternoon.nclr -battle_terrain_indoors_night.nclr -battle_terrain_sand_day.nclr -battle_terrain_sand_afternoon.nclr -battle_terrain_sand_night.nclr -battle_terrain_mud_day.nclr -battle_terrain_mud_afternoon.nclr -battle_terrain_mud_night.nclr -battle_terrain_cave_day.nclr -battle_terrain_cave_afternoon.nclr -battle_terrain_cave_night.nclr -battle_terrain_puddle_day.nclr -battle_terrain_puddle_afternoon.nclr -battle_terrain_puddle_night.nclr -battle_terrain_elite4_aaron_day.nclr -battle_terrain_elite4_aaron_afternoon.nclr -battle_terrain_elite4_aaron_night.nclr -battle_terrain_elite4_bertha_day.nclr -battle_terrain_elite4_bertha_afternoon.nclr -battle_terrain_elite4_bertha_night.nclr -battle_terrain_elite4_flint_day.nclr -battle_terrain_elite4_flint_afternoon.nclr -battle_terrain_elite4_flint_night.nclr -battle_terrain_elite4_lucian_day.nclr -battle_terrain_elite4_lucian_afternoon.nclr -battle_terrain_elite4_lucian_night.nclr -battle_terrain_champion_day.nclr -battle_terrain_champion_afternoon.nclr -battle_terrain_champion_night.nclr -battle_terrain_distortion_world_day.nclr -battle_terrain_distortion_world_afternoon.nclr -battle_terrain_distortion_world_night.nclr -battle_terrain_tower_day.nclr -battle_terrain_tower_afternoon.nclr -battle_terrain_tower_night.nclr -battle_terrain_factory_day.nclr -battle_terrain_factory_afternoon.nclr -battle_terrain_factory_night.nclr -battle_terrain_arcade_day.nclr -battle_terrain_arcade_afternoon.nclr -battle_terrain_arcade_night.nclr -battle_terrain_castle_day.nclr -battle_terrain_castle_afternoon.nclr -battle_terrain_castle_night.nclr -battle_terrain_hall_day.nclr -battle_terrain_hall_afternoon.nclr -battle_terrain_hall_night.nclr -battle_terrain_giratina_day.nclr -battle_terrain_giratina_afternoon.nclr -battle_terrain_giratina_night.nclr -pl_batt_obj_00000070.nclr -healthbox_normal.nclr -pl_batt_obj_00000072.nclr -pl_batt_obj_00000073.nclr -icon_palettes.nclr -pl_batt_obj_00000075.nclr -pl_batt_obj_00000076.ncgr -pl_batt_obj_00000077.ncer -pl_batt_obj_00000078.nanr -pl_batt_obj_00000079.nclr -battle_subscreen_cursor_corner.nclr -healthbox_safari.nclr -bg_party_level_up.nclr -player_lucas_back.nclr -player_dawn_back.nclr -player_barry_back.nclr -player_cheryl_back.nclr -player_riley_back.nclr -player_marley_back.nclr -player_buck_back.nclr -player_mira_back.nclr -poke_ball_throw.nclr -master_ball_throw.nclr -ultra_ball_throw.nclr -great_ball_throw.nclr -safari_ball_throw.nclr -net_ball_throw.nclr -dive_ball_throw.nclr -nest_ball_throw.nclr -repeat_ball_throw.nclr -timer_ball_throw.nclr -luxury_ball_throw.nclr -premier_ball_throw.nclr -quick_ball_throw.nclr -dusk_ball_throw.nclr -heal_ball_throw.nclr -cherish_ball_throw.nclr -park_ball_throw.nclr -bait_throw.nclr -mud_throw.nclr -party_gauge.nclr -pl_batt_obj_00000111.nclr -pl_batt_obj_00000112.ncgr -pl_batt_obj_00000113.ncer -pl_batt_obj_00000114.nanr -pl_batt_obj_00000115.nanr -pl_batt_obj_00000116.ncer -pl_batt_obj_00000117.ncgr -pl_batt_obj_00000118.nanr -pl_batt_obj_00000119.ncer -pl_batt_obj_00000120.ncgr -pl_batt_obj_00000121.ncgr -pl_batt_obj_00000122.ncer -pl_batt_obj_00000123.nanr -pl_batt_obj_00000124.ncgr -pl_batt_obj_00000125.ncer -pl_batt_obj_00000126.nanr -battle_terrain_grass_player.ncgr -battle_terrain_player.ncer -battle_terrain_player.nanr -battle_terrain_grass_opponent.ncgr -battle_terrain_opponent.ncer -battle_terrain_opponent.nanr -battle_terrain_surf_player.ncgr -battle_terrain_surf_opponent.ncgr -battle_terrain_path_player.ncgr -battle_terrain_path_opponent.ncgr -battle_terrain_ice_player.ncgr -battle_terrain_ice_opponent.ncgr -battle_terrain_mountain_player.ncgr -battle_terrain_mountain_opponent.ncgr -battle_terrain_snow_player.ncgr -battle_terrain_snow_opponent.ncgr -battle_terrain_indoors_player.ncgr -battle_terrain_indoors_opponent.ncgr -battle_terrain_sand_player.ncgr -battle_terrain_sand_opponent.ncgr -battle_terrain_mud_player.ncgr -battle_terrain_mud_opponent.ncgr -battle_terrain_cave_player.ncgr -battle_terrain_cave_opponent.ncgr -battle_terrain_puddle_player.ncgr -battle_terrain_puddle_opponent.ncgr -battle_terrain_elite4_aaron_player.ncgr -battle_terrain_elite4_aaron_opponent.ncgr -battle_terrain_elite4_bertha_player.ncgr -battle_terrain_elite4_bertha_opponent.ncgr -battle_terrain_elite4_flint_player.ncgr -battle_terrain_elite4_flint_opponent.ncgr -battle_terrain_elite4_lucian_player.ncgr -battle_terrain_elite4_lucian_opponent.ncgr -battle_terrain_champion_player.ncgr -battle_terrain_champion_opponent.ncgr -battle_terrain_distortion_world_player.ncgr -battle_terrain_distortion_world_opponent.ncgr -battle_terrain_tower_player.ncgr -battle_terrain_tower_opponent.ncgr -battle_terrain_factory_player.ncgr -battle_terrain_factory_opponent.ncgr -battle_terrain_arcade_player.ncgr -battle_terrain_arcade_opponent.ncgr -battle_terrain_castle_player.ncgr -battle_terrain_castle_opponent.ncgr -battle_terrain_hall_player.ncgr -battle_terrain_hall_opponent.ncgr -battle_terrain_giratina_player.ncgr -battle_terrain_giratina_opponent.ncgr -pl_batt_obj_00000177.nanr -pl_batt_obj_00000178.ncer -pl_batt_obj_00000179.ncgr -pl_batt_obj_00000180.nanr -pl_batt_obj_00000181.ncer -pl_batt_obj_00000182.ncgr -pl_batt_obj_00000183.nanr -pl_batt_obj_00000184.ncer -pl_batt_obj_00000185.ncgr -healthbox_singles_opponent.nanr -healthbox_singles_opponent.ncer -healthbox_singles_opponent.ncgr -healthbox_singles_player.nanr -healthbox_singles_player.ncer -healthbox_singles_player.ncgr -healthbox_doubles_opponent_1.nanr -healthbox_doubles_opponent_1.ncer -healthbox_doubles_opponent_1.ncgr -healthbox_doubles_opponent_2.nanr -healthbox_doubles_opponent_2.ncer -healthbox_doubles_opponent_2.ncgr -healthbox_doubles_player_1.nanr -healthbox_doubles_player_1.ncer -healthbox_doubles_player_1.ncgr -healthbox_doubles_player_2.nanr -healthbox_doubles_player_2.ncer -healthbox_doubles_player_2.ncgr -ball_status_indicator_opponent.ncer -ball_status_indicator_opponent.ncgr -ball_status_indicator_opponent.nanr -ball_status_indicator_player.ncer -ball_status_indicator_player.ncgr -ball_status_indicator_player.nanr -pl_batt_obj_00000210.ncer -pl_batt_obj_00000211.ncgr -pl_batt_obj_00000212.nanr -pl_batt_obj_00000213.ncer -pl_batt_obj_00000214.ncgr -pl_batt_obj_00000215.nanr -pl_batt_obj_00000216.ncer -pl_batt_obj_00000217.ncgr -pl_batt_obj_00000218.nanr -contest_icon_beauty.ncgr -contest_icon_cute.ncgr -type_icon_dragon.ncgr -type_icon_electric.ncgr -type_icon_psychic.ncgr -type_icon_dark.ncgr -type_icon_fighting.ncgr -type_icon_fire.ncgr -type_icon_flying.ncgr -type_icon_ghost.ncgr -type_icon_ground.ncgr -type_icon_ice.ncgr -type_icon_bug.ncgr -contest_icon_smart.ncgr -type_icon_grass.ncgr -type_icon_normal.ncgr -type_icon_poison.ncgr -type_icon_mystery.ncgr -type_icon_rock.ncgr -type_icon_steel.ncgr -contest_icon_tough.ncgr -contest_icon_cool.ncgr -type_icon_water.ncgr -move_type_icon.ncer -move_type_icon.nanr -move_class_physical.ncgr -move_class_status.ncgr -move_class_special.ncgr -pl_batt_obj_00000247.ncgr -pl_batt_obj_00000248.ncer -pl_batt_obj_00000249.nanr -battle_subscreen_cursor_corner.ncgr -battle_subscreen_cursor_corner.ncer -battle_subscreen_cursor_corner.nanr -healthbox_safari.ncgr -healthbox_safari.ncer -healthbox_safari.nanr -bg_party_level_up.ncgr -bg_party_level_up.ncer -bg_party_level_up.nanr -player_lucas_back.ncgr -player_dawn_back.ncgr -player_barry_back.ncgr -player_cheryl_back.ncgr -player_riley_back.ncgr -player_marley_back.ncgr -player_buck_back.ncgr -player_mira_back.ncgr -pl_batt_obj_00000267.ncer -pl_batt_obj_00000268.ncer -pl_batt_obj_00000269.ncer -pl_batt_obj_00000270.ncer -pl_batt_obj_00000271.ncer -pl_batt_obj_00000272.ncer -pl_batt_obj_00000273.ncer -pl_batt_obj_00000274.ncer -pl_batt_obj_00000275.nanr -pl_batt_obj_00000276.nanr -pl_batt_obj_00000277.nanr -pl_batt_obj_00000278.nanr -pl_batt_obj_00000279.nanr -pl_batt_obj_00000280.nanr -pl_batt_obj_00000281.nanr -pl_batt_obj_00000282.nanr -poke_ball_throw.nanr -poke_ball_throw.ncer -poke_ball_throw.ncgr -master_ball_throw.nanr -master_ball_throw.ncer -master_ball_throw.ncgr -ultra_ball_throw.nanr -ultra_ball_throw.ncer -ultra_ball_throw.ncgr -great_ball_throw.nanr -great_ball_throw.ncer -great_ball_throw.ncgr -safari_ball_throw.nanr -safari_ball_throw.ncer -safari_ball_throw.ncgr -net_ball_throw.nanr -net_ball_throw.ncer -net_ball_throw.ncgr -dive_ball_throw.nanr -dive_ball_throw.ncer -dive_ball_throw.ncgr -nest_ball_throw.nanr -nest_ball_throw.ncer -nest_ball_throw.ncgr -repeat_ball_throw.nanr -repeat_ball_throw.ncer -repeat_ball_throw.ncgr -timer_ball_throw.nanr -timer_ball_throw.ncer -timer_ball_throw.ncgr -luxury_ball_throw.nanr -luxury_ball_throw.ncer -luxury_ball_throw.ncgr -premier_ball_throw.nanr -premier_ball_throw.ncer -premier_ball_throw.ncgr -quick_ball_throw.nanr -quick_ball_throw.ncer -quick_ball_throw.ncgr -dusk_ball_throw.nanr -dusk_ball_throw.ncer -dusk_ball_throw.ncgr -heal_ball_throw.nanr -heal_ball_throw.ncer -heal_ball_throw.ncgr -cherish_ball_throw.nanr -cherish_ball_throw.ncer -cherish_ball_throw.ncgr -park_ball_throw.nanr -park_ball_throw.ncer -park_ball_throw.ncgr -bait_throw.nanr -bait_throw.ncer -bait_throw.ncgr -mud_throw.nanr -mud_throw.ncer -mud_throw.ncgr -party_gauge.ncgr -party_gauge.ncer -party_gauge.nanr \ No newline at end of file +pl_batt_obj_00000000.NCLR +battle_terrain_grass_day.NCLR +battle_terrain_grass_afternoon.NCLR +battle_terrain_grass_night.NCLR +battle_terrain_surf_day.NCLR +battle_terrain_surf_afternoon.NCLR +battle_terrain_surf_night.NCLR +battle_terrain_path_day.NCLR +battle_terrain_path_afternoon.NCLR +battle_terrain_path_night.NCLR +battle_terrain_ice_day.NCLR +battle_terrain_ice_afternoon.NCLR +battle_terrain_ice_night.NCLR +battle_terrain_mountain_day.NCLR +battle_terrain_mountain_afternoon.NCLR +battle_terrain_mountain_night.NCLR +battle_terrain_snow_day.NCLR +battle_terrain_snow_afternoon.NCLR +battle_terrain_snow_night.NCLR +battle_terrain_indoors_day.NCLR +battle_terrain_indoors_afternoon.NCLR +battle_terrain_indoors_night.NCLR +battle_terrain_sand_day.NCLR +battle_terrain_sand_afternoon.NCLR +battle_terrain_sand_night.NCLR +battle_terrain_mud_day.NCLR +battle_terrain_mud_afternoon.NCLR +battle_terrain_mud_night.NCLR +battle_terrain_cave_day.NCLR +battle_terrain_cave_afternoon.NCLR +battle_terrain_cave_night.NCLR +battle_terrain_puddle_day.NCLR +battle_terrain_puddle_afternoon.NCLR +battle_terrain_puddle_night.NCLR +battle_terrain_elite4_aaron_day.NCLR +battle_terrain_elite4_aaron_afternoon.NCLR +battle_terrain_elite4_aaron_night.NCLR +battle_terrain_elite4_bertha_day.NCLR +battle_terrain_elite4_bertha_afternoon.NCLR +battle_terrain_elite4_bertha_night.NCLR +battle_terrain_elite4_flint_day.NCLR +battle_terrain_elite4_flint_afternoon.NCLR +battle_terrain_elite4_flint_night.NCLR +battle_terrain_elite4_lucian_day.NCLR +battle_terrain_elite4_lucian_afternoon.NCLR +battle_terrain_elite4_lucian_night.NCLR +battle_terrain_champion_day.NCLR +battle_terrain_champion_afternoon.NCLR +battle_terrain_champion_night.NCLR +battle_terrain_distortion_world_day.NCLR +battle_terrain_distortion_world_afternoon.NCLR +battle_terrain_distortion_world_night.NCLR +battle_terrain_tower_day.NCLR +battle_terrain_tower_afternoon.NCLR +battle_terrain_tower_night.NCLR +battle_terrain_factory_day.NCLR +battle_terrain_factory_afternoon.NCLR +battle_terrain_factory_night.NCLR +battle_terrain_arcade_day.NCLR +battle_terrain_arcade_afternoon.NCLR +battle_terrain_arcade_night.NCLR +battle_terrain_castle_day.NCLR +battle_terrain_castle_afternoon.NCLR +battle_terrain_castle_night.NCLR +battle_terrain_hall_day.NCLR +battle_terrain_hall_afternoon.NCLR +battle_terrain_hall_night.NCLR +battle_terrain_giratina_day.NCLR +battle_terrain_giratina_afternoon.NCLR +battle_terrain_giratina_night.NCLR +pl_batt_obj_00000070.NCLR +healthbox_normal.NCLR +pl_batt_obj_00000072.NCLR +pl_batt_obj_00000073.NCLR +icon_palettes.NCLR +pl_batt_obj_00000075.NCLR +pl_batt_obj_00000076.NCGR +pl_batt_obj_00000077.NCER +pl_batt_obj_00000078.NANR +pl_batt_obj_00000079.NCLR +battle_subscreen_cursor_corner.NCLR +healthbox_safari.NCLR +bg_party_level_up.NCLR +player_lucas_back.NCLR +player_dawn_back.NCLR +player_barry_back.NCLR +player_cheryl_back.NCLR +player_riley_back.NCLR +player_marley_back.NCLR +player_buck_back.NCLR +player_mira_back.NCLR +poke_ball_throw.NCLR +master_ball_throw.NCLR +ultra_ball_throw.NCLR +great_ball_throw.NCLR +safari_ball_throw.NCLR +net_ball_throw.NCLR +dive_ball_throw.NCLR +nest_ball_throw.NCLR +repeat_ball_throw.NCLR +timer_ball_throw.NCLR +luxury_ball_throw.NCLR +premier_ball_throw.NCLR +quick_ball_throw.NCLR +dusk_ball_throw.NCLR +heal_ball_throw.NCLR +cherish_ball_throw.NCLR +park_ball_throw.NCLR +bait_throw.NCLR +mud_throw.NCLR +party_gauge.NCLR +pl_batt_obj_00000111.NCLR +pl_batt_obj_00000112.NCGR +pl_batt_obj_00000113.NCER +pl_batt_obj_00000114.NANR +pl_batt_obj_00000115.NANR.lz +pl_batt_obj_00000116.NCER.lz +pl_batt_obj_00000117.NCGR.lz +pl_batt_obj_00000118.NANR.lz +pl_batt_obj_00000119.NCER.lz +pl_batt_obj_00000120.NCGR.lz +pl_batt_obj_00000121.NCGR.lz +pl_batt_obj_00000122.NCER.lz +pl_batt_obj_00000123.NANR.lz +pl_batt_obj_00000124.NCGR.lz +pl_batt_obj_00000125.NCER.lz +pl_batt_obj_00000126.NANR.lz +battle_terrain_grass_player.NCGR.lz +battle_terrain_player.NCER.lz +battle_terrain_player.NANR.lz +battle_terrain_grass_opponent.NCGR.lz +battle_terrain_opponent.NCER.lz +battle_terrain_opponent.NANR.lz +battle_terrain_surf_player.NCGR.lz +battle_terrain_surf_opponent.NCGR.lz +battle_terrain_path_player.NCGR.lz +battle_terrain_path_opponent.NCGR.lz +battle_terrain_ice_player.NCGR.lz +battle_terrain_ice_opponent.NCGR.lz +battle_terrain_mountain_player.NCGR.lz +battle_terrain_mountain_opponent.NCGR.lz +battle_terrain_snow_player.NCGR.lz +battle_terrain_snow_opponent.NCGR.lz +battle_terrain_indoors_player.NCGR.lz +battle_terrain_indoors_opponent.NCGR.lz +battle_terrain_sand_player.NCGR.lz +battle_terrain_sand_opponent.NCGR.lz +battle_terrain_mud_player.NCGR.lz +battle_terrain_mud_opponent.NCGR.lz +battle_terrain_cave_player.NCGR.lz +battle_terrain_cave_opponent.NCGR.lz +battle_terrain_puddle_player.NCGR.lz +battle_terrain_puddle_opponent.NCGR.lz +battle_terrain_elite4_aaron_player.NCGR.lz +battle_terrain_elite4_aaron_opponent.NCGR.lz +battle_terrain_elite4_bertha_player.NCGR.lz +battle_terrain_elite4_bertha_opponent.NCGR.lz +battle_terrain_elite4_flint_player.NCGR.lz +battle_terrain_elite4_flint_opponent.NCGR.lz +battle_terrain_elite4_lucian_player.NCGR.lz +battle_terrain_elite4_lucian_opponent.NCGR.lz +battle_terrain_champion_player.NCGR.lz +battle_terrain_champion_opponent.NCGR.lz +battle_terrain_distortion_world_player.NCGR.lz +battle_terrain_distortion_world_opponent.NCGR.lz +battle_terrain_tower_player.NCGR.lz +battle_terrain_tower_opponent.NCGR.lz +battle_terrain_factory_player.NCGR.lz +battle_terrain_factory_opponent.NCGR.lz +battle_terrain_arcade_player.NCGR.lz +battle_terrain_arcade_opponent.NCGR.lz +battle_terrain_castle_player.NCGR.lz +battle_terrain_castle_opponent.NCGR.lz +battle_terrain_hall_player.NCGR.lz +battle_terrain_hall_opponent.NCGR.lz +battle_terrain_giratina_player.NCGR.lz +battle_terrain_giratina_opponent.NCGR.lz +pl_batt_obj_00000177.NANR.lz +pl_batt_obj_00000178.NCER.lz +pl_batt_obj_00000179.NCGR.lz +pl_batt_obj_00000180.NANR.lz +pl_batt_obj_00000181.NCER.lz +pl_batt_obj_00000182.NCGR.lz +pl_batt_obj_00000183.NANR.lz +pl_batt_obj_00000184.NCER.lz +pl_batt_obj_00000185.NCGR.lz +healthbox_singles_opponent.NANR.lz +healthbox_singles_opponent.NCER.lz +healthbox_singles_opponent.NCGR.lz +healthbox_singles_player.NANR.lz +healthbox_singles_player.NCER.lz +healthbox_singles_player.NCGR.lz +healthbox_doubles_opponent_1.NANR.lz +healthbox_doubles_opponent_1.NCER.lz +healthbox_doubles_opponent_1.NCGR.lz +healthbox_doubles_opponent_2.NANR.lz +healthbox_doubles_opponent_2.NCER.lz +healthbox_doubles_opponent_2.NCGR.lz +healthbox_doubles_player_1.NANR.lz +healthbox_doubles_player_1.NCER.lz +healthbox_doubles_player_1.NCGR.lz +healthbox_doubles_player_2.NANR.lz +healthbox_doubles_player_2.NCER.lz +healthbox_doubles_player_2.NCGR.lz +ball_status_indicator_opponent.NCER.lz +ball_status_indicator_opponent.NCGR.lz +ball_status_indicator_opponent.NANR.lz +ball_status_indicator_player.NCER.lz +ball_status_indicator_player.NCGR.lz +ball_status_indicator_player.NANR.lz +pl_batt_obj_00000210.NCER.lz +pl_batt_obj_00000211.NCGR.lz +pl_batt_obj_00000212.NANR.lz +pl_batt_obj_00000213.NCER.lz +pl_batt_obj_00000214.NCGR.lz +pl_batt_obj_00000215.NANR.lz +pl_batt_obj_00000216.NCER.lz +pl_batt_obj_00000217.NCGR.lz +pl_batt_obj_00000218.NANR.lz +contest_icon_beauty.NCGR.lz +contest_icon_cute.NCGR.lz +type_icon_dragon.NCGR.lz +type_icon_electric.NCGR.lz +type_icon_psychic.NCGR.lz +type_icon_dark.NCGR.lz +type_icon_fighting.NCGR.lz +type_icon_fire.NCGR.lz +type_icon_flying.NCGR.lz +type_icon_ghost.NCGR.lz +type_icon_ground.NCGR.lz +type_icon_ice.NCGR.lz +type_icon_bug.NCGR.lz +contest_icon_smart.NCGR.lz +type_icon_grass.NCGR.lz +type_icon_normal.NCGR.lz +type_icon_poison.NCGR.lz +type_icon_mystery.NCGR.lz +type_icon_rock.NCGR.lz +type_icon_steel.NCGR.lz +contest_icon_tough.NCGR.lz +contest_icon_cool.NCGR.lz +type_icon_water.NCGR.lz +move_type_icon.NCER.lz +move_type_icon.NANR.lz +move_class_physical.NCGR.lz +move_class_status.NCGR.lz +move_class_special.NCGR.lz +pl_batt_obj_00000247.NCGR.lz +pl_batt_obj_00000248.NCER.lz +pl_batt_obj_00000249.NANR.lz +battle_subscreen_cursor_corner.NCGR.lz +battle_subscreen_cursor_corner.NCER.lz +battle_subscreen_cursor_corner.NANR.lz +healthbox_safari.NCGR.lz +healthbox_safari.NCER.lz +healthbox_safari.NANR.lz +bg_party_level_up.NCGR.lz +bg_party_level_up.NCER.lz +bg_party_level_up.NANR.lz +player_lucas_back.NCGR.lz +player_dawn_back.NCGR.lz +player_barry_back.NCGR.lz +player_cheryl_back.NCGR.lz +player_riley_back.NCGR.lz +player_marley_back.NCGR.lz +player_buck_back.NCGR.lz +player_mira_back.NCGR.lz +pl_batt_obj_00000267.NCER.lz +pl_batt_obj_00000268.NCER.lz +pl_batt_obj_00000269.NCER.lz +pl_batt_obj_00000270.NCER.lz +pl_batt_obj_00000271.NCER.lz +pl_batt_obj_00000272.NCER.lz +pl_batt_obj_00000273.NCER.lz +pl_batt_obj_00000274.NCER.lz +pl_batt_obj_00000275.NANR.lz +pl_batt_obj_00000276.NANR.lz +pl_batt_obj_00000277.NANR.lz +pl_batt_obj_00000278.NANR.lz +pl_batt_obj_00000279.NANR.lz +pl_batt_obj_00000280.NANR.lz +pl_batt_obj_00000281.NANR.lz +pl_batt_obj_00000282.NANR.lz +poke_ball_throw.NANR.lz +poke_ball_throw.NCER.lz +poke_ball_throw.NCGR.lz +master_ball_throw.NANR.lz +master_ball_throw.NCER.lz +master_ball_throw.NCGR.lz +ultra_ball_throw.NANR.lz +ultra_ball_throw.NCER.lz +ultra_ball_throw.NCGR.lz +great_ball_throw.NANR.lz +great_ball_throw.NCER.lz +great_ball_throw.NCGR.lz +safari_ball_throw.NANR.lz +safari_ball_throw.NCER.lz +safari_ball_throw.NCGR.lz +net_ball_throw.NANR.lz +net_ball_throw.NCER.lz +net_ball_throw.NCGR.lz +dive_ball_throw.NANR.lz +dive_ball_throw.NCER.lz +dive_ball_throw.NCGR.lz +nest_ball_throw.NANR.lz +nest_ball_throw.NCER.lz +nest_ball_throw.NCGR.lz +repeat_ball_throw.NANR.lz +repeat_ball_throw.NCER.lz +repeat_ball_throw.NCGR.lz +timer_ball_throw.NANR.lz +timer_ball_throw.NCER.lz +timer_ball_throw.NCGR.lz +luxury_ball_throw.NANR.lz +luxury_ball_throw.NCER.lz +luxury_ball_throw.NCGR.lz +premier_ball_throw.NANR.lz +premier_ball_throw.NCER.lz +premier_ball_throw.NCGR.lz +quick_ball_throw.NANR.lz +quick_ball_throw.NCER.lz +quick_ball_throw.NCGR.lz +dusk_ball_throw.NANR.lz +dusk_ball_throw.NCER.lz +dusk_ball_throw.NCGR.lz +heal_ball_throw.NANR.lz +heal_ball_throw.NCER.lz +heal_ball_throw.NCGR.lz +cherish_ball_throw.NANR.lz +cherish_ball_throw.NCER.lz +cherish_ball_throw.NCGR.lz +park_ball_throw.NANR.lz +park_ball_throw.NCER.lz +park_ball_throw.NCGR.lz +bait_throw.NANR.lz +bait_throw.NCER.lz +bait_throw.NCGR.lz +mud_throw.NANR.lz +mud_throw.NCER.lz +mud_throw.NCGR.lz +party_gauge.NCGR.lz +party_gauge.NCER.lz +party_gauge.NANR.lz \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/sprites/data.json b/res/battle/graphic/pl_batt_obj/sprites/data.json deleted file mode 100644 index f5c57da13d..0000000000 --- a/res/battle/graphic/pl_batt_obj/sprites/data.json +++ /dev/null @@ -1,791 +0,0 @@ -[ - { - "target": "pl_batt_obj_00000076.png", - "compressed": false, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "pl_batt_obj_00000112.png", - "compressed": false, - "clobber_size": true, - "mapping_type": 128 - }, - { - "target": "pl_batt_obj_00000117.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "pl_batt_obj_00000120.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "pl_batt_obj_00000121.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "pl_batt_obj_00000124.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_grass_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_grass_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_surf_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_surf_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_path_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_path_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_ice_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_ice_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_mountain_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_mountain_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_snow_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_snow_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_indoors_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_indoors_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_sand_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_sand_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_mud_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_mud_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_cave_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_cave_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_puddle_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_puddle_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_elite4_aaron_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_elite4_aaron_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_elite4_bertha_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_elite4_bertha_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_elite4_flint_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_elite4_flint_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_elite4_lucian_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_elite4_lucian_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_champion_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_champion_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_distortion_world_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_distortion_world_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_tower_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_tower_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_factory_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_factory_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_arcade_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_arcade_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_castle_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_castle_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_hall_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_hall_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_giratina_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_terrain_giratina_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "pl_batt_obj_00000179.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "pl_batt_obj_00000182.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "pl_batt_obj_00000185.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "healthbox_singles_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "version101": true - }, - { - "target": "healthbox_singles_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "version101": true - }, - { - "target": "healthbox_doubles_opponent_1.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "version101": true - }, - { - "target": "healthbox_doubles_opponent_2.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "version101": true - }, - { - "target": "healthbox_doubles_player_1.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "version101": true - }, - { - "target": "healthbox_doubles_player_2.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "version101": true - }, - { - "target": "ball_status_indicator_opponent.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "ball_status_indicator_player.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "pl_batt_obj_00000211.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "pl_batt_obj_00000214.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "pl_batt_obj_00000217.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "contest_icon_beauty.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "contest_icon_cute.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_dragon.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_electric.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_psychic.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_dark.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_fighting.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_fire.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_flying.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_ghost.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_ground.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_ice.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_bug.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "contest_icon_smart.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_grass.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_normal.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_poison.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_mystery.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_rock.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_steel.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "contest_icon_tough.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "contest_icon_cool.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "type_icon_water.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32, - "version101": true - }, - { - "target": "move_class_physical.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "move_class_status.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "move_class_special.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "pl_batt_obj_00000247.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "battle_subscreen_cursor_corner.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 32 - }, - { - "target": "healthbox_safari.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "bg_party_level_up.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "player_lucas_back.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "vram": true, - "tiles": 500 - }, - { - "target": "player_dawn_back.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "vram": true, - "tiles": 500 - }, - { - "target": "player_barry_back.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "vram": true, - "tiles": 500 - }, - { - "target": "player_cheryl_back.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "vram": true, - "tiles": 500 - }, - { - "target": "player_riley_back.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "vram": true, - "tiles": 500 - }, - { - "target": "player_marley_back.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "vram": true, - "tiles": 500 - }, - { - "target": "player_buck_back.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "vram": true, - "tiles": 500 - }, - { - "target": "player_mira_back.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64, - "vram": true, - "tiles": 500 - }, - { - "target": "poke_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "master_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "ultra_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "great_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "safari_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "net_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "dive_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "nest_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "repeat_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "timer_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "luxury_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "premier_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "quick_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "dusk_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "heal_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "cherish_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "park_ball_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "bait_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "mud_throw.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - }, - { - "target": "party_gauge.png", - "compressed": true, - "clobber_size": true, - "mapping_type": 64 - } -] \ No newline at end of file diff --git a/src/battle/battle_icon.c b/src/battle/battle_icon.c index 6ef6bd61e7..62ab50c406 100644 --- a/src/battle/battle_icon.c +++ b/src/battle/battle_icon.c @@ -25,29 +25,29 @@ * Maps a type index (e.g. TYPE_WATER) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ __attribute__((aligned(4))) static const u32 sBattleTypeIconTiles[] = { - [TYPE_NORMAL] = type_icon_normal_ncgr, - [TYPE_FIGHTING] = type_icon_fighting_ncgr, - [TYPE_FLYING] = type_icon_flying_ncgr, - [TYPE_POISON] = type_icon_poison_ncgr, - [TYPE_GROUND] = type_icon_ground_ncgr, - [TYPE_ROCK] = type_icon_rock_ncgr, - [TYPE_BUG] = type_icon_bug_ncgr, - [TYPE_GHOST] = type_icon_ghost_ncgr, - [TYPE_STEEL] = type_icon_steel_ncgr, - [TYPE_MYSTERY] = type_icon_mystery_ncgr, - [TYPE_FIRE] = type_icon_fire_ncgr, - [TYPE_WATER] = type_icon_water_ncgr, - [TYPE_GRASS] = type_icon_grass_ncgr, - [TYPE_ELECTRIC] = type_icon_electric_ncgr, - [TYPE_PSYCHIC] = type_icon_psychic_ncgr, - [TYPE_ICE] = type_icon_ice_ncgr, - [TYPE_DRAGON] = type_icon_dragon_ncgr, - [TYPE_DARK] = type_icon_dark_ncgr, - [TYPE_COOL_ICON] = contest_icon_cool_ncgr, - [TYPE_BEAUTY_ICON] = contest_icon_beauty_ncgr, - [TYPE_CUTE_ICON] = contest_icon_cute_ncgr, - [TYPE_SMART_ICON] = contest_icon_smart_ncgr, - [TYPE_TOUGH_ICON] = contest_icon_tough_ncgr + [TYPE_NORMAL] = type_icon_normal_NCGR_lz, + [TYPE_FIGHTING] = type_icon_fighting_NCGR_lz, + [TYPE_FLYING] = type_icon_flying_NCGR_lz, + [TYPE_POISON] = type_icon_poison_NCGR_lz, + [TYPE_GROUND] = type_icon_ground_NCGR_lz, + [TYPE_ROCK] = type_icon_rock_NCGR_lz, + [TYPE_BUG] = type_icon_bug_NCGR_lz, + [TYPE_GHOST] = type_icon_ghost_NCGR_lz, + [TYPE_STEEL] = type_icon_steel_NCGR_lz, + [TYPE_MYSTERY] = type_icon_mystery_NCGR_lz, + [TYPE_FIRE] = type_icon_fire_NCGR_lz, + [TYPE_WATER] = type_icon_water_NCGR_lz, + [TYPE_GRASS] = type_icon_grass_NCGR_lz, + [TYPE_ELECTRIC] = type_icon_electric_NCGR_lz, + [TYPE_PSYCHIC] = type_icon_psychic_NCGR_lz, + [TYPE_ICE] = type_icon_ice_NCGR_lz, + [TYPE_DRAGON] = type_icon_dragon_NCGR_lz, + [TYPE_DARK] = type_icon_dark_NCGR_lz, + [TYPE_COOL_ICON] = contest_icon_cool_NCGR_lz, + [TYPE_BEAUTY_ICON] = contest_icon_beauty_NCGR_lz, + [TYPE_CUTE_ICON] = contest_icon_cute_NCGR_lz, + [TYPE_SMART_ICON] = contest_icon_smart_NCGR_lz, + [TYPE_TOUGH_ICON] = contest_icon_tough_NCGR_lz }; /* @@ -83,9 +83,9 @@ __attribute__((aligned(4))) static const u8 sBattleTypeIconPaletteIndex[] = { * Maps move classes (Physical, Special, Status) to the corresponding NARC member in pl_batt_obj.narc containing the type icon. */ __attribute__((aligned(4))) static const u32 sMoveClassIconTiles[] = { - [CLASS_PHYSICAL] = move_class_physical_ncgr, - [CLASS_SPECIAL] = move_class_special_ncgr, - [CLASS_STATUS] = move_class_status_ncgr + [CLASS_PHYSICAL] = move_class_physical_NCGR_lz, + [CLASS_SPECIAL] = move_class_special_NCGR_lz, + [CLASS_STATUS] = move_class_status_NCGR_lz }; /* @@ -113,7 +113,7 @@ u32 BattleIcon_GetMoveTypeTiles(int typeIndex) */ u32 BattleIcon_GetMoveTypePaletteFileIndex(void) { - return icon_palettes_nclr; + return icon_palettes_NCLR; } u32 sub_0207C924(void) diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 466eaa95fc..56fec3d1a5 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -12222,10 +12222,10 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript v2 = ov16_0223E018(param0); v3 = BattleSystem_PaletteSys(param0); - sub_0200CBDC(v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, bg_party_level_up_ncgr, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20021); - sub_0200CD7C(v3, 2, v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, bg_party_level_up_nclr, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 20016); - sub_0200CE0C(v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, bg_party_level_up_ncer, 1, 20013); - sub_0200CE3C(v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, bg_party_level_up_nanr, 1, 20013); + sub_0200CBDC(v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, bg_party_level_up_NCGR_lz, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 20021); + sub_0200CD7C(v3, 2, v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, bg_party_level_up_NCLR, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 20016); + sub_0200CE0C(v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, bg_party_level_up_NCER_lz, 1, 20013); + sub_0200CE3C(v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, bg_party_level_up_NANR_lz, 1, 20013); param1->cellActorData[0] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_0226E6C4); diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 7602b8cb9c..4dd785beae 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -341,10 +341,10 @@ static const SpriteTemplate sHealthbarTemplate_SoloPlayer = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - healthbox_singles_player_ncgr, + healthbox_singles_player_NCGR_lz, HEALTHBAR_MAIN_PALETTE_RESID, - healthbox_singles_player_ncer, - healthbox_singles_player_nanr, + healthbox_singles_player_NCER_lz, + healthbox_singles_player_NANR_lz, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -361,10 +361,10 @@ static const SpriteTemplate sHealthbarTemplate_SoloEnemy = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - healthbox_singles_opponent_ncgr, + healthbox_singles_opponent_NCGR_lz, HEALTHBAR_MAIN_PALETTE_RESID, - healthbox_singles_opponent_ncer, - healthbox_singles_opponent_nanr, + healthbox_singles_opponent_NCER_lz, + healthbox_singles_opponent_NANR_lz, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -381,10 +381,10 @@ static const SpriteTemplate sHealthbarTemplate_PlayerSlot1 = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - healthbox_doubles_player_1_ncgr, + healthbox_doubles_player_1_NCGR_lz, HEALTHBAR_MAIN_PALETTE_RESID, - healthbox_doubles_player_1_ncer, - healthbox_doubles_player_1_nanr, + healthbox_doubles_player_1_NCER_lz, + healthbox_doubles_player_1_NANR_lz, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -401,10 +401,10 @@ static const SpriteTemplate sHealthbarTemplate_EnemySlot1 = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - healthbox_doubles_opponent_1_ncgr, + healthbox_doubles_opponent_1_NCGR_lz, HEALTHBAR_MAIN_PALETTE_RESID, - healthbox_doubles_opponent_1_ncer, - healthbox_doubles_opponent_1_nanr, + healthbox_doubles_opponent_1_NCER_lz, + healthbox_doubles_opponent_1_NANR_lz, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -421,10 +421,10 @@ static const SpriteTemplate sHealthbarTemplate_PlayerSlot2 = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - healthbox_doubles_player_2_ncgr, + healthbox_doubles_player_2_NCGR_lz, HEALTHBAR_MAIN_PALETTE_RESID, - healthbox_doubles_player_2_ncer, - healthbox_doubles_player_2_nanr, + healthbox_doubles_player_2_NCER_lz, + healthbox_doubles_player_2_NANR_lz, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -441,10 +441,10 @@ static const SpriteTemplate sHealthbarTemplate_EnemySlot2 = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - healthbox_doubles_opponent_2_ncgr, + healthbox_doubles_opponent_2_NCGR_lz, HEALTHBAR_MAIN_PALETTE_RESID, - healthbox_doubles_opponent_2_ncer, - healthbox_doubles_opponent_2_nanr, + healthbox_doubles_opponent_2_NCER_lz, + healthbox_doubles_opponent_2_NANR_lz, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -474,10 +474,10 @@ static const SpriteTemplate sHealthbarTemplate_NoPlayerMon = { .plttIdx = 0, .vramType = NNS_G2D_VRAM_TYPE_2DMAIN, .resources = { - healthbox_safari_ncgr, + healthbox_safari_NCGR_lz, HEALTHBAR_SAFARI_PALETTE_RESID, - healthbox_safari_ncer, - healthbox_safari_nanr, + healthbox_safari_NCER_lz, + healthbox_safari_NANR_lz, SPRITE_RESOURCE_NONE, SPRITE_RESOURCE_NONE, }, @@ -492,13 +492,13 @@ void Healthbar_LoadResources(SpriteRenderer *renderer, SpriteGfxHandler *gfxHand const SpriteTemplate *template = Healthbar_SpriteTemplate(healthbarType); SpriteRenderer_LoadCharResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[0], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, template->resources[0]); - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_normal_nclr, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_MAIN_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_normal_NCLR, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_MAIN_PALETTE_RESID); SpriteRenderer_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[2], TRUE, template->resources[2]); SpriteRenderer_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[3], TRUE, template->resources[3]); - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_normal_nclr, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_EFFECTS_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_normal_NCLR, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_EFFECTS_PALETTE_RESID); if (healthbarType == HEALTHBAR_TYPE_SAFARI_ZONE || healthbarType == HEALTHBAR_TYPE_PAL_PARK) { - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_safari_nclr, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_SAFARI_PALETTE_RESID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, healthbox_safari_NCLR, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_SAFARI_PALETTE_RESID); } } diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index edef815ae3..ed77617e1c 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -50,60 +50,60 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { * Maps a battle terrain index to the NARC member in pl_batt_obj containing the player's sprite for it. */ __attribute__((aligned(4))) static const u16 sBattleTerrainPlayerTiles[] = { - [TERRAIN_PLAIN] = battle_terrain_path_player_ncgr, - [TERRAIN_SAND] = battle_terrain_sand_player_ncgr, - [TERRAIN_GRASS] = battle_terrain_grass_player_ncgr, - [TERRAIN_PUDDLE] = battle_terrain_puddle_player_ncgr, - [TERRAIN_MOUNTAIN] = battle_terrain_mountain_player_ncgr, - [TERRAIN_CAVE] = battle_terrain_cave_player_ncgr, - [TERRAIN_SNOW] = battle_terrain_snow_player_ncgr, - [TERRAIN_WATER] = battle_terrain_surf_player_ncgr, - [TERRAIN_ICE] = battle_terrain_ice_player_ncgr, - [TERRAIN_BUILDING] = battle_terrain_indoors_player_ncgr, - [TERRAIN_GREAT_MARSH] = battle_terrain_mud_player_ncgr, - [TERRAIN_BRIDGE] = battle_terrain_puddle_player_ncgr, - [TERRAIN_AARON] = battle_terrain_elite4_aaron_player_ncgr, - [TERRAIN_BERTHA] = battle_terrain_elite4_bertha_player_ncgr, - [TERRAIN_FLINT] = battle_terrain_elite4_flint_player_ncgr, - [TERRAIN_LUCIAN] = battle_terrain_elite4_lucian_player_ncgr, - [TERRAIN_CYNTHIA] = battle_terrain_champion_player_ncgr, - [TERRAIN_DISTORTION_WORLD] = battle_terrain_distortion_world_player_ncgr, - [TERRAIN_BATTLE_TOWER] = battle_terrain_tower_player_ncgr, - [TERRAIN_BATTLE_FACTORY] = battle_terrain_factory_player_ncgr, - [TERRAIN_BATTLE_ARCADE] = battle_terrain_arcade_player_ncgr, - [TERRAIN_BATTLE_CASTLE] = battle_terrain_castle_player_ncgr, - [TERRAIN_BATTLE_HALL] = battle_terrain_hall_player_ncgr, - [TERRAIN_GIRATINA] = battle_terrain_giratina_player_ncgr + [TERRAIN_PLAIN] = battle_terrain_path_player_NCGR_lz, + [TERRAIN_SAND] = battle_terrain_sand_player_NCGR_lz, + [TERRAIN_GRASS] = battle_terrain_grass_player_NCGR_lz, + [TERRAIN_PUDDLE] = battle_terrain_puddle_player_NCGR_lz, + [TERRAIN_MOUNTAIN] = battle_terrain_mountain_player_NCGR_lz, + [TERRAIN_CAVE] = battle_terrain_cave_player_NCGR_lz, + [TERRAIN_SNOW] = battle_terrain_snow_player_NCGR_lz, + [TERRAIN_WATER] = battle_terrain_surf_player_NCGR_lz, + [TERRAIN_ICE] = battle_terrain_ice_player_NCGR_lz, + [TERRAIN_BUILDING] = battle_terrain_indoors_player_NCGR_lz, + [TERRAIN_GREAT_MARSH] = battle_terrain_mud_player_NCGR_lz, + [TERRAIN_BRIDGE] = battle_terrain_puddle_player_NCGR_lz, + [TERRAIN_AARON] = battle_terrain_elite4_aaron_player_NCGR_lz, + [TERRAIN_BERTHA] = battle_terrain_elite4_bertha_player_NCGR_lz, + [TERRAIN_FLINT] = battle_terrain_elite4_flint_player_NCGR_lz, + [TERRAIN_LUCIAN] = battle_terrain_elite4_lucian_player_NCGR_lz, + [TERRAIN_CYNTHIA] = battle_terrain_champion_player_NCGR_lz, + [TERRAIN_DISTORTION_WORLD] = battle_terrain_distortion_world_player_NCGR_lz, + [TERRAIN_BATTLE_TOWER] = battle_terrain_tower_player_NCGR_lz, + [TERRAIN_BATTLE_FACTORY] = battle_terrain_factory_player_NCGR_lz, + [TERRAIN_BATTLE_ARCADE] = battle_terrain_arcade_player_NCGR_lz, + [TERRAIN_BATTLE_CASTLE] = battle_terrain_castle_player_NCGR_lz, + [TERRAIN_BATTLE_HALL] = battle_terrain_hall_player_NCGR_lz, + [TERRAIN_GIRATINA] = battle_terrain_giratina_player_NCGR_lz }; /* * Maps a battle terrain index to the NARC member in pl_batt_obj containing the opponent's sprite for it. */ __attribute__((aligned(4))) static const u16 sBattleTerrainOpponentTiles[] = { - [TERRAIN_PLAIN] = battle_terrain_path_opponent_ncgr, - [TERRAIN_SAND] = battle_terrain_sand_opponent_ncgr, - [TERRAIN_GRASS] = battle_terrain_grass_opponent_ncgr, - [TERRAIN_PUDDLE] = battle_terrain_puddle_opponent_ncgr, - [TERRAIN_MOUNTAIN] = battle_terrain_mountain_opponent_ncgr, - [TERRAIN_CAVE] = battle_terrain_cave_opponent_ncgr, - [TERRAIN_SNOW] = battle_terrain_snow_opponent_ncgr, - [TERRAIN_WATER] = battle_terrain_surf_opponent_ncgr, - [TERRAIN_ICE] = battle_terrain_ice_opponent_ncgr, - [TERRAIN_BUILDING] = battle_terrain_indoors_opponent_ncgr, - [TERRAIN_GREAT_MARSH] = battle_terrain_mud_opponent_ncgr, - [TERRAIN_BRIDGE] = battle_terrain_mud_opponent_ncgr, - [TERRAIN_AARON] = battle_terrain_elite4_aaron_opponent_ncgr, - [TERRAIN_BERTHA] = battle_terrain_elite4_bertha_opponent_ncgr, - [TERRAIN_FLINT] = battle_terrain_elite4_flint_opponent_ncgr, - [TERRAIN_LUCIAN] = battle_terrain_elite4_lucian_opponent_ncgr, - [TERRAIN_CYNTHIA] = battle_terrain_champion_opponent_ncgr, - [TERRAIN_DISTORTION_WORLD] = battle_terrain_distortion_world_opponent_ncgr, - [TERRAIN_BATTLE_TOWER] = battle_terrain_tower_opponent_ncgr, - [TERRAIN_BATTLE_FACTORY] = battle_terrain_factory_opponent_ncgr, - [TERRAIN_BATTLE_ARCADE] = battle_terrain_arcade_opponent_ncgr, - [TERRAIN_BATTLE_CASTLE] = battle_terrain_castle_opponent_ncgr, - [TERRAIN_BATTLE_HALL] = battle_terrain_hall_opponent_ncgr, - [TERRAIN_GIRATINA] = battle_terrain_giratina_opponent_ncgr + [TERRAIN_PLAIN] = battle_terrain_path_opponent_NCGR_lz, + [TERRAIN_SAND] = battle_terrain_sand_opponent_NCGR_lz, + [TERRAIN_GRASS] = battle_terrain_grass_opponent_NCGR_lz, + [TERRAIN_PUDDLE] = battle_terrain_puddle_opponent_NCGR_lz, + [TERRAIN_MOUNTAIN] = battle_terrain_mountain_opponent_NCGR_lz, + [TERRAIN_CAVE] = battle_terrain_cave_opponent_NCGR_lz, + [TERRAIN_SNOW] = battle_terrain_snow_opponent_NCGR_lz, + [TERRAIN_WATER] = battle_terrain_surf_opponent_NCGR_lz, + [TERRAIN_ICE] = battle_terrain_ice_opponent_NCGR_lz, + [TERRAIN_BUILDING] = battle_terrain_indoors_opponent_NCGR_lz, + [TERRAIN_GREAT_MARSH] = battle_terrain_mud_opponent_NCGR_lz, + [TERRAIN_BRIDGE] = battle_terrain_mud_opponent_NCGR_lz, + [TERRAIN_AARON] = battle_terrain_elite4_aaron_opponent_NCGR_lz, + [TERRAIN_BERTHA] = battle_terrain_elite4_bertha_opponent_NCGR_lz, + [TERRAIN_FLINT] = battle_terrain_elite4_flint_opponent_NCGR_lz, + [TERRAIN_LUCIAN] = battle_terrain_elite4_lucian_opponent_NCGR_lz, + [TERRAIN_CYNTHIA] = battle_terrain_champion_opponent_NCGR_lz, + [TERRAIN_DISTORTION_WORLD] = battle_terrain_distortion_world_opponent_NCGR_lz, + [TERRAIN_BATTLE_TOWER] = battle_terrain_tower_opponent_NCGR_lz, + [TERRAIN_BATTLE_FACTORY] = battle_terrain_factory_opponent_NCGR_lz, + [TERRAIN_BATTLE_ARCADE] = battle_terrain_arcade_opponent_NCGR_lz, + [TERRAIN_BATTLE_CASTLE] = battle_terrain_castle_opponent_NCGR_lz, + [TERRAIN_BATTLE_HALL] = battle_terrain_hall_opponent_NCGR_lz, + [TERRAIN_GIRATINA] = battle_terrain_giratina_opponent_NCGR_lz }; /* @@ -111,30 +111,30 @@ __attribute__((aligned(4))) static const u16 sBattleTerrainOpponentTiles[] = { * Each battle terrain has 3 palette options for different times of day. */ __attribute__((aligned(4))) static const u16 sBattleTerrainPaletteFileIndex[][3] = { - [TERRAIN_PLAIN] = { battle_terrain_path_day_nclr, battle_terrain_path_afternoon_nclr, battle_terrain_path_night_nclr }, - [TERRAIN_SAND] = { battle_terrain_sand_day_nclr, battle_terrain_sand_afternoon_nclr, battle_terrain_sand_night_nclr }, - [TERRAIN_GRASS] = { battle_terrain_grass_day_nclr, battle_terrain_grass_afternoon_nclr, battle_terrain_grass_night_nclr }, - [TERRAIN_PUDDLE] = { battle_terrain_puddle_day_nclr, battle_terrain_puddle_afternoon_nclr, battle_terrain_puddle_night_nclr }, - [TERRAIN_MOUNTAIN] = { battle_terrain_mountain_day_nclr, battle_terrain_mountain_afternoon_nclr, battle_terrain_mountain_night_nclr }, - [TERRAIN_CAVE] = { battle_terrain_cave_day_nclr, battle_terrain_cave_afternoon_nclr, battle_terrain_cave_night_nclr }, - [TERRAIN_SNOW] = { battle_terrain_snow_day_nclr, battle_terrain_snow_afternoon_nclr, battle_terrain_snow_night_nclr }, - [TERRAIN_WATER] = { battle_terrain_surf_day_nclr, battle_terrain_surf_afternoon_nclr, battle_terrain_surf_night_nclr }, - [TERRAIN_ICE] = { battle_terrain_ice_day_nclr, battle_terrain_ice_afternoon_nclr, battle_terrain_ice_night_nclr }, - [TERRAIN_BUILDING] = { battle_terrain_indoors_day_nclr, battle_terrain_indoors_afternoon_nclr, battle_terrain_indoors_night_nclr }, - [TERRAIN_GREAT_MARSH] = { battle_terrain_mud_day_nclr, battle_terrain_mud_afternoon_nclr, battle_terrain_mud_night_nclr }, - [TERRAIN_BRIDGE] = { battle_terrain_mud_day_nclr, battle_terrain_mud_afternoon_nclr, battle_terrain_mud_night_nclr }, - [TERRAIN_AARON] = { battle_terrain_elite4_aaron_day_nclr, battle_terrain_elite4_aaron_afternoon_nclr, battle_terrain_elite4_aaron_night_nclr }, - [TERRAIN_BERTHA] = { battle_terrain_elite4_bertha_day_nclr, battle_terrain_elite4_bertha_afternoon_nclr, battle_terrain_elite4_bertha_night_nclr }, - [TERRAIN_FLINT] = { battle_terrain_elite4_flint_day_nclr, battle_terrain_elite4_flint_afternoon_nclr, battle_terrain_elite4_flint_night_nclr }, - [TERRAIN_LUCIAN] = { battle_terrain_elite4_lucian_day_nclr, battle_terrain_elite4_lucian_afternoon_nclr, battle_terrain_elite4_lucian_night_nclr }, - [TERRAIN_CYNTHIA] = { battle_terrain_champion_day_nclr, battle_terrain_champion_afternoon_nclr, battle_terrain_champion_night_nclr }, - [TERRAIN_DISTORTION_WORLD] = { battle_terrain_distortion_world_day_nclr, battle_terrain_distortion_world_afternoon_nclr, battle_terrain_distortion_world_night_nclr }, - [TERRAIN_BATTLE_TOWER] = { battle_terrain_tower_day_nclr, battle_terrain_tower_afternoon_nclr, battle_terrain_tower_night_nclr }, - [TERRAIN_BATTLE_FACTORY] = { battle_terrain_factory_day_nclr, battle_terrain_factory_afternoon_nclr, battle_terrain_factory_night_nclr }, - [TERRAIN_BATTLE_ARCADE] = { battle_terrain_arcade_day_nclr, battle_terrain_arcade_afternoon_nclr, battle_terrain_arcade_night_nclr }, - [TERRAIN_BATTLE_CASTLE] = { battle_terrain_castle_day_nclr, battle_terrain_castle_afternoon_nclr, battle_terrain_castle_night_nclr }, - [TERRAIN_BATTLE_HALL] = { battle_terrain_hall_day_nclr, battle_terrain_hall_afternoon_nclr, battle_terrain_hall_night_nclr }, - [TERRAIN_GIRATINA] = { battle_terrain_giratina_day_nclr, battle_terrain_giratina_afternoon_nclr, battle_terrain_giratina_night_nclr } + [TERRAIN_PLAIN] = { battle_terrain_path_day_NCLR, battle_terrain_path_afternoon_NCLR, battle_terrain_path_night_NCLR }, + [TERRAIN_SAND] = { battle_terrain_sand_day_NCLR, battle_terrain_sand_afternoon_NCLR, battle_terrain_sand_night_NCLR }, + [TERRAIN_GRASS] = { battle_terrain_grass_day_NCLR, battle_terrain_grass_afternoon_NCLR, battle_terrain_grass_night_NCLR }, + [TERRAIN_PUDDLE] = { battle_terrain_puddle_day_NCLR, battle_terrain_puddle_afternoon_NCLR, battle_terrain_puddle_night_NCLR }, + [TERRAIN_MOUNTAIN] = { battle_terrain_mountain_day_NCLR, battle_terrain_mountain_afternoon_NCLR, battle_terrain_mountain_night_NCLR }, + [TERRAIN_CAVE] = { battle_terrain_cave_day_NCLR, battle_terrain_cave_afternoon_NCLR, battle_terrain_cave_night_NCLR }, + [TERRAIN_SNOW] = { battle_terrain_snow_day_NCLR, battle_terrain_snow_afternoon_NCLR, battle_terrain_snow_night_NCLR }, + [TERRAIN_WATER] = { battle_terrain_surf_day_NCLR, battle_terrain_surf_afternoon_NCLR, battle_terrain_surf_night_NCLR }, + [TERRAIN_ICE] = { battle_terrain_ice_day_NCLR, battle_terrain_ice_afternoon_NCLR, battle_terrain_ice_night_NCLR }, + [TERRAIN_BUILDING] = { battle_terrain_indoors_day_NCLR, battle_terrain_indoors_afternoon_NCLR, battle_terrain_indoors_night_NCLR }, + [TERRAIN_GREAT_MARSH] = { battle_terrain_mud_day_NCLR, battle_terrain_mud_afternoon_NCLR, battle_terrain_mud_night_NCLR }, + [TERRAIN_BRIDGE] = { battle_terrain_mud_day_NCLR, battle_terrain_mud_afternoon_NCLR, battle_terrain_mud_night_NCLR }, + [TERRAIN_AARON] = { battle_terrain_elite4_aaron_day_NCLR, battle_terrain_elite4_aaron_afternoon_NCLR, battle_terrain_elite4_aaron_night_NCLR }, + [TERRAIN_BERTHA] = { battle_terrain_elite4_bertha_day_NCLR, battle_terrain_elite4_bertha_afternoon_NCLR, battle_terrain_elite4_bertha_night_NCLR }, + [TERRAIN_FLINT] = { battle_terrain_elite4_flint_day_NCLR, battle_terrain_elite4_flint_afternoon_NCLR, battle_terrain_elite4_flint_night_NCLR }, + [TERRAIN_LUCIAN] = { battle_terrain_elite4_lucian_day_NCLR, battle_terrain_elite4_lucian_afternoon_NCLR, battle_terrain_elite4_lucian_night_NCLR }, + [TERRAIN_CYNTHIA] = { battle_terrain_champion_day_NCLR, battle_terrain_champion_afternoon_NCLR, battle_terrain_champion_night_NCLR }, + [TERRAIN_DISTORTION_WORLD] = { battle_terrain_distortion_world_day_NCLR, battle_terrain_distortion_world_afternoon_NCLR, battle_terrain_distortion_world_night_NCLR }, + [TERRAIN_BATTLE_TOWER] = { battle_terrain_tower_day_NCLR, battle_terrain_tower_afternoon_NCLR, battle_terrain_tower_night_NCLR }, + [TERRAIN_BATTLE_FACTORY] = { battle_terrain_factory_day_NCLR, battle_terrain_factory_afternoon_NCLR, battle_terrain_factory_night_NCLR }, + [TERRAIN_BATTLE_ARCADE] = { battle_terrain_arcade_day_NCLR, battle_terrain_arcade_afternoon_NCLR, battle_terrain_arcade_night_NCLR }, + [TERRAIN_BATTLE_CASTLE] = { battle_terrain_castle_day_NCLR, battle_terrain_castle_afternoon_NCLR, battle_terrain_castle_night_NCLR }, + [TERRAIN_BATTLE_HALL] = { battle_terrain_hall_day_NCLR, battle_terrain_hall_afternoon_NCLR, battle_terrain_hall_night_NCLR }, + [TERRAIN_GIRATINA] = { battle_terrain_giratina_day_NCLR, battle_terrain_giratina_afternoon_NCLR, battle_terrain_giratina_night_NCLR } }; void ov16_02268520(UnkStruct_ov16_02268520 *param0) @@ -155,16 +155,16 @@ void ov16_02268520(UnkStruct_ov16_02268520 *param0) if (param0->unk_08 == 0) { v3 = sBattleTerrainPlayerTiles[param0->unk_09]; v4 = 20013; - v5 = battle_terrain_player_ncer; + v5 = battle_terrain_player_NCER_lz; v6 = 20005; - v7 = battle_terrain_player_nanr; + v7 = battle_terrain_player_NANR_lz; v8 = 20005; } else { v3 = sBattleTerrainOpponentTiles[param0->unk_09]; v4 = 20014; - v5 = battle_terrain_opponent_ncer; + v5 = battle_terrain_opponent_NCER_lz; v6 = 20006; - v7 = battle_terrain_opponent_nanr; + v7 = battle_terrain_opponent_NANR_lz; v8 = 20006; } diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index d34ec2c186..c015b1a173 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -1340,13 +1340,13 @@ void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1) v1 = ov16_0223E010(param1->unk_00); v2 = ov16_0223E018(param1->unk_00); - SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_ncgr, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); - SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_ncer, 1, 20015); - SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_nanr, 1, 20015); + SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_NCGR_lz, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20023); + SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_NCER_lz, 1, 20015); + SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_player_NANR_lz, 1, 20015); - SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_ncgr, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); - SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_ncer, 1, 20016); - SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_nanr, 1, 20016); + SpriteRenderer_LoadCharResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_NCGR_lz, 1, NNS_G2D_VRAM_TYPE_2DSUB, 20024); + SpriteRenderer_LoadCellResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_NCER_lz, 1, 20016); + SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, param0, ball_status_indicator_opponent_NANR_lz, 1, 20016); for (v0 = 0; v0 < 6; v0++) { param1->unk_5BC[v0] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_02270414); diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index fe69f8f940..f1454385be 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -49,10 +49,10 @@ void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param3); - SpriteRenderer_LoadPalette(param2, 3, param0, param1, v0, battle_subscreen_cursor_corner_nclr, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param5); - SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_ncgr, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); - SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_ncer, 1, param6); - SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_nanr, 1, param7); + SpriteRenderer_LoadPalette(param2, 3, param0, param1, v0, battle_subscreen_cursor_corner_NCLR, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param5); + SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_NCGR_lz, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); + SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_NCER_lz, 1, param6); + SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, v0, battle_subscreen_cursor_corner_NANR_lz, 1, param7); NARC_dtor(v0); } diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c index 970f26fb1a..d15c946030 100644 --- a/src/battle/party_gauge.c +++ b/src/battle/party_gauge.c @@ -201,10 +201,10 @@ void PartyGauge_LoadGraphics(SpriteRenderer *renderer, SpriteGfxHandler *gfxHand { NARC *narc = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, HEAP_ID_BATTLE); - SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, party_gauge_nclr, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, PARTY_GAUGE_PLTT_RES_ID); - SpriteRenderer_LoadCharResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_ncgr, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, PARTY_GAUGE_CHAR_RES_ID); - SpriteRenderer_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_ncer, TRUE, PARTY_GAUGE_CELL_RES_ID); - SpriteRenderer_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_nanr, TRUE, PARTY_GAUGE_ANIM_RES_ID); + SpriteRenderer_LoadPalette(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, party_gauge_NCLR, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, PARTY_GAUGE_PLTT_RES_ID); + SpriteRenderer_LoadCharResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_NCGR_lz, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, PARTY_GAUGE_CHAR_RES_ID); + SpriteRenderer_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_NCER_lz, TRUE, PARTY_GAUGE_CELL_RES_ID); + SpriteRenderer_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, party_gauge_NANR_lz, TRUE, PARTY_GAUGE_ANIM_RES_ID); NARC_dtor(narc); } diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 50d886aba3..8e3c50c800 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -1499,10 +1499,10 @@ static void ov10_022210F4(UnkStruct_ov10_0221FB28 *param0) v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param0->unk_00->unk_24); - SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_ncgr, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47111); + SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_NCGR_lz, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47111); sub_0200CC9C(param0->unk_190, param0->unk_194, 108, 8, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47111); - SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_ncer, 1, 47111); - SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_nanr, 1, 47111); + SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_NCER_lz, 1, 47111); + SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, ball_status_indicator_player_NANR_lz, 1, 47111); NARC_dtor(v0); } diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index 76b055b850..6800b54632 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -134,26 +134,26 @@ static BOOL ov12_02237474(BallRotation *param0); * These NARC members describe the sprite, palette, cell, and anim to use for that ball. */ static const int sThrownBallSpriteResources[][4] = { - { master_ball_throw_ncgr, master_ball_throw_nclr, master_ball_throw_ncer, master_ball_throw_nanr }, - { ultra_ball_throw_ncgr, ultra_ball_throw_nclr, ultra_ball_throw_ncer, ultra_ball_throw_nanr }, - { great_ball_throw_ncgr, great_ball_throw_nclr, great_ball_throw_ncer, great_ball_throw_nanr }, - { poke_ball_throw_ncgr, poke_ball_throw_nclr, poke_ball_throw_ncer, poke_ball_throw_nanr }, - { safari_ball_throw_ncgr, safari_ball_throw_nclr, safari_ball_throw_ncer, safari_ball_throw_nanr }, - { net_ball_throw_ncgr, net_ball_throw_nclr, net_ball_throw_ncer, net_ball_throw_nanr }, - { dive_ball_throw_ncgr, dive_ball_throw_nclr, dive_ball_throw_ncer, dive_ball_throw_nanr }, - { nest_ball_throw_ncgr, nest_ball_throw_nclr, nest_ball_throw_ncer, nest_ball_throw_nanr }, - { repeat_ball_throw_ncgr, repeat_ball_throw_nclr, repeat_ball_throw_ncer, repeat_ball_throw_nanr }, - { timer_ball_throw_ncgr, timer_ball_throw_nclr, timer_ball_throw_ncer, timer_ball_throw_nanr }, - { luxury_ball_throw_ncgr, luxury_ball_throw_nclr, luxury_ball_throw_ncer, luxury_ball_throw_nanr }, - { premier_ball_throw_ncgr, premier_ball_throw_nclr, premier_ball_throw_ncer, premier_ball_throw_nanr }, - { dusk_ball_throw_ncgr, dusk_ball_throw_nclr, dusk_ball_throw_ncer, dusk_ball_throw_nanr }, - { heal_ball_throw_ncgr, heal_ball_throw_nclr, heal_ball_throw_ncer, heal_ball_throw_nanr }, - { quick_ball_throw_ncgr, quick_ball_throw_nclr, quick_ball_throw_ncer, quick_ball_throw_nanr }, - { cherish_ball_throw_ncgr, cherish_ball_throw_nclr, cherish_ball_throw_ncer, cherish_ball_throw_nanr }, - { park_ball_throw_ncgr, park_ball_throw_nclr, park_ball_throw_ncer, park_ball_throw_nanr }, - { mud_throw_ncgr, mud_throw_nclr, mud_throw_ncer, mud_throw_nanr }, - { bait_throw_ncgr, bait_throw_nclr, bait_throw_ncer, bait_throw_nanr }, - { bait_throw_ncgr, bait_throw_nclr, bait_throw_ncer, bait_throw_nanr } + { master_ball_throw_NCGR_lz, master_ball_throw_NCLR, master_ball_throw_NCER_lz, master_ball_throw_NANR_lz }, + { ultra_ball_throw_NCGR_lz, ultra_ball_throw_NCLR, ultra_ball_throw_NCER_lz, ultra_ball_throw_NANR_lz }, + { great_ball_throw_NCGR_lz, great_ball_throw_NCLR, great_ball_throw_NCER_lz, great_ball_throw_NANR_lz }, + { poke_ball_throw_NCGR_lz, poke_ball_throw_NCLR, poke_ball_throw_NCER_lz, poke_ball_throw_NANR_lz }, + { safari_ball_throw_NCGR_lz, safari_ball_throw_NCLR, safari_ball_throw_NCER_lz, safari_ball_throw_NANR_lz }, + { net_ball_throw_NCGR_lz, net_ball_throw_NCLR, net_ball_throw_NCER_lz, net_ball_throw_NANR_lz }, + { dive_ball_throw_NCGR_lz, dive_ball_throw_NCLR, dive_ball_throw_NCER_lz, dive_ball_throw_NANR_lz }, + { nest_ball_throw_NCGR_lz, nest_ball_throw_NCLR, nest_ball_throw_NCER_lz, nest_ball_throw_NANR_lz }, + { repeat_ball_throw_NCGR_lz, repeat_ball_throw_NCLR, repeat_ball_throw_NCER_lz, repeat_ball_throw_NANR_lz }, + { timer_ball_throw_NCGR_lz, timer_ball_throw_NCLR, timer_ball_throw_NCER_lz, timer_ball_throw_NANR_lz }, + { luxury_ball_throw_NCGR_lz, luxury_ball_throw_NCLR, luxury_ball_throw_NCER_lz, luxury_ball_throw_NANR_lz }, + { premier_ball_throw_NCGR_lz, premier_ball_throw_NCLR, premier_ball_throw_NCER_lz, premier_ball_throw_NANR_lz }, + { dusk_ball_throw_NCGR_lz, dusk_ball_throw_NCLR, dusk_ball_throw_NCER_lz, dusk_ball_throw_NANR_lz }, + { heal_ball_throw_NCGR_lz, heal_ball_throw_NCLR, heal_ball_throw_NCER_lz, heal_ball_throw_NANR_lz }, + { quick_ball_throw_NCGR_lz, quick_ball_throw_NCLR, quick_ball_throw_NCER_lz, quick_ball_throw_NANR_lz }, + { cherish_ball_throw_NCGR_lz, cherish_ball_throw_NCLR, cherish_ball_throw_NCER_lz, cherish_ball_throw_NANR_lz }, + { park_ball_throw_NCGR_lz, park_ball_throw_NCLR, park_ball_throw_NCER_lz, park_ball_throw_NANR_lz }, + { mud_throw_NCGR_lz, mud_throw_NCLR, mud_throw_NCER_lz, mud_throw_NANR_lz }, + { bait_throw_NCGR_lz, bait_throw_NCLR, bait_throw_NCER_lz, bait_throw_NANR_lz }, + { bait_throw_NCGR_lz, bait_throw_NCLR, bait_throw_NCER_lz, bait_throw_NANR_lz } }; static const int Unk_ov12_0223AD70[][2] = { diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c index d4c56d3e59..b7e6b896b4 100644 --- a/src/overlay017/ov17_02252AB0.c +++ b/src/overlay017/ov17_02252AB0.c @@ -43,10 +43,10 @@ static const SpriteTemplate Unk_ov17_02254D9C = { void ov17_02252AB0(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, u32 param3, u32 param4, u32 param5, u32 param6) { - sub_0200CD7C(param2, 3, param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_nclr, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); - sub_0200CBDC(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_ncgr, 1, NNS_G2D_VRAM_TYPE_2DSUB, param3); - sub_0200CE0C(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_ncer, 1, param5); - sub_0200CE3C(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_nanr, 1, param6); + sub_0200CD7C(param2, 3, param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_NCLR, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); + sub_0200CBDC(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_NCGR_lz, 1, NNS_G2D_VRAM_TYPE_2DSUB, param3); + sub_0200CE0C(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_NCER_lz, 1, param5); + sub_0200CE3C(param0, param1, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, battle_subscreen_cursor_corner_NANR_lz, 1, param6); } void ov17_02252B20(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 45f2bc4264..e5bdc7bb2d 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -26,7 +26,6 @@ #include "text.h" #include "unk_0200762C.h" #include "unk_0200C440.h" -#include "unk_02018340.h" typedef struct { u16 unk_00; diff --git a/tools/scripts/meson.build b/tools/scripts/meson.build index 63e9bb0d94..5c20a881d9 100644 --- a/tools/scripts/meson.build +++ b/tools/scripts/meson.build @@ -10,5 +10,3 @@ make_species_tables_py = find_program('make_species_tables.py', native: true) make_tutorable_moves_py = find_program('make_tutorable_moves.py', native: true) make_pokedex_data_py = find_program('make_pokedex_data.py', native: true) make_pokedex_message_banks_py = find_program('make_pokedex_message_banks.py', native: true) - -subdir('pl_batt_obj') diff --git a/tools/scripts/pl_batt_obj/compress.py b/tools/scripts/pl_batt_obj/compress.py deleted file mode 100644 index a33a07ee35..0000000000 --- a/tools/scripts/pl_batt_obj/compress.py +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/python3 -#### from https://raw.githubusercontent.com/magical/nlzss/refs/heads/master/compress.py -#### covers for a nitrogfx issue which I couldn't figure out. remove this once nitrogfx can handle this case - -# used http://code.google.com/p/u-lzss/source/browse/trunk/js/lib/ulzss.js as -# a guide -from sys import stderr - -from collections import defaultdict -from operator import itemgetter -from struct import pack, unpack - -class SlidingWindow: - # The size of the sliding window - size = 4096 - - # The minimum displacement. - disp_min = 2 - - # The hard minimum — a disp less than this can't be represented in the - # compressed stream. - disp_start = 1 - - # The minimum length for a successful match in the window - match_min = 1 - - # The maximum length of a successful match, inclusive. - match_max = None - - def __init__(self, buf): - self.data = buf - self.hash = defaultdict(list) - self.full = False - - self.start = 0 - self.stop = 0 - #self.index = self.disp_min - 1 - self.index = 0 - - assert self.match_max is not None - - def next(self): - if self.index < self.disp_start - 1: - self.index += 1 - return - - if self.full: - olditem = self.data[self.start] - assert self.hash[olditem][0] == self.start - self.hash[olditem].pop(0) - - item = self.data[self.stop] - self.hash[item].append(self.stop) - self.stop += 1 - self.index += 1 - - if self.full: - self.start += 1 - else: - if self.size <= self.stop: - self.full = True - - def advance(self, n=1): - """Advance the window by n bytes""" - for _ in range(n): - self.next() - - def search(self): - match_max = self.match_max - match_min = self.match_min - - counts = [] - indices = self.hash[self.data[self.index]] - for i in indices: - matchlen = self.match(i, self.index) - if matchlen >= match_min: - disp = self.index - i - #assert self.index - disp >= 0 - #assert self.disp_min <= disp < self.size + self.disp_min - if self.disp_min <= disp: - counts.append((matchlen, -disp)) - if matchlen >= match_max: - #assert matchlen == match_max - return counts[-1] - - if counts: - match = max(counts, key=itemgetter(0)) - return match - - return None - - def match(self, start, bufstart): - size = self.index - start - - if size == 0: - return 0 - - matchlen = 0 - it = range(min(len(self.data) - bufstart, self.match_max)) - for i in it: - if self.data[start + (i % size)] == self.data[bufstart + i]: - matchlen += 1 - else: - break - return matchlen - -class NLZ10Window(SlidingWindow): - size = 4096 - - match_min = 3 - match_max = 3 + 0xf - -def _compress(input, windowclass=NLZ10Window): - """Generates a stream of tokens. Either a byte (int) or a tuple of (count, - displacement).""" - - window = windowclass(input) - - i = 0 - while True: - if len(input) <= i: - break - match = window.search() - if match: - yield match - #if match[1] == -283: - # raise Exception(match, i) - window.advance(match[0]) - i += match[0] - else: - yield input[i] - window.next() - i += 1 - -def packflags(flags): - n = 0 - for i in range(8): - n <<= 1 - try: - if flags[i]: - n |= 1 - except IndexError: - pass - return n - -def chunkit(it, n): - buf = [] - for x in it: - buf.append(x) - if n <= len(buf): - yield buf - buf = [] - if buf: - yield buf - -def compress(input, out): - # header - out.write(pack("B", packflags(flags))) - - for t in tokens: - if type(t) == tuple: - count, disp = t - count -= 3 - disp = (-disp) - 1 - assert 0 <= disp < 4096 - sh = (count << 12) | disp - out.write(pack(">H", sh)) - else: - out.write(pack(">B", t)) - - length += 1 - length += sum(2 if f else 1 for f in flags) - - # padding - padding = 4 - (length % 4 or 4) - if padding: - out.write(b'\x00' * padding) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py deleted file mode 100644 index c7c07e6d83..0000000000 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_anims.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import json -import pathlib -import subprocess -import os -import shutil -import compress - -argparser = argparse.ArgumentParser( - prog='pl_batt_obj.narc cell builder and compressor', - description='Builds NANR anim files and compresses if requested.' -) -argparser.add_argument('--nitrogfx', - required=True, - help='Path to nitrogfx executable') -argparser.add_argument('--input', - required=True, - help='Input NCLR file to make adjustments to.') -argparser.add_argument('--output', - required=True, - help='Output NCLR file to write to.') -argparser.add_argument('--private-dir', - required=True, - help='Path to the private directory (where binaries will be made)') -argparser.add_argument('--datafile', - required=True, - help='Contains details of how to build each input.') -args = argparser.parse_args() - -input_file = pathlib.Path(args.input) -output_file = pathlib.Path(args.output) -private_dir = pathlib.Path(args.private_dir) -with open(args.datafile) as f: - data_map = json.load(f) - -private_dir.mkdir(parents=True, exist_ok=True) - -dest_dir = private_dir / 'pl_batt_obj_work' -dest_dir.mkdir(parents=True, exist_ok=True) - -# adjust output_file to target the root private_dir for the build (hacky) -output_file = output_file.parent / ".." / "pl_batt_obj.narc.p" / output_file.name - -file_props = None -for props in data_map: - if props['target'] == input_file.name: - file_props = props - -if file_props == None: - raise Exception(f"Input anim file {input_file.name} is not listed in data map {args.datafile}") - -tmp_file = dest_dir / output_file.name - -ngfx_args = [args.nitrogfx, input_file, tmp_file] -subprocess.run(ngfx_args) - -if 'compressed' in file_props and file_props['compressed'] == True: - with open(tmp_file, mode="rb") as f: - with open(tmp_file.with_suffix(".lz"), mode="wb") as f2: - compress.compress(f.read(), f2) - tmp_file = tmp_file.with_suffix(".lz") - -shutil.copy(tmp_file, output_file.with_suffix(".nanr")) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_cells.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_cells.py deleted file mode 100644 index 08a1f8ad65..0000000000 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_cells.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import json -import pathlib -import subprocess -import os -import shutil -import compress - -argparser = argparse.ArgumentParser( - prog='pl_batt_obj.narc cell builder and compressor', - description='Builds NCER cell files and compresses if requested.' -) -argparser.add_argument('--nitrogfx', - required=True, - help='Path to nitrogfx executable') -argparser.add_argument('--input', - required=True, - help='Input NCLR file to make adjustments to.') -argparser.add_argument('--output', - required=True, - help='Output NCLR file to write to.') -argparser.add_argument('--private-dir', - required=True, - help='Path to the private directory (where binaries will be made)') -argparser.add_argument('--datafile', - required=True, - help='Contains details of how to build each input.') -args = argparser.parse_args() - -input_file = pathlib.Path(args.input) -output_file = pathlib.Path(args.output) -private_dir = pathlib.Path(args.private_dir) -with open(args.datafile) as f: - data_map = json.load(f) - -private_dir.mkdir(parents=True, exist_ok=True) - -dest_dir = private_dir / 'pl_batt_obj_work' -dest_dir.mkdir(parents=True, exist_ok=True) - -# adjust output_file to target the root private_dir for the build (hacky) -output_file = output_file.parent / ".." / "pl_batt_obj.narc.p" / output_file.name - -file_props = None -for props in data_map: - if props['target'] == input_file.name: - file_props = props - -if file_props == None: - raise Exception(f"Input cell file {input_file.name} is not listed in data map {args.datafile}") - -tmp_file = dest_dir / output_file.name - -ngfx_args = [args.nitrogfx, input_file, tmp_file] -subprocess.run(ngfx_args) - -if 'compressed' in file_props and file_props['compressed'] == True: - with open(tmp_file, mode="rb") as f: - with open(tmp_file.with_suffix(".lz"), mode="wb") as f2: - compress.compress(f.read(), f2) - tmp_file = tmp_file.with_suffix(".lz") - -shutil.copy(tmp_file, output_file.with_suffix(".ncer")) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py deleted file mode 100644 index b2d79d32a3..0000000000 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_palettes.py +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import json -import pathlib -import subprocess -import os -import shutil - -argparser = argparse.ArgumentParser( - prog='pl_batt_obj.narc palette builder and size fixer', - description='Builds NCLR palette files and fixes the size field if requested.' -) -argparser.add_argument('--nitrogfx', - required=True, - help='Path to nitrogfx executable') -argparser.add_argument('--input', - required=True, - help='Input NCLR file to make adjustments to.') -argparser.add_argument('--output', - required=True, - help='Output NCLR file to write to.') -argparser.add_argument('--private-dir', - required=True, - help='Path to the private directory (where binaries will be made)') -argparser.add_argument('--datafile', - required=True, - help='Contains details of how to build each input.') -args = argparser.parse_args() - -input_file = pathlib.Path(args.input) -output_file = pathlib.Path(args.output) -private_dir = pathlib.Path(args.private_dir) -with open(args.datafile) as f: - data_map = json.load(f) - -private_dir.mkdir(parents=True, exist_ok=True) - -dest_dir = private_dir / 'pl_batt_obj_work' -dest_dir.mkdir(parents=True, exist_ok=True) - -# adjust output_file to target the root private_dir for the build (hacky) -output_file = output_file.parent / ".." / "pl_batt_obj.narc.p" / output_file.name - -file_props = None -for props in data_map: - if props['target'] == input_file.name: - file_props = props - -if file_props == None: - raise Exception(f"Input palette file {input_file.name} is not listed in data map {args.datafile}") - -tmp_file = dest_dir / output_file.name - -ngfx_args = [args.nitrogfx, input_file, tmp_file] -if 'bitdepth' in file_props and file_props['bitdepth'] != None: - ngfx_args.append('-bitdepth') - ngfx_args.append(str(file_props['bitdepth'])) -if 'pad' in file_props and file_props['pad'] == False: - ngfx_args.append('-nopad') -if 'pcmp' in file_props and file_props['pcmp'] == True: - ngfx_args.append('-pcmp') - -subprocess.run(ngfx_args) - -if 'invert_size' in file_props and file_props['invert_size'] == True: - with open(tmp_file, mode="rb") as f: - data = f.read() - size = int.from_bytes(data[32:36], byteorder='little') - size = 512 - size - data = data[:32] + int.to_bytes(size, byteorder='little', length=4) + data[36:] - - with open(tmp_file, mode="wb") as f: - f.write(data) - -shutil.copy(tmp_file, output_file.with_suffix(".nclr")) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py b/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py deleted file mode 100644 index 9527a9524f..0000000000 --- a/tools/scripts/pl_batt_obj/make_pl_batt_obj_sprites.py +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env python3 -import argparse -import json -import pathlib -import subprocess -import os -import shutil -import compress - -argparser = argparse.ArgumentParser( - prog='pl_batt_obj.narc sprite builder and compressor', - description='Builds NCGR sprite files and compresses if requested.' -) -argparser.add_argument('--nitrogfx', - required=True, - help='Path to nitrogfx executable') -argparser.add_argument('--input', - required=True, - help='Input NCLR file to make adjustments to.') -argparser.add_argument('--output', - required=True, - help='Output NCLR file to write to.') -argparser.add_argument('--private-dir', - required=True, - help='Path to the private directory (where binaries will be made)') -argparser.add_argument('--datafile', - required=True, - help='Contains details of how to build each input.') -args = argparser.parse_args() - -input_file = pathlib.Path(args.input) -output_file = pathlib.Path(args.output) -private_dir = pathlib.Path(args.private_dir) -with open(args.datafile) as f: - data_map = json.load(f) - -private_dir.mkdir(parents=True, exist_ok=True) - -dest_dir = private_dir / 'pl_batt_obj_work' -dest_dir.mkdir(parents=True, exist_ok=True) - -# adjust output_file to target the root private_dir for the build (hacky) -output_file = output_file.parent / ".." / "pl_batt_obj.narc.p" / output_file.name - -file_props = None -for props in data_map: - if props['target'] == input_file.name: - file_props = props - -if file_props == None: - raise Exception(f"Input sprite file {input_file.name} is not listed in data map {args.datafile}") - -tmp_file = dest_dir / output_file.name - -ngfx_args = [args.nitrogfx, input_file, tmp_file] -if 'clobber_size' in file_props and file_props['clobber_size'] == True: - ngfx_args.append('-clobbersize') -if 'mapping_type' in file_props: - ngfx_args.append('-mappingtype') - ngfx_args.append(str(file_props['mapping_type'])) -if 'version101' in file_props and file_props['version101'] == True: - ngfx_args.append('-version101') -if 'vram' in file_props and file_props['vram'] == True: - ngfx_args.append('-vram') -if 'tiles' in file_props: - ngfx_args.append('-num_tiles') - ngfx_args.append(str(file_props['tiles'])) - -subprocess.run(ngfx_args) - -if 'compressed' in file_props and file_props['compressed'] == True: - with open(tmp_file, mode="rb") as f: - with open(tmp_file.with_suffix(".lz"), mode="wb") as f2: - compress.compress(f.read(), f2) - tmp_file = tmp_file.with_suffix(".lz") - -shutil.copy(tmp_file, output_file.with_suffix(".ncgr")) \ No newline at end of file diff --git a/tools/scripts/pl_batt_obj/meson.build b/tools/scripts/pl_batt_obj/meson.build deleted file mode 100644 index f103a910ff..0000000000 --- a/tools/scripts/pl_batt_obj/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -make_pl_batt_obj_palettes_py = find_program('make_pl_batt_obj_palettes.py', native: true) -make_pl_batt_obj_sprites_py = find_program('make_pl_batt_obj_sprites.py', native: true) -make_pl_batt_obj_cells_py = find_program('make_pl_batt_obj_cells.py', native: true) -make_pl_batt_obj_anims_py = find_program('make_pl_batt_obj_anims.py', native: true) \ No newline at end of file From 2113cb38914e89340ca9f38b322744053bfb168d Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Mon, 28 Oct 2024 13:09:06 -0500 Subject: [PATCH 24/26] apply clang-format, format got messed up after rebase --- src/battle/battle_icon.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/battle/battle_icon.c b/src/battle/battle_icon.c index 62ab50c406..a8e302871f 100644 --- a/src/battle/battle_icon.c +++ b/src/battle/battle_icon.c @@ -3,15 +3,17 @@ #include #include +#include "consts/moves.h" +#include "consts/pokemon.h" + #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "consts/pokemon.h" -#include "consts/moves.h" -#include "palette.h" #include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" + +#include "palette.h" #include "unk_0200C6E4.h" // these do not align with the types defined in consts/pokemon.json. From c7ab5db95fb27f44a75e3b67aadc51225ca13308 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Sat, 9 Nov 2024 15:13:14 -0500 Subject: [PATCH 25/26] fix build issue after merge from main --- src/applications/pokemon_summary_screen/sprite.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/applications/pokemon_summary_screen/sprite.c b/src/applications/pokemon_summary_screen/sprite.c index 910d8d5aed..e3a38cb586 100644 --- a/src/applications/pokemon_summary_screen/sprite.c +++ b/src/applications/pokemon_summary_screen/sprite.c @@ -22,7 +22,6 @@ #include "ribbon.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" -#include "unk_0207C908.h" static void sub_0208F194(PokemonSummaryScreen *param0, u8 param1, u8 param2, u8 param3); static void sub_0208EF0C(PokemonSummaryScreen *param0); From c3353f68c5ed89303313bb92552cd78b9ef31983 Mon Sep 17 00:00:00 2001 From: Joshua Smith Date: Mon, 11 Nov 2024 14:50:42 -0500 Subject: [PATCH 26/26] apply changes from review --- include/battle/battle_icon.h | 30 +- platinum.us/filesys.sha1 | 2 +- platinum.us/rom.rsf | 2 +- res/battle/graphic/meson.build | 2 +- .../anims/bait_throw.json | 0 .../anims/ball_status_indicator_opponent.json | 0 .../anims/ball_status_indicator_player.json | 0 .../anims/battle_subscreen_cursor_corner.json | 0 .../anims/battle_terrain_opponent.json | 0 .../anims/battle_terrain_player.json | 0 .../anims/bg_party_level_up.json | 0 .../anims/cherish_ball_throw.json | 0 .../anims/dive_ball_throw.json | 0 .../anims/dusk_ball_throw.json | 0 .../anims/great_ball_throw.json | 0 .../anims/heal_ball_throw.json | 0 .../anims/healthbox_doubles_opponent_1.json | 0 .../anims/healthbox_doubles_opponent_2.json | 0 .../anims/healthbox_doubles_player_1.json | 0 .../anims/healthbox_doubles_player_2.json | 0 .../anims/healthbox_safari.json | 0 .../anims/healthbox_singles_opponent.json | 0 .../anims/healthbox_singles_player.json | 0 .../anims/luxury_ball_throw.json | 0 .../anims/master_ball_throw.json | 0 .../anims/meson.build | 0 .../anims/move_type_icon.json | 0 .../anims/mud_throw.json | 0 .../anims/nest_ball_throw.json | 0 .../anims/net_ball_throw.json | 0 .../anims/park_ball_throw.json | 0 .../anims/party_gauge.json | 0 .../anims/pl_batt_obj_00000078.json | 0 .../anims/pl_batt_obj_00000114.json | 0 .../anims/pl_batt_obj_00000115.json | 0 .../anims/pl_batt_obj_00000118.json | 0 .../anims/pl_batt_obj_00000123.json | 0 .../anims/pl_batt_obj_00000126.json | 0 .../anims/pl_batt_obj_00000177.json | 0 .../anims/pl_batt_obj_00000180.json | 0 .../anims/pl_batt_obj_00000183.json | 0 .../anims/pl_batt_obj_00000212.json | 0 .../anims/pl_batt_obj_00000215.json | 0 .../anims/pl_batt_obj_00000218.json | 0 .../anims/pl_batt_obj_00000249.json | 0 .../anims/pl_batt_obj_00000275.json | 0 .../anims/pl_batt_obj_00000276.json | 0 .../anims/pl_batt_obj_00000277.json | 0 .../anims/pl_batt_obj_00000278.json | 0 .../anims/pl_batt_obj_00000279.json | 0 .../anims/pl_batt_obj_00000280.json | 0 .../anims/pl_batt_obj_00000281.json | 0 .../anims/pl_batt_obj_00000282.json | 0 .../anims/poke_ball_throw.json | 0 .../anims/premier_ball_throw.json | 0 .../anims/quick_ball_throw.json | 0 .../anims/repeat_ball_throw.json | 0 .../anims/safari_ball_throw.json | 0 .../anims/timer_ball_throw.json | 0 .../anims/ultra_ball_throw.json | 0 .../cells/bait_throw.json | 0 .../cells/ball_status_indicator_opponent.json | 0 .../cells/ball_status_indicator_player.json | 0 .../cells/battle_subscreen_cursor_corner.json | 0 .../cells/battle_terrain_opponent.json | 0 .../cells/battle_terrain_player.json | 0 .../cells/bg_party_level_up.json | 0 .../cells/cherish_ball_throw.json | 0 .../cells/dive_ball_throw.json | 0 .../cells/dusk_ball_throw.json | 0 .../cells/great_ball_throw.json | 0 .../cells/heal_ball_throw.json | 0 .../cells/healthbox_doubles_opponent_1.json | 0 .../cells/healthbox_doubles_opponent_2.json | 0 .../cells/healthbox_doubles_player_1.json | 0 .../cells/healthbox_doubles_player_2.json | 0 .../cells/healthbox_safari.json | 0 .../cells/healthbox_singles_opponent.json | 0 .../cells/healthbox_singles_player.json | 0 .../cells/luxury_ball_throw.json | 0 .../cells/master_ball_throw.json | 0 .../cells/meson.build | 0 .../cells/move_type_icon.json | 0 .../cells/mud_throw.json | 0 .../cells/nest_ball_throw.json | 0 .../cells/net_ball_throw.json | 0 .../cells/park_ball_throw.json | 0 .../cells/party_gauge.json | 0 .../cells/pl_batt_obj_00000077.json | 0 .../cells/pl_batt_obj_00000113.json | 0 .../cells/pl_batt_obj_00000116.json | 0 .../cells/pl_batt_obj_00000119.json | 0 .../cells/pl_batt_obj_00000122.json | 0 .../cells/pl_batt_obj_00000125.json | 0 .../cells/pl_batt_obj_00000178.json | 0 .../cells/pl_batt_obj_00000181.json | 0 .../cells/pl_batt_obj_00000184.json | 0 .../cells/pl_batt_obj_00000210.json | 0 .../cells/pl_batt_obj_00000213.json | 0 .../cells/pl_batt_obj_00000216.json | 0 .../cells/pl_batt_obj_00000248.json | 0 .../cells/pl_batt_obj_00000267.json | 0 .../cells/pl_batt_obj_00000268.json | 0 .../cells/pl_batt_obj_00000269.json | 0 .../cells/pl_batt_obj_00000270.json | 0 .../cells/pl_batt_obj_00000271.json | 0 .../cells/pl_batt_obj_00000272.json | 0 .../cells/pl_batt_obj_00000273.json | 0 .../cells/pl_batt_obj_00000274.json | 0 .../cells/poke_ball_throw.json | 0 .../cells/premier_ball_throw.json | 0 .../cells/quick_ball_throw.json | 0 .../cells/repeat_ball_throw.json | 0 .../cells/safari_ball_throw.json | 0 .../cells/timer_ball_throw.json | 0 .../cells/ultra_ball_throw.json | 0 .../{pl_batt_obj => objects}/meson.build | 0 .../palettes/bait_throw.pal | 38 +- .../battle_subscreen_cursor_corner.pal | 38 +- .../battle_terrain_arcade_afternoon.pal | 518 ++++++------- .../palettes/battle_terrain_arcade_day.pal | 518 ++++++------- .../palettes/battle_terrain_arcade_night.pal | 518 ++++++------- .../battle_terrain_castle_afternoon.pal | 518 ++++++------- .../palettes/battle_terrain_castle_day.pal | 518 ++++++------- .../palettes/battle_terrain_castle_night.pal | 518 ++++++------- .../battle_terrain_cave_afternoon.pal | 38 +- .../palettes/battle_terrain_cave_day.pal | 38 +- .../palettes/battle_terrain_cave_night.pal | 38 +- .../battle_terrain_champion_afternoon.pal | 38 +- .../palettes/battle_terrain_champion_day.pal | 38 +- .../battle_terrain_champion_night.pal | 38 +- ...tle_terrain_distortion_world_afternoon.pal | 38 +- .../battle_terrain_distortion_world_day.pal | 38 +- .../battle_terrain_distortion_world_night.pal | 38 +- .../battle_terrain_elite4_aaron_afternoon.pal | 38 +- .../battle_terrain_elite4_aaron_day.pal | 38 +- .../battle_terrain_elite4_aaron_night.pal | 38 +- ...battle_terrain_elite4_bertha_afternoon.pal | 38 +- .../battle_terrain_elite4_bertha_day.pal | 38 +- .../battle_terrain_elite4_bertha_night.pal | 38 +- .../battle_terrain_elite4_flint_afternoon.pal | 38 +- .../battle_terrain_elite4_flint_day.pal | 38 +- .../battle_terrain_elite4_flint_night.pal | 38 +- ...battle_terrain_elite4_lucian_afternoon.pal | 38 +- .../battle_terrain_elite4_lucian_day.pal | 38 +- .../battle_terrain_elite4_lucian_night.pal | 38 +- .../battle_terrain_factory_afternoon.pal | 518 ++++++------- .../palettes/battle_terrain_factory_day.pal | 518 ++++++------- .../palettes/battle_terrain_factory_night.pal | 518 ++++++------- .../battle_terrain_giratina_afternoon.pal | 38 +- .../palettes/battle_terrain_giratina_day.pal | 38 +- .../battle_terrain_giratina_night.pal | 38 +- .../battle_terrain_grass_afternoon.pal | 38 +- .../palettes/battle_terrain_grass_day.pal | 38 +- .../palettes/battle_terrain_grass_night.pal | 38 +- .../battle_terrain_hall_afternoon.pal | 518 ++++++------- .../palettes/battle_terrain_hall_day.pal | 518 ++++++------- .../palettes/battle_terrain_hall_night.pal | 518 ++++++------- .../palettes/battle_terrain_ice_afternoon.pal | 38 +- .../palettes/battle_terrain_ice_day.pal | 38 +- .../palettes/battle_terrain_ice_night.pal | 38 +- .../battle_terrain_indoors_afternoon.pal | 38 +- .../palettes/battle_terrain_indoors_day.pal | 38 +- .../palettes/battle_terrain_indoors_night.pal | 38 +- .../battle_terrain_mountain_afternoon.pal | 38 +- .../palettes/battle_terrain_mountain_day.pal | 38 +- .../battle_terrain_mountain_night.pal | 38 +- .../palettes/battle_terrain_mud_afternoon.pal | 38 +- .../palettes/battle_terrain_mud_day.pal | 38 +- .../palettes/battle_terrain_mud_night.pal | 38 +- .../battle_terrain_path_afternoon.pal | 38 +- .../palettes/battle_terrain_path_day.pal | 38 +- .../palettes/battle_terrain_path_night.pal | 38 +- .../battle_terrain_puddle_afternoon.pal | 38 +- .../palettes/battle_terrain_puddle_day.pal | 38 +- .../palettes/battle_terrain_puddle_night.pal | 38 +- .../battle_terrain_sand_afternoon.pal | 38 +- .../palettes/battle_terrain_sand_day.pal | 38 +- .../palettes/battle_terrain_sand_night.pal | 38 +- .../battle_terrain_snow_afternoon.pal | 38 +- .../palettes/battle_terrain_snow_day.pal | 38 +- .../palettes/battle_terrain_snow_night.pal | 38 +- .../battle_terrain_surf_afternoon.pal | 38 +- .../palettes/battle_terrain_surf_day.pal | 38 +- .../palettes/battle_terrain_surf_night.pal | 38 +- .../battle_terrain_tower_afternoon.pal | 518 ++++++------- .../palettes/battle_terrain_tower_day.pal | 518 ++++++------- .../palettes/battle_terrain_tower_night.pal | 518 ++++++------- .../palettes/bg_party_level_up.pal | 70 +- .../palettes/cherish_ball_throw.pal | 38 +- .../palettes/dive_ball_throw.pal | 38 +- .../palettes/dusk_ball_throw.pal | 38 +- .../palettes/great_ball_throw.pal | 38 +- .../palettes/heal_ball_throw.pal | 38 +- .../palettes/healthbox_normal.pal | 38 +- .../palettes/healthbox_safari.pal | 38 +- .../palettes/icon_palettes.pal | 102 +-- .../palettes/luxury_ball_throw.pal | 38 +- .../palettes/master_ball_throw.pal | 38 +- .../palettes/meson.build | 0 .../palettes/mud_throw.pal | 38 +- .../palettes/nest_ball_throw.pal | 38 +- .../palettes/net_ball_throw.pal | 38 +- .../palettes/park_ball_throw.pal | 38 +- .../palettes/party_gauge.pal | 38 +- .../palettes/pl_batt_obj_00000000.pal | 518 ++++++------- .../palettes/pl_batt_obj_00000070.pal | 518 ++++++------- .../palettes/pl_batt_obj_00000072.pal | 230 +++--- .../palettes/pl_batt_obj_00000073.pal | 38 +- .../palettes/pl_batt_obj_00000075.pal | 38 +- .../palettes/pl_batt_obj_00000079.pal | 38 +- .../palettes/pl_batt_obj_00000111.pal | 38 +- .../palettes/player_barry_back.pal | 518 ++++++------- .../palettes/player_buck_back.pal | 518 ++++++------- .../palettes/player_cheryl_back.pal | 518 ++++++------- .../palettes/player_dawn_back.pal | 518 ++++++------- .../palettes/player_lucas_back.pal | 518 ++++++------- .../palettes/player_marley_back.pal | 518 ++++++------- .../palettes/player_mira_back.pal | 518 ++++++------- .../palettes/player_riley_back.pal | 518 ++++++------- .../palettes/poke_ball_throw.pal | 38 +- .../palettes/premier_ball_throw.pal | 38 +- .../palettes/quick_ball_throw.pal | 38 +- .../palettes/repeat_ball_throw.pal | 38 +- .../palettes/safari_ball_throw.pal | 38 +- .../palettes/timer_ball_throw.pal | 38 +- .../palettes/ultra_ball_throw.pal | 38 +- .../pl_batt_obj.ignore | 0 .../pl_batt_obj.order | 684 +++++++++--------- .../sprites/bait_throw.png | Bin .../ball_status_indicator_opponent.png | Bin .../sprites/ball_status_indicator_player.png | Bin .../battle_subscreen_cursor_corner.png | Bin .../battle_terrain_arcade_opponent.png | Bin .../sprites/battle_terrain_arcade_player.png | Bin .../battle_terrain_castle_opponent.png | Bin .../sprites/battle_terrain_castle_player.png | Bin .../sprites/battle_terrain_cave_opponent.png | Bin .../sprites/battle_terrain_cave_player.png | Bin .../battle_terrain_champion_opponent.png | Bin .../battle_terrain_champion_player.png | Bin ...ttle_terrain_distortion_world_opponent.png | Bin ...battle_terrain_distortion_world_player.png | Bin .../battle_terrain_elite4_aaron_opponent.png | Bin .../battle_terrain_elite4_aaron_player.png | Bin .../battle_terrain_elite4_bertha_opponent.png | Bin .../battle_terrain_elite4_bertha_player.png | Bin .../battle_terrain_elite4_flint_opponent.png | Bin .../battle_terrain_elite4_flint_player.png | Bin .../battle_terrain_elite4_lucian_opponent.png | Bin .../battle_terrain_elite4_lucian_player.png | Bin .../battle_terrain_factory_opponent.png | Bin .../sprites/battle_terrain_factory_player.png | Bin .../battle_terrain_giratina_opponent.png | Bin .../battle_terrain_giratina_player.png | Bin .../sprites/battle_terrain_grass_opponent.png | Bin .../sprites/battle_terrain_grass_player.png | Bin .../sprites/battle_terrain_hall_opponent.png | Bin .../sprites/battle_terrain_hall_player.png | Bin .../sprites/battle_terrain_ice_opponent.png | Bin .../sprites/battle_terrain_ice_player.png | Bin .../battle_terrain_indoors_opponent.png | Bin .../sprites/battle_terrain_indoors_player.png | Bin .../battle_terrain_mountain_opponent.png | Bin .../battle_terrain_mountain_player.png | Bin .../sprites/battle_terrain_mud_opponent.png | Bin .../sprites/battle_terrain_mud_player.png | Bin .../sprites/battle_terrain_path_opponent.png | Bin .../sprites/battle_terrain_path_player.png | Bin .../battle_terrain_puddle_opponent.png | Bin .../sprites/battle_terrain_puddle_player.png | Bin .../sprites/battle_terrain_sand_opponent.png | Bin .../sprites/battle_terrain_sand_player.png | Bin .../sprites/battle_terrain_snow_opponent.png | Bin .../sprites/battle_terrain_snow_player.png | Bin .../sprites/battle_terrain_surf_opponent.png | Bin .../sprites/battle_terrain_surf_player.png | Bin .../sprites/battle_terrain_tower_opponent.png | Bin .../sprites/battle_terrain_tower_player.png | Bin .../sprites/bg_party_level_up.png | Bin .../sprites/cherish_ball_throw.png | Bin .../sprites/contest_icon_beauty.png | Bin .../sprites/contest_icon_cool.png | Bin .../sprites/contest_icon_cute.png | Bin .../sprites/contest_icon_smart.png | Bin .../sprites/contest_icon_tough.png | Bin .../sprites/dive_ball_throw.png | Bin .../sprites/dusk_ball_throw.png | Bin .../sprites/great_ball_throw.png | Bin .../sprites/heal_ball_throw.png | Bin .../sprites/healthbox_doubles_opponent_1.png | Bin .../sprites/healthbox_doubles_opponent_2.png | Bin .../sprites/healthbox_doubles_player_1.png | Bin .../sprites/healthbox_doubles_player_2.png | Bin .../sprites/healthbox_safari.png | Bin .../sprites/healthbox_singles_opponent.png | Bin .../sprites/healthbox_singles_player.png | Bin .../sprites/luxury_ball_throw.png | Bin .../sprites/master_ball_throw.png | Bin .../sprites/meson.build | 0 .../sprites/move_class_physical.png | Bin .../sprites/move_class_special.png | Bin .../sprites/move_class_status.png | Bin .../sprites/mud_throw.png | Bin .../sprites/nest_ball_throw.png | Bin .../sprites/net_ball_throw.png | Bin .../sprites/park_ball_throw.png | Bin .../sprites/party_gauge.png | Bin .../sprites/pl_batt_obj_00000076.png | Bin .../sprites/pl_batt_obj_00000112.png | Bin .../sprites/pl_batt_obj_00000117.png | Bin .../sprites/pl_batt_obj_00000120.png | Bin .../sprites/pl_batt_obj_00000121.png | Bin .../sprites/pl_batt_obj_00000124.png | Bin .../sprites/pl_batt_obj_00000179.png | Bin .../sprites/pl_batt_obj_00000182.png | Bin .../sprites/pl_batt_obj_00000185.png | Bin .../sprites/pl_batt_obj_00000211.png | Bin .../sprites/pl_batt_obj_00000214.png | Bin .../sprites/pl_batt_obj_00000217.png | Bin .../sprites/pl_batt_obj_00000247.png | Bin .../sprites/player_barry_back.png | Bin .../sprites/player_buck_back.png | Bin .../sprites/player_cheryl_back.png | Bin .../sprites/player_dawn_back.png | Bin .../sprites/player_lucas_back.png | Bin .../sprites/player_marley_back.png | Bin .../sprites/player_mira_back.png | Bin .../sprites/player_riley_back.png | Bin .../sprites/poke_ball_throw.png | Bin .../sprites/premier_ball_throw.png | Bin .../sprites/quick_ball_throw.png | Bin .../sprites/repeat_ball_throw.png | Bin .../sprites/safari_ball_throw.png | Bin .../sprites/timer_ball_throw.png | Bin .../sprites/type_icon_bug.png | Bin .../sprites/type_icon_dark.png | Bin .../sprites/type_icon_dragon.png | Bin .../sprites/type_icon_electric.png | Bin .../sprites/type_icon_fighting.png | Bin .../sprites/type_icon_fire.png | Bin .../sprites/type_icon_flying.png | Bin .../sprites/type_icon_ghost.png | Bin .../sprites/type_icon_grass.png | Bin .../sprites/type_icon_ground.png | Bin .../sprites/type_icon_ice.png | Bin .../sprites/type_icon_mystery.png | Bin .../sprites/type_icon_normal.png | Bin .../sprites/type_icon_poison.png | Bin .../sprites/type_icon_psychic.png | Bin .../sprites/type_icon_rock.png | Bin .../sprites/type_icon_steel.png | Bin .../sprites/type_icon_water.png | Bin .../sprites/ultra_ball_throw.png | Bin .../pokemon_summary_screen/sprite.c | 2 +- src/battle/battle_icon.c | 86 +-- src/battle/battle_script.c | 2 +- src/battle/healthbar.c | 2 +- src/battle/ov16_02268520.c | 2 +- src/battle/ov16_0226871C.c | 20 +- src/battle/ov16_0226DB7C.c | 2 +- src/battle/party_gauge.c | 2 +- src/overlay010/ov10_0221F800.c | 2 +- src/overlay012/ov12_02235E94.c | 2 +- src/overlay013/ov13_02224500.c | 8 +- src/overlay017/ov17_02252AB0.c | 2 +- src/overlay019/ov19_021DA92C.c | 6 +- src/overlay084/ov84_022403F4.c | 6 +- src/overlay091/ov91_021D0D80.c | 6 +- 369 files changed, 8652 insertions(+), 8648 deletions(-) rename res/battle/graphic/{pl_batt_obj => objects}/anims/bait_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/ball_status_indicator_opponent.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/ball_status_indicator_player.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/battle_subscreen_cursor_corner.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/battle_terrain_opponent.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/battle_terrain_player.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/bg_party_level_up.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/cherish_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/dive_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/dusk_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/great_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/heal_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/healthbox_doubles_opponent_1.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/healthbox_doubles_opponent_2.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/healthbox_doubles_player_1.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/healthbox_doubles_player_2.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/healthbox_safari.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/healthbox_singles_opponent.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/healthbox_singles_player.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/luxury_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/master_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/meson.build (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/move_type_icon.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/mud_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/nest_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/net_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/park_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/party_gauge.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000078.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000114.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000115.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000118.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000123.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000126.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000177.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000180.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000183.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000212.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000215.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000218.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000249.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000275.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000276.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000277.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000278.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000279.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000280.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000281.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/pl_batt_obj_00000282.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/poke_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/premier_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/quick_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/repeat_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/safari_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/timer_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/anims/ultra_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/bait_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/ball_status_indicator_opponent.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/ball_status_indicator_player.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/battle_subscreen_cursor_corner.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/battle_terrain_opponent.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/battle_terrain_player.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/bg_party_level_up.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/cherish_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/dive_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/dusk_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/great_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/heal_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/healthbox_doubles_opponent_1.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/healthbox_doubles_opponent_2.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/healthbox_doubles_player_1.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/healthbox_doubles_player_2.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/healthbox_safari.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/healthbox_singles_opponent.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/healthbox_singles_player.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/luxury_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/master_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/meson.build (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/move_type_icon.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/mud_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/nest_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/net_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/park_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/party_gauge.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000077.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000113.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000116.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000119.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000122.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000125.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000178.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000181.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000184.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000210.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000213.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000216.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000248.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000267.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000268.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000269.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000270.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000271.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000272.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000273.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/pl_batt_obj_00000274.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/poke_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/premier_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/quick_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/repeat_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/safari_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/timer_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/cells/ultra_ball_throw.json (100%) rename res/battle/graphic/{pl_batt_obj => objects}/meson.build (100%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/bait_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_subscreen_cursor_corner.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_arcade_afternoon.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_arcade_day.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_arcade_night.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_castle_afternoon.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_castle_day.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_castle_night.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_cave_afternoon.pal (88%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_cave_day.pal (88%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_cave_night.pal (88%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_champion_afternoon.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_champion_day.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_champion_night.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_distortion_world_afternoon.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_distortion_world_day.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_distortion_world_night.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_aaron_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_aaron_day.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_aaron_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_bertha_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_bertha_day.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_bertha_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_flint_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_flint_day.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_flint_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_lucian_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_lucian_day.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_elite4_lucian_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_factory_afternoon.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_factory_day.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_factory_night.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_giratina_afternoon.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_giratina_day.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_giratina_night.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_grass_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_grass_day.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_grass_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_hall_afternoon.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_hall_day.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_hall_night.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_ice_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_ice_day.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_ice_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_indoors_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_indoors_day.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_indoors_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_mountain_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_mountain_day.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_mountain_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_mud_afternoon.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_mud_day.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_mud_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_path_afternoon.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_path_day.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_path_night.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_puddle_afternoon.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_puddle_day.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_puddle_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_sand_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_sand_day.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_sand_night.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_snow_afternoon.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_snow_day.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_snow_night.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_surf_afternoon.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_surf_day.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_surf_night.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_tower_afternoon.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_tower_day.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/battle_terrain_tower_night.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/bg_party_level_up.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/cherish_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/dive_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/dusk_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/great_ball_throw.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/heal_ball_throw.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/healthbox_normal.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/healthbox_safari.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/icon_palettes.pal (91%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/luxury_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/master_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/meson.build (100%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/mud_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/nest_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/net_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/park_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/party_gauge.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/pl_batt_obj_00000000.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/pl_batt_obj_00000070.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/pl_batt_obj_00000072.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/pl_batt_obj_00000073.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/pl_batt_obj_00000075.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/pl_batt_obj_00000079.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/pl_batt_obj_00000111.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/player_barry_back.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/player_buck_back.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/player_cheryl_back.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/player_dawn_back.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/player_lucas_back.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/player_marley_back.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/player_mira_back.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/player_riley_back.pal (86%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/poke_ball_throw.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/premier_ball_throw.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/quick_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/repeat_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/safari_ball_throw.pal (90%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/timer_ball_throw.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/palettes/ultra_ball_throw.pal (89%) rename res/battle/graphic/{pl_batt_obj => objects}/pl_batt_obj.ignore (100%) rename res/battle/graphic/{pl_batt_obj => objects}/pl_batt_obj.order (96%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/bait_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/ball_status_indicator_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/ball_status_indicator_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_subscreen_cursor_corner.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_arcade_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_arcade_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_castle_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_castle_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_cave_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_cave_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_champion_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_champion_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_distortion_world_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_distortion_world_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_elite4_aaron_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_elite4_aaron_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_elite4_bertha_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_elite4_bertha_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_elite4_flint_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_elite4_flint_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_elite4_lucian_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_elite4_lucian_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_factory_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_factory_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_giratina_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_giratina_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_grass_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_grass_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_hall_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_hall_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_ice_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_ice_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_indoors_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_indoors_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_mountain_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_mountain_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_mud_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_mud_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_path_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_path_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_puddle_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_puddle_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_sand_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_sand_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_snow_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_snow_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_surf_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_surf_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_tower_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/battle_terrain_tower_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/bg_party_level_up.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/cherish_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/contest_icon_beauty.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/contest_icon_cool.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/contest_icon_cute.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/contest_icon_smart.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/contest_icon_tough.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/dive_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/dusk_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/great_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/heal_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/healthbox_doubles_opponent_1.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/healthbox_doubles_opponent_2.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/healthbox_doubles_player_1.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/healthbox_doubles_player_2.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/healthbox_safari.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/healthbox_singles_opponent.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/healthbox_singles_player.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/luxury_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/master_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/meson.build (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/move_class_physical.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/move_class_special.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/move_class_status.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/mud_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/nest_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/net_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/park_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/party_gauge.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000076.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000112.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000117.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000120.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000121.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000124.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000179.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000182.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000185.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000211.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000214.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000217.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/pl_batt_obj_00000247.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/player_barry_back.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/player_buck_back.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/player_cheryl_back.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/player_dawn_back.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/player_lucas_back.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/player_marley_back.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/player_mira_back.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/player_riley_back.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/poke_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/premier_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/quick_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/repeat_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/safari_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/timer_ball_throw.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_bug.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_dark.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_dragon.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_electric.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_fighting.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_fire.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_flying.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_ghost.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_grass.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_ground.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_ice.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_mystery.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_normal.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_poison.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_psychic.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_rock.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_steel.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/type_icon_water.png (100%) rename res/battle/graphic/{pl_batt_obj => objects}/sprites/ultra_ball_throw.png (100%) diff --git a/include/battle/battle_icon.h b/include/battle/battle_icon.h index f01841eabb..bfd4bd70ff 100644 --- a/include/battle/battle_icon.h +++ b/include/battle/battle_icon.h @@ -12,24 +12,24 @@ u32 BattleIcon_GetMoveTypeTiles(int param0); u32 BattleIcon_GetMoveTypePaletteFileIndex(void); -u32 sub_0207C924(void); -u32 sub_0207C928(void); +u32 BattleIcon_GetMoveTypeCellsFileIndex(void); +u32 BattleIcon_GetMoveTypeAnimFileIndex(void); u8 BattleIcon_GetMoveTypePaletteIndex(int param0); u32 BattleIcon_GetNARCIndex(void); -void BattleIcon_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); -void BattleIcon_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); -void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5); -void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3); -void sub_0207CA34(SpriteGfxHandler *param0, u32 param1); -void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1); -void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2); -CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); -void sub_0207CA88(CellActorData *param0); +void BattleIcon_MakeTypeSpriteTiles(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NNS_G2D_VRAM_TYPE vramType, int typeIndex, u32 resourceID); +void BattleIcon_MakeTypeSpritePalette(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NNS_G2D_VRAM_TYPE vramType, u32 resourceID); +void BattleIcon_LoadTypeSpritePalette(PaletteData *palette, enum PaletteBufferID bufferID, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NNS_G2D_VRAM_TYPE vramType, u32 resourceID); +void BattleIcon_MakeTypeSpriteCellsAnim(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3); +void BattleIcon_UnloadTypeSpriteTiles(SpriteGfxHandler *param0, u32 param1); +void BattleIcon_UnloadTypeSpritePalette(SpriteGfxHandler *param0, u32 param1); +void BattleIcon_UnloadTypeSpriteCellsAnim(SpriteGfxHandler *param0, u32 param1, u32 param2); +CellActorData *BattleIcon_CreateCellActorForTypeSprite(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); +void BattleIcon_DeleteMoveTypeCellActorData(CellActorData *param0); u32 BattleIcon_GetMoveClassTiles(int param0); u8 BattleIcon_GetMoveClassPaletteIndex(int param0); -u32 BattleIcon_GetMoveClassPalettteFileIndex(void); -void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); -void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); -void sub_0207CB00(CellActorData *param0); +u32 BattleIcon_GetMoveClassNARCIndex(void); +void BattleIcon_MakeMoveClassSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); +void BattleIcon_UnloadMoveClassSpriteTiles(SpriteGfxHandler *param0, u32 param1); +void BattleIcon_DeleteMoveClassCellActorData(CellActorData *param0); #endif // POKEPLATINUM_BATTLE_ICON_H diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index 7796166d8d..56f46450a9 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -172,7 +172,7 @@ d672202157109fb1bb293070b5d35787b2b2b6d3 *res/prebuilt/battle/graphic/batt_bg.na c9baf056c8646bc0bc826bbc98f5cbd439643f3d *res/prebuilt/battle/graphic/batt_obj.narc 036b81fe61c6347100c73b2c23d28da5abc7626c *res/prebuilt/battle/graphic/pl_b_plist_gra.narc 2fafdda86f7f740e2843c95382f08dfac35fa64f *res/prebuilt/battle/graphic/pl_batt_bg.narc -db5906303178da70f6b6c852990df560fb4dfeba *res/battle/graphic/pl_batt_obj/pl_batt_obj.narc +db5906303178da70f6b6c852990df560fb4dfeba *res/battle/graphic/objects/pl_batt_obj.narc 955ce80b532be2184c62c36a6cb9d6b68c4669dd *res/prebuilt/battle/graphic/vs_demo_gra.narc c7e601f3c145dd3c36c6f1deee1f63d526be3c37 *res/prebuilt/wazaeffect/we.arc 30bb77e76c27874bc8ff923b33492595f1a377e2 *res/prebuilt/wazaeffect/we_sub.narc diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf index 2c844a4248..dd19a79be5 100644 --- a/platinum.us/rom.rsf +++ b/platinum.us/rom.rsf @@ -249,7 +249,7 @@ RomSpec File battle/graphic/pl_batt_bg.narc Root /battle/graphic - HostRoot res/battle/graphic/pl_batt_obj + HostRoot res/battle/graphic/objects File pl_batt_obj.narc Root / diff --git a/res/battle/graphic/meson.build b/res/battle/graphic/meson.build index f00855949b..896bea4030 100644 --- a/res/battle/graphic/meson.build +++ b/res/battle/graphic/meson.build @@ -1 +1 @@ -subdir('pl_batt_obj') \ No newline at end of file +subdir('objects') \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/anims/bait_throw.json b/res/battle/graphic/objects/anims/bait_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/bait_throw.json rename to res/battle/graphic/objects/anims/bait_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json b/res/battle/graphic/objects/anims/ball_status_indicator_opponent.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json rename to res/battle/graphic/objects/anims/ball_status_indicator_opponent.json diff --git a/res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json b/res/battle/graphic/objects/anims/ball_status_indicator_player.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json rename to res/battle/graphic/objects/anims/ball_status_indicator_player.json diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json b/res/battle/graphic/objects/anims/battle_subscreen_cursor_corner.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/battle_subscreen_cursor_corner.json rename to res/battle/graphic/objects/anims/battle_subscreen_cursor_corner.json diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json b/res/battle/graphic/objects/anims/battle_terrain_opponent.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/battle_terrain_opponent.json rename to res/battle/graphic/objects/anims/battle_terrain_opponent.json diff --git a/res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json b/res/battle/graphic/objects/anims/battle_terrain_player.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/battle_terrain_player.json rename to res/battle/graphic/objects/anims/battle_terrain_player.json diff --git a/res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json b/res/battle/graphic/objects/anims/bg_party_level_up.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/bg_party_level_up.json rename to res/battle/graphic/objects/anims/bg_party_level_up.json diff --git a/res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json b/res/battle/graphic/objects/anims/cherish_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/cherish_ball_throw.json rename to res/battle/graphic/objects/anims/cherish_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json b/res/battle/graphic/objects/anims/dive_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/dive_ball_throw.json rename to res/battle/graphic/objects/anims/dive_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json b/res/battle/graphic/objects/anims/dusk_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/dusk_ball_throw.json rename to res/battle/graphic/objects/anims/dusk_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json b/res/battle/graphic/objects/anims/great_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/great_ball_throw.json rename to res/battle/graphic/objects/anims/great_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json b/res/battle/graphic/objects/anims/heal_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/heal_ball_throw.json rename to res/battle/graphic/objects/anims/heal_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json b/res/battle/graphic/objects/anims/healthbox_doubles_opponent_1.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_1.json rename to res/battle/graphic/objects/anims/healthbox_doubles_opponent_1.json diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json b/res/battle/graphic/objects/anims/healthbox_doubles_opponent_2.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_opponent_2.json rename to res/battle/graphic/objects/anims/healthbox_doubles_opponent_2.json diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json b/res/battle/graphic/objects/anims/healthbox_doubles_player_1.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_1.json rename to res/battle/graphic/objects/anims/healthbox_doubles_player_1.json diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json b/res/battle/graphic/objects/anims/healthbox_doubles_player_2.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/healthbox_doubles_player_2.json rename to res/battle/graphic/objects/anims/healthbox_doubles_player_2.json diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json b/res/battle/graphic/objects/anims/healthbox_safari.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/healthbox_safari.json rename to res/battle/graphic/objects/anims/healthbox_safari.json diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json b/res/battle/graphic/objects/anims/healthbox_singles_opponent.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/healthbox_singles_opponent.json rename to res/battle/graphic/objects/anims/healthbox_singles_opponent.json diff --git a/res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json b/res/battle/graphic/objects/anims/healthbox_singles_player.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/healthbox_singles_player.json rename to res/battle/graphic/objects/anims/healthbox_singles_player.json diff --git a/res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json b/res/battle/graphic/objects/anims/luxury_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/luxury_ball_throw.json rename to res/battle/graphic/objects/anims/luxury_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json b/res/battle/graphic/objects/anims/master_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/master_ball_throw.json rename to res/battle/graphic/objects/anims/master_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/meson.build b/res/battle/graphic/objects/anims/meson.build similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/meson.build rename to res/battle/graphic/objects/anims/meson.build diff --git a/res/battle/graphic/pl_batt_obj/anims/move_type_icon.json b/res/battle/graphic/objects/anims/move_type_icon.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/move_type_icon.json rename to res/battle/graphic/objects/anims/move_type_icon.json diff --git a/res/battle/graphic/pl_batt_obj/anims/mud_throw.json b/res/battle/graphic/objects/anims/mud_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/mud_throw.json rename to res/battle/graphic/objects/anims/mud_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json b/res/battle/graphic/objects/anims/nest_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/nest_ball_throw.json rename to res/battle/graphic/objects/anims/nest_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json b/res/battle/graphic/objects/anims/net_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/net_ball_throw.json rename to res/battle/graphic/objects/anims/net_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json b/res/battle/graphic/objects/anims/park_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/park_ball_throw.json rename to res/battle/graphic/objects/anims/park_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/party_gauge.json b/res/battle/graphic/objects/anims/party_gauge.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/party_gauge.json rename to res/battle/graphic/objects/anims/party_gauge.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000078.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000078.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000078.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000114.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000114.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000114.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000115.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000115.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000115.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000118.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000118.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000118.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000123.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000123.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000123.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000126.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000126.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000126.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000177.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000177.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000177.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000180.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000180.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000180.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000183.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000183.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000183.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000212.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000212.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000212.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000215.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000215.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000215.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000218.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000218.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000218.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000249.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000249.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000249.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000275.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000275.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000275.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000276.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000276.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000276.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000277.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000277.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000277.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000278.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000278.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000278.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000279.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000279.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000279.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000280.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000280.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000280.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000281.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000281.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000281.json diff --git a/res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json b/res/battle/graphic/objects/anims/pl_batt_obj_00000282.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/pl_batt_obj_00000282.json rename to res/battle/graphic/objects/anims/pl_batt_obj_00000282.json diff --git a/res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json b/res/battle/graphic/objects/anims/poke_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/poke_ball_throw.json rename to res/battle/graphic/objects/anims/poke_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json b/res/battle/graphic/objects/anims/premier_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/premier_ball_throw.json rename to res/battle/graphic/objects/anims/premier_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json b/res/battle/graphic/objects/anims/quick_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/quick_ball_throw.json rename to res/battle/graphic/objects/anims/quick_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json b/res/battle/graphic/objects/anims/repeat_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/repeat_ball_throw.json rename to res/battle/graphic/objects/anims/repeat_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json b/res/battle/graphic/objects/anims/safari_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/safari_ball_throw.json rename to res/battle/graphic/objects/anims/safari_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json b/res/battle/graphic/objects/anims/timer_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/timer_ball_throw.json rename to res/battle/graphic/objects/anims/timer_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json b/res/battle/graphic/objects/anims/ultra_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/anims/ultra_ball_throw.json rename to res/battle/graphic/objects/anims/ultra_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/bait_throw.json b/res/battle/graphic/objects/cells/bait_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/bait_throw.json rename to res/battle/graphic/objects/cells/bait_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_opponent.json b/res/battle/graphic/objects/cells/ball_status_indicator_opponent.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_opponent.json rename to res/battle/graphic/objects/cells/ball_status_indicator_opponent.json diff --git a/res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_player.json b/res/battle/graphic/objects/cells/ball_status_indicator_player.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/ball_status_indicator_player.json rename to res/battle/graphic/objects/cells/ball_status_indicator_player.json diff --git a/res/battle/graphic/pl_batt_obj/cells/battle_subscreen_cursor_corner.json b/res/battle/graphic/objects/cells/battle_subscreen_cursor_corner.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/battle_subscreen_cursor_corner.json rename to res/battle/graphic/objects/cells/battle_subscreen_cursor_corner.json diff --git a/res/battle/graphic/pl_batt_obj/cells/battle_terrain_opponent.json b/res/battle/graphic/objects/cells/battle_terrain_opponent.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/battle_terrain_opponent.json rename to res/battle/graphic/objects/cells/battle_terrain_opponent.json diff --git a/res/battle/graphic/pl_batt_obj/cells/battle_terrain_player.json b/res/battle/graphic/objects/cells/battle_terrain_player.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/battle_terrain_player.json rename to res/battle/graphic/objects/cells/battle_terrain_player.json diff --git a/res/battle/graphic/pl_batt_obj/cells/bg_party_level_up.json b/res/battle/graphic/objects/cells/bg_party_level_up.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/bg_party_level_up.json rename to res/battle/graphic/objects/cells/bg_party_level_up.json diff --git a/res/battle/graphic/pl_batt_obj/cells/cherish_ball_throw.json b/res/battle/graphic/objects/cells/cherish_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/cherish_ball_throw.json rename to res/battle/graphic/objects/cells/cherish_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/dive_ball_throw.json b/res/battle/graphic/objects/cells/dive_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/dive_ball_throw.json rename to res/battle/graphic/objects/cells/dive_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/dusk_ball_throw.json b/res/battle/graphic/objects/cells/dusk_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/dusk_ball_throw.json rename to res/battle/graphic/objects/cells/dusk_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/great_ball_throw.json b/res/battle/graphic/objects/cells/great_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/great_ball_throw.json rename to res/battle/graphic/objects/cells/great_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/heal_ball_throw.json b/res/battle/graphic/objects/cells/heal_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/heal_ball_throw.json rename to res/battle/graphic/objects/cells/heal_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_1.json b/res/battle/graphic/objects/cells/healthbox_doubles_opponent_1.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_1.json rename to res/battle/graphic/objects/cells/healthbox_doubles_opponent_1.json diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_2.json b/res/battle/graphic/objects/cells/healthbox_doubles_opponent_2.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_opponent_2.json rename to res/battle/graphic/objects/cells/healthbox_doubles_opponent_2.json diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_1.json b/res/battle/graphic/objects/cells/healthbox_doubles_player_1.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_1.json rename to res/battle/graphic/objects/cells/healthbox_doubles_player_1.json diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_2.json b/res/battle/graphic/objects/cells/healthbox_doubles_player_2.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/healthbox_doubles_player_2.json rename to res/battle/graphic/objects/cells/healthbox_doubles_player_2.json diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_safari.json b/res/battle/graphic/objects/cells/healthbox_safari.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/healthbox_safari.json rename to res/battle/graphic/objects/cells/healthbox_safari.json diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_singles_opponent.json b/res/battle/graphic/objects/cells/healthbox_singles_opponent.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/healthbox_singles_opponent.json rename to res/battle/graphic/objects/cells/healthbox_singles_opponent.json diff --git a/res/battle/graphic/pl_batt_obj/cells/healthbox_singles_player.json b/res/battle/graphic/objects/cells/healthbox_singles_player.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/healthbox_singles_player.json rename to res/battle/graphic/objects/cells/healthbox_singles_player.json diff --git a/res/battle/graphic/pl_batt_obj/cells/luxury_ball_throw.json b/res/battle/graphic/objects/cells/luxury_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/luxury_ball_throw.json rename to res/battle/graphic/objects/cells/luxury_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/master_ball_throw.json b/res/battle/graphic/objects/cells/master_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/master_ball_throw.json rename to res/battle/graphic/objects/cells/master_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/meson.build b/res/battle/graphic/objects/cells/meson.build similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/meson.build rename to res/battle/graphic/objects/cells/meson.build diff --git a/res/battle/graphic/pl_batt_obj/cells/move_type_icon.json b/res/battle/graphic/objects/cells/move_type_icon.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/move_type_icon.json rename to res/battle/graphic/objects/cells/move_type_icon.json diff --git a/res/battle/graphic/pl_batt_obj/cells/mud_throw.json b/res/battle/graphic/objects/cells/mud_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/mud_throw.json rename to res/battle/graphic/objects/cells/mud_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/nest_ball_throw.json b/res/battle/graphic/objects/cells/nest_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/nest_ball_throw.json rename to res/battle/graphic/objects/cells/nest_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/net_ball_throw.json b/res/battle/graphic/objects/cells/net_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/net_ball_throw.json rename to res/battle/graphic/objects/cells/net_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/park_ball_throw.json b/res/battle/graphic/objects/cells/park_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/park_ball_throw.json rename to res/battle/graphic/objects/cells/park_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/party_gauge.json b/res/battle/graphic/objects/cells/party_gauge.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/party_gauge.json rename to res/battle/graphic/objects/cells/party_gauge.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000077.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000077.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000077.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000077.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000113.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000113.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000113.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000113.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000116.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000116.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000116.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000116.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000119.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000119.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000119.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000119.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000122.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000122.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000122.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000122.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000125.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000125.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000125.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000125.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000178.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000178.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000178.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000178.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000181.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000181.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000181.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000181.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000184.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000184.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000184.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000184.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000210.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000210.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000210.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000210.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000213.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000213.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000213.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000213.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000216.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000216.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000216.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000216.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000248.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000248.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000248.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000248.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000267.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000267.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000267.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000268.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000268.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000268.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000269.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000269.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000269.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000270.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000270.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000270.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000271.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000271.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000271.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000272.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000272.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000272.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000273.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000273.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000273.json diff --git a/res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json b/res/battle/graphic/objects/cells/pl_batt_obj_00000274.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/pl_batt_obj_00000274.json rename to res/battle/graphic/objects/cells/pl_batt_obj_00000274.json diff --git a/res/battle/graphic/pl_batt_obj/cells/poke_ball_throw.json b/res/battle/graphic/objects/cells/poke_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/poke_ball_throw.json rename to res/battle/graphic/objects/cells/poke_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/premier_ball_throw.json b/res/battle/graphic/objects/cells/premier_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/premier_ball_throw.json rename to res/battle/graphic/objects/cells/premier_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/quick_ball_throw.json b/res/battle/graphic/objects/cells/quick_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/quick_ball_throw.json rename to res/battle/graphic/objects/cells/quick_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/repeat_ball_throw.json b/res/battle/graphic/objects/cells/repeat_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/repeat_ball_throw.json rename to res/battle/graphic/objects/cells/repeat_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/safari_ball_throw.json b/res/battle/graphic/objects/cells/safari_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/safari_ball_throw.json rename to res/battle/graphic/objects/cells/safari_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/timer_ball_throw.json b/res/battle/graphic/objects/cells/timer_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/timer_ball_throw.json rename to res/battle/graphic/objects/cells/timer_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/cells/ultra_ball_throw.json b/res/battle/graphic/objects/cells/ultra_ball_throw.json similarity index 100% rename from res/battle/graphic/pl_batt_obj/cells/ultra_ball_throw.json rename to res/battle/graphic/objects/cells/ultra_ball_throw.json diff --git a/res/battle/graphic/pl_batt_obj/meson.build b/res/battle/graphic/objects/meson.build similarity index 100% rename from res/battle/graphic/pl_batt_obj/meson.build rename to res/battle/graphic/objects/meson.build diff --git a/res/battle/graphic/pl_batt_obj/palettes/bait_throw.pal b/res/battle/graphic/objects/palettes/bait_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/bait_throw.pal rename to res/battle/graphic/objects/palettes/bait_throw.pal index 6eed278fb2..2b2304aa71 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/bait_throw.pal +++ b/res/battle/graphic/objects/palettes/bait_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -82 189 156 -82 82 98 -230 213 189 -238 222 189 -49 49 49 -205 197 172 -246 139 41 -189 164 148 -49 115 246 -148 148 164 -172 106 41 -255 255 255 -255 115 180 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +82 189 156 +82 82 98 +230 213 189 +238 222 189 +49 49 49 +205 197 172 +246 139 41 +189 164 148 +49 115 246 +148 148 164 +172 106 41 +255 255 255 +255 115 180 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_subscreen_cursor_corner.pal b/res/battle/graphic/objects/palettes/battle_subscreen_cursor_corner.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_subscreen_cursor_corner.pal rename to res/battle/graphic/objects/palettes/battle_subscreen_cursor_corner.pal index c0b150c7af..5e4ef3e35e 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_subscreen_cursor_corner.pal +++ b/res/battle/graphic/objects/palettes/battle_subscreen_cursor_corner.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -148 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -255 0 0 +JASC-PAL +0100 +16 +148 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +255 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_arcade_afternoon.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_arcade_afternoon.pal index 740e758f47..c4b1b53dc1 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_arcade_afternoon.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 164 205 -255 213 255 -255 230 255 -255 189 230 -255 148 197 -222 131 172 -180 106 148 -139 90 115 -106 65 90 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 205 +255 213 255 +255 230 255 +255 189 230 +255 148 197 +222 131 172 +180 106 148 +139 90 115 +106 65 90 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_arcade_day.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_arcade_day.pal index 740e758f47..c4b1b53dc1 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_arcade_day.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 164 205 -255 213 255 -255 230 255 -255 189 230 -255 148 197 -222 131 172 -180 106 148 -139 90 115 -106 65 90 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 205 +255 213 255 +255 230 255 +255 189 230 +255 148 197 +222 131 172 +180 106 148 +139 90 115 +106 65 90 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_arcade_night.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_arcade_night.pal index 740e758f47..c4b1b53dc1 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_arcade_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_arcade_night.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 164 205 -255 213 255 -255 230 255 -255 189 230 -255 148 197 -222 131 172 -180 106 148 -139 90 115 -106 65 90 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 205 +255 213 255 +255 230 255 +255 189 230 +255 148 197 +222 131 172 +180 106 148 +139 90 115 +106 65 90 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_castle_afternoon.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_castle_afternoon.pal index 5dda77425c..6945055b2e 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_castle_afternoon.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -115 197 172 -131 222 180 -131 230 189 -123 205 172 -115 180 156 -106 156 139 -90 123 115 -82 98 98 -74 74 82 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 172 +131 222 180 +131 230 189 +123 205 172 +115 180 156 +106 156 139 +90 123 115 +82 98 98 +74 74 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_castle_day.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_castle_day.pal index 5dda77425c..6945055b2e 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_castle_day.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -115 197 172 -131 222 180 -131 230 189 -123 205 172 -115 180 156 -106 156 139 -90 123 115 -82 98 98 -74 74 82 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 172 +131 222 180 +131 230 189 +123 205 172 +115 180 156 +106 156 139 +90 123 115 +82 98 98 +74 74 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_castle_night.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_castle_night.pal index 5dda77425c..6945055b2e 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_castle_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_castle_night.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -115 197 172 -131 222 180 -131 230 189 -123 205 172 -115 180 156 -106 156 139 -90 123 115 -82 98 98 -74 74 82 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 197 172 +131 222 180 +131 230 189 +123 205 172 +115 180 156 +106 156 139 +90 123 115 +82 98 98 +74 74 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_cave_afternoon.pal similarity index 88% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_cave_afternoon.pal index b0788dfa7b..6a487c1fff 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_cave_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -74 65 82 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -98 90 148 -98 98 148 -82 82 148 -82 74 123 -82 74 98 -74 74 82 -57 57 74 -41 49 65 -16 32 49 +JASC-PAL +0100 +16 +255 255 255 +74 65 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 90 148 +98 98 148 +82 82 148 +82 74 123 +82 74 98 +74 74 82 +57 57 74 +41 49 65 +16 32 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_cave_day.pal similarity index 88% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_cave_day.pal index b0788dfa7b..6a487c1fff 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_cave_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -74 65 82 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -98 90 148 -98 98 148 -82 82 148 -82 74 123 -82 74 98 -74 74 82 -57 57 74 -41 49 65 -16 32 49 +JASC-PAL +0100 +16 +255 255 255 +74 65 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 90 148 +98 98 148 +82 82 148 +82 74 123 +82 74 98 +74 74 82 +57 57 74 +41 49 65 +16 32 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_cave_night.pal similarity index 88% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_cave_night.pal index b0788dfa7b..6a487c1fff 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_cave_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_cave_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -74 65 82 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -98 90 148 -98 98 148 -82 82 148 -82 74 123 -82 74 98 -74 74 82 -57 57 74 -41 49 65 -16 32 49 +JASC-PAL +0100 +16 +255 255 255 +74 65 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 90 148 +98 98 148 +82 82 148 +82 74 123 +82 74 98 +74 74 82 +57 57 74 +41 49 65 +16 32 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_champion_afternoon.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_champion_afternoon.pal index c7db4c1ce4..2d40f1065f 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_champion_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -222 222 255 -139 131 172 -156 148 180 -156 156 189 -213 213 222 -197 197 213 -180 180 205 -172 164 197 -213 172 213 -222 197 222 -238 213 238 -246 238 246 -255 255 255 -222 213 230 -180 180 205 -82 82 115 +JASC-PAL +0100 +16 +222 222 255 +139 131 172 +156 148 180 +156 156 189 +213 213 222 +197 197 213 +180 180 205 +172 164 197 +213 172 213 +222 197 222 +238 213 238 +246 238 246 +255 255 255 +222 213 230 +180 180 205 +82 82 115 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_champion_day.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_champion_day.pal index c7db4c1ce4..2d40f1065f 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_champion_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -222 222 255 -139 131 172 -156 148 180 -156 156 189 -213 213 222 -197 197 213 -180 180 205 -172 164 197 -213 172 213 -222 197 222 -238 213 238 -246 238 246 -255 255 255 -222 213 230 -180 180 205 -82 82 115 +JASC-PAL +0100 +16 +222 222 255 +139 131 172 +156 148 180 +156 156 189 +213 213 222 +197 197 213 +180 180 205 +172 164 197 +213 172 213 +222 197 222 +238 213 238 +246 238 246 +255 255 255 +222 213 230 +180 180 205 +82 82 115 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_champion_night.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_champion_night.pal index c7db4c1ce4..2d40f1065f 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_champion_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_champion_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -222 222 255 -139 131 172 -156 148 180 -156 156 189 -213 213 222 -197 197 213 -180 180 205 -172 164 197 -213 172 213 -222 197 222 -238 213 238 -246 238 246 -255 255 255 -222 213 230 -180 180 205 -82 82 115 +JASC-PAL +0100 +16 +222 222 255 +139 131 172 +156 148 180 +156 156 189 +213 213 222 +197 197 213 +180 180 205 +172 164 197 +213 172 213 +222 197 222 +238 213 238 +246 238 246 +255 255 255 +222 213 230 +180 180 205 +82 82 115 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_distortion_world_afternoon.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_distortion_world_afternoon.pal index 652d0ca272..b3fe91eb30 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_distortion_world_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 139 148 -213 156 156 -222 164 164 -205 148 148 -180 131 139 -156 115 123 -131 98 106 -106 82 90 -90 65 82 -65 49 65 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_distortion_world_day.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_distortion_world_day.pal index 652d0ca272..b3fe91eb30 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_distortion_world_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 139 148 -213 156 156 -222 164 164 -205 148 148 -180 131 139 -156 115 123 -131 98 106 -106 82 90 -90 65 82 -65 49 65 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_distortion_world_night.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_distortion_world_night.pal index 652d0ca272..b3fe91eb30 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_distortion_world_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_distortion_world_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 139 148 -213 156 156 -222 164 164 -205 148 148 -180 131 139 -156 115 123 -131 98 106 -106 82 90 -90 65 82 -65 49 65 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_afternoon.pal index da4d8e7c2b..71f0870d48 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 230 213 -213 238 230 -230 246 238 -205 230 222 -189 222 205 -156 205 189 -131 189 197 -90 164 172 -57 115 98 -32 74 57 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 230 213 +213 238 230 +230 246 238 +205 230 222 +189 222 205 +156 205 189 +131 189 197 +90 164 172 +57 115 98 +32 74 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_day.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_day.pal index da4d8e7c2b..71f0870d48 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 230 213 -213 238 230 -230 246 238 -205 230 222 -189 222 205 -156 205 189 -131 189 197 -90 164 172 -57 115 98 -32 74 57 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 230 213 +213 238 230 +230 246 238 +205 230 222 +189 222 205 +156 205 189 +131 189 197 +90 164 172 +57 115 98 +32 74 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_night.pal index da4d8e7c2b..71f0870d48 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_aaron_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_aaron_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 230 213 -213 238 230 -230 246 238 -205 230 222 -189 222 205 -156 205 189 -131 189 197 -90 164 172 -57 115 98 -32 74 57 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 230 213 +213 238 230 +230 246 238 +205 230 222 +189 222 205 +156 205 189 +131 189 197 +90 164 172 +57 115 98 +32 74 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_afternoon.pal index 47d12bba4f..09772dc073 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 213 197 -238 230 213 -246 238 230 -230 222 205 -222 205 180 -205 180 156 -197 197 131 -164 172 90 -115 90 57 -74 57 32 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 197 +238 230 213 +246 238 230 +230 222 205 +222 205 180 +205 180 156 +197 197 131 +164 172 90 +115 90 57 +74 57 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_day.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_day.pal index 47d12bba4f..09772dc073 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 213 197 -238 230 213 -246 238 230 -230 222 205 -222 205 180 -205 180 156 -197 197 131 -164 172 90 -115 90 57 -74 57 32 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 197 +238 230 213 +246 238 230 +230 222 205 +222 205 180 +205 180 156 +197 197 131 +164 172 90 +115 90 57 +74 57 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_night.pal index 47d12bba4f..09772dc073 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_bertha_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_bertha_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 213 197 -238 230 213 -246 238 230 -230 222 205 -222 205 180 -205 180 156 -197 197 131 -164 172 90 -115 90 57 -74 57 32 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 197 +238 230 213 +246 238 230 +230 222 205 +222 205 180 +205 180 156 +197 197 131 +164 172 90 +115 90 57 +74 57 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_afternoon.pal index e3cca78bcc..a1485fed8d 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 197 205 -238 213 222 -246 230 230 -230 205 213 -222 180 197 -205 156 172 -197 139 131 -172 106 90 -115 57 74 -74 32 41 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 197 205 +238 213 222 +246 230 230 +230 205 213 +222 180 197 +205 156 172 +197 139 131 +172 106 90 +115 57 74 +74 32 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_day.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_day.pal index e3cca78bcc..a1485fed8d 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 197 205 -238 213 222 -246 230 230 -230 205 213 -222 180 197 -205 156 172 -197 139 131 -172 106 90 -115 57 74 -74 32 41 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 197 205 +238 213 222 +246 230 230 +230 205 213 +222 180 197 +205 156 172 +197 139 131 +172 106 90 +115 57 74 +74 32 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_night.pal index e3cca78bcc..a1485fed8d 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_flint_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_flint_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 197 205 -238 213 222 -246 230 230 -230 205 213 -222 180 197 -205 156 172 -197 139 131 -172 106 90 -115 57 74 -74 32 41 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 197 205 +238 213 222 +246 230 230 +230 205 213 +222 180 197 +205 156 172 +197 139 131 +172 106 90 +115 57 74 +74 32 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_afternoon.pal index 5909572ef6..bce4da7263 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 197 222 -213 213 238 -230 230 246 -205 205 230 -189 180 222 -156 156 205 -164 131 197 -139 90 172 -65 57 115 -32 32 74 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 222 +213 213 238 +230 230 246 +205 205 230 +189 180 222 +156 156 205 +164 131 197 +139 90 172 +65 57 115 +32 32 74 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_day.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_day.pal index 5909572ef6..bce4da7263 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 197 222 -213 213 238 -230 230 246 -205 205 230 -189 180 222 -156 156 205 -164 131 197 -139 90 172 -65 57 115 -32 32 74 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 222 +213 213 238 +230 230 246 +205 205 230 +189 180 222 +156 156 205 +164 131 197 +139 90 172 +65 57 115 +32 32 74 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_night.pal index 5909572ef6..bce4da7263 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_elite4_lucian_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_elite4_lucian_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 197 222 -213 213 238 -230 230 246 -205 205 230 -189 180 222 -156 156 205 -164 131 197 -139 90 172 -65 57 115 -32 32 74 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 222 +213 213 238 +230 230 246 +205 205 230 +189 180 222 +156 156 205 +164 131 197 +139 90 172 +65 57 115 +32 32 74 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_factory_afternoon.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_factory_afternoon.pal index d563c1b8bc..c9d3ae1502 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_factory_afternoon.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -90 164 172 -98 189 197 -106 197 205 -98 180 189 -98 156 164 -90 131 148 -82 115 123 -74 90 106 -74 65 82 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 164 172 +98 189 197 +106 197 205 +98 180 189 +98 156 164 +90 131 148 +82 115 123 +74 90 106 +74 65 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_factory_day.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_factory_day.pal index d563c1b8bc..c9d3ae1502 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_factory_day.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -90 164 172 -98 189 197 -106 197 205 -98 180 189 -98 156 164 -90 131 148 -82 115 123 -74 90 106 -74 65 82 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 164 172 +98 189 197 +106 197 205 +98 180 189 +98 156 164 +90 131 148 +82 115 123 +74 90 106 +74 65 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_factory_night.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_factory_night.pal index d563c1b8bc..c9d3ae1502 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_factory_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_factory_night.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -90 164 172 -98 189 197 -106 197 205 -98 180 189 -98 156 164 -90 131 148 -82 115 123 -74 90 106 -74 65 82 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 164 172 +98 189 197 +106 197 205 +98 180 189 +98 156 164 +90 131 148 +82 115 123 +74 90 106 +74 65 82 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_giratina_afternoon.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_giratina_afternoon.pal index 652d0ca272..b3fe91eb30 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_giratina_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 139 148 -213 156 156 -222 164 164 -205 148 148 -180 131 139 -156 115 123 -131 98 106 -106 82 90 -90 65 82 -65 49 65 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_giratina_day.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_giratina_day.pal index 652d0ca272..b3fe91eb30 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_giratina_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 139 148 -213 156 156 -222 164 164 -205 148 148 -180 131 139 -156 115 123 -131 98 106 -106 82 90 -90 65 82 -65 49 65 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_giratina_night.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_giratina_night.pal index 652d0ca272..b3fe91eb30 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_giratina_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_giratina_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 139 148 -213 156 156 -222 164 164 -205 148 148 -180 131 139 -156 115 123 -131 98 106 -106 82 90 -90 65 82 -65 49 65 +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 139 148 +213 156 156 +222 164 164 +205 148 148 +180 131 139 +156 115 123 +131 98 106 +106 82 90 +90 65 82 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_grass_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_grass_afternoon.pal index c0083ca20f..334193b6ad 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_grass_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -205 156 180 -123 57 24 -49 0 0 -49 0 0 -49 0 0 -49 0 0 -180 164 57 -164 180 123 -148 172 106 -131 164 90 -106 148 74 -74 131 41 -49 0 0 -238 156 65 -213 131 49 -172 98 32 +JASC-PAL +0100 +16 +205 156 180 +123 57 24 +49 0 0 +49 0 0 +49 0 0 +49 0 0 +180 164 57 +164 180 123 +148 172 106 +131 164 90 +106 148 74 +74 131 41 +49 0 0 +238 156 65 +213 131 49 +172 98 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_grass_day.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_grass_day.pal index 56d2100709..53641c6ae7 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_grass_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -90 74 32 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -164 213 82 -139 230 172 -123 222 156 -98 213 131 -74 189 106 -32 164 65 -0 0 0 -230 197 98 -197 164 74 -148 123 49 +JASC-PAL +0100 +16 +189 197 255 +90 74 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 213 82 +139 230 172 +123 222 156 +98 213 131 +74 189 106 +32 164 65 +0 0 0 +230 197 98 +197 164 74 +148 123 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_grass_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_grass_night.pal index 5708f71320..f55e48f4c3 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_grass_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_grass_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -106 131 255 -49 49 74 -0 0 41 -0 0 41 -0 0 41 -0 0 41 -98 139 115 -82 156 189 -65 148 172 -57 139 156 -41 123 131 -16 106 98 -0 0 41 -131 131 131 -115 106 106 -82 82 82 +JASC-PAL +0100 +16 +106 131 255 +49 49 74 +0 0 41 +0 0 41 +0 0 41 +0 0 41 +98 139 115 +82 156 189 +65 148 172 +57 139 156 +41 123 131 +16 106 98 +0 0 41 +131 131 131 +115 106 106 +82 82 82 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_hall_afternoon.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_hall_afternoon.pal index c27d83a5e3..86264c385b 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_hall_afternoon.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -230 255 246 -246 255 255 -255 255 255 -238 255 255 -213 255 246 -189 255 238 -164 246 230 -131 180 180 -98 115 123 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 255 246 +246 255 255 +255 255 255 +238 255 255 +213 255 246 +189 255 238 +164 246 230 +131 180 180 +98 115 123 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_hall_day.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_hall_day.pal index c27d83a5e3..86264c385b 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_hall_day.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -230 255 246 -246 255 255 -255 255 255 -238 255 255 -213 255 246 -189 255 238 -164 246 230 -131 180 180 -98 115 123 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 255 246 +246 255 255 +255 255 255 +238 255 255 +213 255 246 +189 255 238 +164 246 230 +131 180 180 +98 115 123 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_hall_night.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_hall_night.pal index c27d83a5e3..86264c385b 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_hall_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_hall_night.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -230 255 246 -246 255 255 -255 255 255 -238 255 255 -213 255 246 -189 255 238 -164 246 230 -131 180 180 -98 115 123 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 255 246 +246 255 255 +255 255 255 +238 255 255 +213 255 246 +189 255 238 +164 246 230 +131 180 180 +98 115 123 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_ice_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_ice_afternoon.pal index fb633d1e2a..d0c554b821 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_ice_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -197 139 180 -139 65 106 -41 0 0 -41 0 0 -41 0 0 -41 0 0 -197 131 180 -197 148 180 -197 156 180 -213 164 180 -230 172 180 -246 172 180 -255 180 180 -222 148 164 -172 98 131 -123 41 90 +JASC-PAL +0100 +16 +197 139 180 +139 65 106 +41 0 0 +41 0 0 +41 0 0 +41 0 0 +197 131 180 +197 148 180 +197 156 180 +213 164 180 +230 172 180 +246 172 180 +255 180 180 +222 148 164 +172 98 131 +123 41 90 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_ice_day.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_ice_day.pal index 7e1e5170d7..6a6e400dab 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_ice_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -115 90 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -180 189 255 -180 205 255 -180 213 255 -205 230 255 -222 238 255 -238 246 255 -255 255 255 -213 205 230 -156 139 180 -98 65 131 +JASC-PAL +0100 +16 +189 197 255 +115 90 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 189 255 +180 205 255 +180 213 255 +205 230 255 +222 238 255 +238 246 255 +255 255 255 +213 205 230 +156 139 180 +98 65 131 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_ice_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_ice_night.pal index 151746340a..878d7cd9c5 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_ice_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_ice_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -106 123 238 -57 49 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -98 115 238 -98 123 238 -98 131 238 -115 139 238 -123 148 238 -131 148 238 -139 156 238 -115 123 222 -82 90 172 -41 32 115 +JASC-PAL +0100 +16 +106 123 238 +57 49 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 115 238 +98 123 238 +98 131 238 +115 139 238 +123 148 238 +131 148 238 +139 156 238 +115 123 222 +82 90 172 +41 32 115 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_indoors_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_indoors_afternoon.pal index 72379f06ad..65e133bd11 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_indoors_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 205 213 -230 222 230 -238 230 238 -222 213 222 -205 197 205 -189 172 189 -172 156 164 -139 123 131 -98 82 98 -65 49 65 +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 205 213 +230 222 230 +238 230 238 +222 213 222 +205 197 205 +189 172 189 +172 156 164 +139 123 131 +98 82 98 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_indoors_day.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_indoors_day.pal index 72379f06ad..65e133bd11 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_indoors_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 205 213 -230 222 230 -238 230 238 -222 213 222 -205 197 205 -189 172 189 -172 156 164 -139 123 131 -98 82 98 -65 49 65 +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 205 213 +230 222 230 +238 230 238 +222 213 222 +205 197 205 +189 172 189 +172 156 164 +139 123 131 +98 82 98 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_indoors_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_indoors_night.pal index 72379f06ad..65e133bd11 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_indoors_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_indoors_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 205 213 -230 222 230 -238 230 238 -222 213 222 -205 197 205 -189 172 189 -172 156 164 -139 123 131 -98 82 98 -65 49 65 +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 205 213 +230 222 230 +238 230 238 +222 213 222 +205 197 205 +189 172 189 +172 156 164 +139 123 131 +98 82 98 +65 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_mountain_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_mountain_afternoon.pal index 737757db0b..288aea2c10 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_mountain_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -139 65 16 -189 123 82 -156 115 82 -139 98 74 -98 57 32 -139 106 65 -115 82 57 -106 65 49 -205 131 82 -180 115 65 -156 90 49 -139 74 32 -123 65 16 -98 49 16 -65 16 8 +JASC-PAL +0100 +16 +189 197 255 +139 65 16 +189 123 82 +156 115 82 +139 98 74 +98 57 32 +139 106 65 +115 82 57 +106 65 49 +205 131 82 +180 115 65 +156 90 49 +139 74 32 +123 65 16 +98 49 16 +65 16 8 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_mountain_day.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_mountain_day.pal index c9a71e4326..b6e2b848b4 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_mountain_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -131 106 32 -180 156 139 -148 139 148 -131 123 131 -90 82 65 -131 131 123 -106 106 98 -98 90 82 -197 164 148 -172 148 115 -148 123 82 -131 106 57 -115 98 32 -82 74 32 -49 32 16 +JASC-PAL +0100 +16 +189 197 255 +131 106 32 +180 156 139 +148 139 148 +131 123 131 +90 82 65 +131 131 123 +106 106 98 +98 90 82 +197 164 148 +172 148 115 +148 123 82 +131 106 57 +115 98 32 +82 74 32 +49 32 16 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_mountain_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_mountain_night.pal index c8f57e062f..1660ad2c10 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mountain_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_mountain_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -16 49 115 -82 90 156 -82 90 131 -74 82 115 -32 49 82 -65 82 115 -57 65 98 -49 49 82 -82 98 172 -65 82 148 -49 65 131 -32 57 115 -16 49 106 -16 32 82 -8 16 49 +JASC-PAL +0100 +16 +189 197 255 +16 49 115 +82 90 156 +82 90 131 +74 82 115 +32 49 82 +65 82 115 +57 65 98 +49 49 82 +82 98 172 +65 82 148 +49 65 131 +32 57 115 +16 49 106 +16 32 82 +8 16 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_mud_afternoon.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_mud_afternoon.pal index 5b64d03bbe..f8f31f7802 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_mud_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -197 172 230 -41 0 0 -41 0 0 -41 0 0 -41 0 0 -41 0 0 -197 115 115 -189 106 115 -180 106 106 -172 98 98 -164 90 98 -164 90 98 -156 82 90 -139 65 82 -131 57 65 -98 32 41 +JASC-PAL +0100 +16 +197 172 230 +41 0 0 +41 0 0 +41 0 0 +41 0 0 +41 0 0 +197 115 115 +189 106 115 +180 106 106 +172 98 98 +164 90 98 +164 90 98 +156 82 90 +139 65 82 +131 57 65 +98 32 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_mud_day.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_mud_day.pal index d8ea085601..8e9f1edcfc 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_mud_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -180 139 131 -172 131 131 -164 123 123 -156 115 115 -148 106 106 -139 106 106 -131 98 98 -115 82 90 -106 65 74 -65 41 49 +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 139 131 +172 131 131 +164 123 123 +156 115 115 +148 106 106 +139 106 106 +131 98 98 +115 82 90 +106 65 74 +65 41 49 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_mud_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_mud_night.pal index fc42e93aa2..4e1b77c6b2 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_mud_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_mud_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -148 172 238 -0 0 41 -0 0 41 -0 0 41 -0 0 41 -0 0 41 -148 123 139 -139 115 139 -131 106 139 -123 98 131 -115 90 123 -106 90 123 -106 82 115 -90 65 106 -82 57 98 -49 32 82 +JASC-PAL +0100 +16 +148 172 238 +0 0 41 +0 0 41 +0 0 41 +0 0 41 +0 0 41 +148 123 139 +139 115 139 +131 106 139 +123 98 131 +115 90 123 +106 90 123 +106 82 115 +90 65 106 +82 57 98 +49 32 82 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_path_afternoon.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_path_afternoon.pal index 4ce5c07e2f..76d5fdca5a 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_path_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 255 164 -123 32 49 -115 32 49 -222 205 115 -238 180 139 -238 189 139 -213 131 131 -222 164 123 -230 164 131 -222 164 131 -213 156 131 -205 164 115 -230 205 115 -189 148 82 -139 65 57 -98 16 41 +JASC-PAL +0100 +16 +189 255 164 +123 32 49 +115 32 49 +222 205 115 +238 180 139 +238 189 139 +213 131 131 +222 164 123 +230 164 131 +222 164 131 +213 156 131 +205 164 115 +230 205 115 +189 148 82 +139 65 57 +98 16 41 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_path_day.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_path_day.pal index 5baab8190c..6bb31bae4c 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_path_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -131 106 32 -115 98 41 -180 222 164 -238 213 180 -238 222 189 -213 156 131 -222 205 164 -230 205 164 -222 197 164 -213 180 156 -205 205 164 -189 230 164 -156 189 115 -131 139 65 -98 82 24 +JASC-PAL +0100 +16 +189 197 255 +131 106 32 +115 98 41 +180 222 164 +238 213 180 +238 222 189 +213 156 131 +222 205 164 +230 205 164 +222 197 164 +213 180 156 +205 205 164 +189 230 164 +156 189 115 +131 139 65 +98 82 24 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_path_night.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_path_night.pal index 3fe2794569..c00b45bc61 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_path_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_path_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 180 131 -24 24 82 -32 41 82 -123 164 148 -131 131 164 -139 139 164 -115 98 131 -123 123 156 -123 123 156 -123 115 148 -123 106 131 -123 131 139 -123 172 156 -82 123 131 -49 74 98 -16 24 65 +JASC-PAL +0100 +16 +189 180 131 +24 24 82 +32 41 82 +123 164 148 +131 131 164 +139 139 164 +115 98 131 +123 123 156 +123 123 156 +123 115 148 +123 106 131 +123 131 139 +123 172 156 +82 123 131 +49 74 98 +16 24 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_puddle_afternoon.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_puddle_afternoon.pal index 45e88174fa..35281ffe45 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_puddle_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -205 156 238 -172 164 238 -148 156 238 -123 139 230 -246 164 172 -246 172 180 -230 123 123 -205 164 197 -238 164 156 -230 156 156 -230 139 148 -222 164 156 -205 180 156 -180 148 106 -164 106 57 -139 65 16 +JASC-PAL +0100 +16 +205 156 238 +172 164 238 +148 156 238 +123 139 230 +246 164 172 +246 172 180 +230 123 123 +205 164 197 +238 164 156 +230 156 156 +230 139 148 +222 164 156 +205 180 156 +180 148 106 +164 106 57 +139 65 16 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_puddle_day.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_puddle_day.pal index dcc5923cfe..141d0d9667 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_puddle_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -139 205 255 -115 197 255 -82 180 246 -238 213 180 -238 222 189 -213 156 131 -189 205 213 -230 205 164 -222 197 164 -213 180 156 -205 205 164 -189 230 164 -156 189 115 -131 139 65 -98 82 24 +JASC-PAL +0100 +16 +189 197 255 +139 205 255 +115 197 255 +82 180 246 +238 213 180 +238 222 189 +213 156 131 +189 205 213 +230 205 164 +222 197 164 +213 180 156 +205 205 164 +189 230 164 +156 189 115 +131 139 65 +98 82 24 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_puddle_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_puddle_night.pal index 6382261414..ff1141a235 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_puddle_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_puddle_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -82 115 238 -57 115 238 -49 115 238 -32 106 230 -106 123 172 -106 131 180 -98 90 123 -82 115 197 -106 115 156 -98 115 156 -98 106 148 -90 115 156 -82 131 156 -65 106 106 -57 82 57 -41 49 16 +JASC-PAL +0100 +16 +82 115 238 +57 115 238 +49 115 238 +32 106 230 +106 123 172 +106 131 180 +98 90 123 +82 115 197 +106 115 156 +98 115 156 +98 106 148 +90 115 156 +82 131 156 +65 106 106 +57 82 57 +41 49 16 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_sand_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_sand_afternoon.pal index 2bc0d955c6..e073edec07 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_sand_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -205 156 255 -57 0 0 -57 0 0 -57 0 0 -57 0 0 -57 0 0 -57 0 0 -222 148 123 -230 156 123 -238 164 123 -246 164 139 -255 172 156 -255 180 172 -213 139 123 -164 98 82 -123 49 32 +JASC-PAL +0100 +16 +205 156 255 +57 0 0 +57 0 0 +57 0 0 +57 0 0 +57 0 0 +57 0 0 +222 148 123 +230 156 123 +238 164 123 +246 164 139 +255 172 156 +255 180 172 +213 139 123 +164 98 82 +123 49 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_sand_day.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_sand_day.pal index 94e99d4f73..4e9d466a43 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_sand_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 189 123 -222 197 123 -230 205 123 -238 213 139 -246 222 156 -246 230 172 -197 180 123 -139 123 82 -90 65 32 +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 189 123 +222 197 123 +230 205 123 +238 213 139 +246 222 156 +246 230 172 +197 180 123 +139 123 82 +90 65 32 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_sand_night.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_sand_night.pal index 121fd9dff1..4ab0710b2c 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_sand_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_sand_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -139 98 255 -32 0 65 -32 0 65 -32 0 65 -32 0 65 -32 0 65 -32 0 65 -148 90 156 -156 98 156 -164 98 156 -164 106 172 -172 106 180 -172 115 197 -139 90 156 -115 57 123 -82 32 90 +JASC-PAL +0100 +16 +139 98 255 +32 0 65 +32 0 65 +32 0 65 +32 0 65 +32 0 65 +32 0 65 +148 90 156 +156 98 156 +164 98 156 +164 106 172 +172 106 180 +172 115 197 +139 90 156 +115 57 123 +82 32 90 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_snow_afternoon.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_snow_afternoon.pal index efcc9748cc..89373e6337 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_snow_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 148 189 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -246 180 180 -255 189 189 -238 172 180 -222 156 164 -205 139 156 -189 131 139 -156 106 115 -90 49 65 +JASC-PAL +0100 +16 +189 148 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 180 180 +255 189 189 +238 172 180 +222 156 164 +205 139 156 +189 131 139 +156 106 115 +90 49 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_snow_day.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_snow_day.pal index 54662085d3..2cd9657ad3 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_snow_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -189 197 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -246 238 246 -255 255 255 -238 230 238 -222 213 222 -205 189 205 -189 172 189 -156 139 156 -90 65 90 +JASC-PAL +0100 +16 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 238 246 +255 255 255 +238 230 238 +222 213 222 +205 189 205 +189 172 189 +156 139 156 +90 65 90 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_snow_night.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_snow_night.pal index 5ce8355f9b..2bd50961f1 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_snow_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_snow_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -106 115 189 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 139 180 -148 148 189 -139 131 180 -131 123 164 -115 106 156 -106 98 139 -90 82 115 -49 32 65 +JASC-PAL +0100 +16 +106 115 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 139 180 +148 148 189 +139 131 180 +131 123 164 +115 106 156 +106 98 139 +90 82 115 +49 32 65 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_surf_afternoon.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_surf_afternoon.pal index a1d2251af5..d3d7e5a23c 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_surf_afternoon.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -222 106 255 -0 0 0 -0 0 0 -255 164 148 -255 139 115 -255 115 74 -238 106 82 -230 106 74 -213 98 65 -205 90 49 -189 74 49 -164 49 49 -148 32 57 -123 24 32 -98 8 16 -74 0 0 +JASC-PAL +0100 +16 +222 106 255 +0 0 0 +0 0 0 +255 164 148 +255 139 115 +255 115 74 +238 106 82 +230 106 74 +213 98 65 +205 90 49 +189 74 49 +164 49 49 +148 32 57 +123 24 32 +98 8 16 +74 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_surf_day.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_surf_day.pal index 7fe5767a74..c306c38a11 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_surf_day.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -222 106 255 -0 0 0 -0 0 0 -148 205 255 -123 189 255 -90 172 255 -90 156 255 -82 148 238 -74 131 213 -57 115 205 -32 115 189 -16 106 172 -0 106 148 -0 90 123 -0 65 106 -0 49 82 +JASC-PAL +0100 +16 +222 106 255 +0 0 0 +0 0 0 +148 205 255 +123 189 255 +90 172 255 +90 156 255 +82 148 238 +74 131 213 +57 115 205 +32 115 189 +16 106 172 +0 106 148 +0 90 123 +0 65 106 +0 49 82 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_surf_night.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_surf_night.pal index ae42cc40d6..ada6f1c36e 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_surf_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_surf_night.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -222 106 255 -0 0 0 -0 0 0 -115 115 205 -98 98 197 -82 82 197 -57 57 189 -65 57 189 -57 49 172 -57 41 164 -41 41 148 -32 49 131 -24 57 115 -16 41 90 -8 24 74 -0 8 57 +JASC-PAL +0100 +16 +222 106 255 +0 0 0 +0 0 0 +115 115 205 +98 98 197 +82 82 197 +57 57 189 +65 57 189 +57 49 172 +57 41 164 +41 41 148 +32 49 131 +24 57 115 +16 41 90 +8 24 74 +0 8 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_afternoon.pal b/res/battle/graphic/objects/palettes/battle_terrain_tower_afternoon.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_afternoon.pal rename to res/battle/graphic/objects/palettes/battle_terrain_tower_afternoon.pal index c9edd11d27..78df4a812c 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_afternoon.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_tower_afternoon.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 213 131 -238 230 139 -246 238 139 -222 213 131 -197 189 115 -172 156 106 -148 131 98 -115 106 90 -90 74 74 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 131 +238 230 139 +246 238 139 +222 213 131 +197 189 115 +172 156 106 +148 131 98 +115 106 90 +90 74 74 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_day.pal b/res/battle/graphic/objects/palettes/battle_terrain_tower_day.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_day.pal rename to res/battle/graphic/objects/palettes/battle_terrain_tower_day.pal index c9edd11d27..78df4a812c 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_day.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_tower_day.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 213 131 -238 230 139 -246 238 139 -222 213 131 -197 189 115 -172 156 106 -148 131 98 -115 106 90 -90 74 74 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 131 +238 230 139 +246 238 139 +222 213 131 +197 189 115 +172 156 106 +148 131 98 +115 106 90 +90 74 74 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_night.pal b/res/battle/graphic/objects/palettes/battle_terrain_tower_night.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_night.pal rename to res/battle/graphic/objects/palettes/battle_terrain_tower_night.pal index c9edd11d27..78df4a812c 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/battle_terrain_tower_night.pal +++ b/res/battle/graphic/objects/palettes/battle_terrain_tower_night.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -222 213 131 -238 230 139 -246 238 139 -222 213 131 -197 189 115 -172 156 106 -148 131 98 -115 106 90 -90 74 74 -65 49 65 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 213 131 +238 230 139 +246 238 139 +222 213 131 +197 189 115 +172 156 106 +148 131 98 +115 106 90 +90 74 74 +65 49 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/bg_party_level_up.pal b/res/battle/graphic/objects/palettes/bg_party_level_up.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/bg_party_level_up.pal rename to res/battle/graphic/objects/palettes/bg_party_level_up.pal index 1b12ee7b6a..91d166e45a 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/bg_party_level_up.pal +++ b/res/battle/graphic/objects/palettes/bg_party_level_up.pal @@ -1,35 +1,35 @@ -JASC-PAL -0100 -32 -123 156 115 -74 74 98 -90 98 115 -255 255 255 -156 197 246 -131 180 246 -90 131 213 -65 106 156 -230 205 197 -98 255 98 -24 197 32 -197 172 148 -139 98 74 -74 49 0 -255 222 0 -238 172 0 -0 0 0 -255 255 255 -90 98 115 -90 131 213 -156 197 246 -255 49 49 -255 115 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +32 +123 156 115 +74 74 98 +90 98 115 +255 255 255 +156 197 246 +131 180 246 +90 131 213 +65 106 156 +230 205 197 +98 255 98 +24 197 32 +197 172 148 +139 98 74 +74 49 0 +255 222 0 +238 172 0 +0 0 0 +255 255 255 +90 98 115 +90 131 213 +156 197 246 +255 49 49 +255 115 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/cherish_ball_throw.pal b/res/battle/graphic/objects/palettes/cherish_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/cherish_ball_throw.pal rename to res/battle/graphic/objects/palettes/cherish_ball_throw.pal index 1de8248d61..a5ff3bdbbe 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/cherish_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/cherish_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -123 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 139 139 -246 65 41 -8 255 82 -205 32 41 -131 123 139 -90 90 90 -164 32 41 -246 213 197 -123 32 41 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +123 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 65 41 +8 255 82 +205 32 41 +131 123 139 +90 90 90 +164 32 41 +246 213 197 +123 32 41 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/dive_ball_throw.pal b/res/battle/graphic/objects/palettes/dive_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/dive_ball_throw.pal rename to res/battle/graphic/objects/palettes/dive_ball_throw.pal index edfd975771..1ffd5566fb 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/dive_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/dive_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -57 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -189 205 238 -49 197 255 -156 32 82 -90 156 246 -148 148 164 -32 82 180 -32 123 205 -164 222 255 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +57 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +189 205 238 +49 197 255 +156 32 82 +90 156 246 +148 148 164 +32 82 180 +32 123 205 +164 222 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/dusk_ball_throw.pal b/res/battle/graphic/objects/palettes/dusk_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/dusk_ball_throw.pal rename to res/battle/graphic/objects/palettes/dusk_ball_throw.pal index e6fa8bbb0f..8ba9c72fdd 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/dusk_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/dusk_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -131 106 156 -82 82 98 -213 213 222 -164 246 139 -49 49 49 -246 139 139 -49 213 57 -156 65 0 -197 189 0 -115 115 139 -255 82 0 -49 156 57 -255 205 255 -255 164 0 -65 65 74 -0 0 0 +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +164 246 139 +49 49 49 +246 139 139 +49 213 57 +156 65 0 +197 189 0 +115 115 139 +255 82 0 +49 156 57 +255 205 255 +255 164 0 +65 65 74 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/great_ball_throw.pal b/res/battle/graphic/objects/palettes/great_ball_throw.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/great_ball_throw.pal rename to res/battle/graphic/objects/palettes/great_ball_throw.pal index 992d603fd6..d364c0d061 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/great_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/great_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -57 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -131 164 246 -74 106 246 -131 32 65 -65 90 213 -148 148 164 -197 0 0 -255 156 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +57 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +131 164 246 +74 106 246 +131 32 65 +65 90 213 +148 148 164 +197 0 0 +255 156 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/heal_ball_throw.pal b/res/battle/graphic/objects/palettes/heal_ball_throw.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/heal_ball_throw.pal rename to res/battle/graphic/objects/palettes/heal_ball_throw.pal index e35f56927c..865ab6d7ca 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/heal_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/heal_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -131 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 57 230 -115 98 180 -255 197 230 -255 164 205 -148 148 164 -255 246 213 -230 148 172 -213 197 164 -189 189 255 -115 123 222 -0 0 0 +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 57 230 +115 98 180 +255 197 230 +255 164 205 +148 148 164 +255 246 213 +230 148 172 +213 197 164 +189 189 255 +115 123 222 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/healthbox_normal.pal b/res/battle/graphic/objects/palettes/healthbox_normal.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/healthbox_normal.pal rename to res/battle/graphic/objects/palettes/healthbox_normal.pal index 1e04468236..324ca59bfd 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/healthbox_normal.pal +++ b/res/battle/graphic/objects/palettes/healthbox_normal.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -156 180 238 -172 172 148 -41 49 41 -98 74 57 -222 222 222 -0 0 0 -24 197 32 -189 115 0 -238 172 0 -172 49 16 -255 65 16 -24 98 189 -65 148 230 -222 65 205 -255 255 255 -106 115 90 +JASC-PAL +0100 +16 +156 180 238 +172 172 148 +41 49 41 +98 74 57 +222 222 222 +0 0 0 +24 197 32 +189 115 0 +238 172 0 +172 49 16 +255 65 16 +24 98 189 +65 148 230 +222 65 205 +255 255 255 +106 115 90 diff --git a/res/battle/graphic/pl_batt_obj/palettes/healthbox_safari.pal b/res/battle/graphic/objects/palettes/healthbox_safari.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/healthbox_safari.pal rename to res/battle/graphic/objects/palettes/healthbox_safari.pal index dcf7b8cb67..c190cab3b6 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/healthbox_safari.pal +++ b/res/battle/graphic/objects/palettes/healthbox_safari.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -156 180 238 -106 156 74 -156 189 131 -205 222 197 -255 255 255 -24 32 24 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -49 98 0 -41 90 0 -255 255 255 -49 115 0 +JASC-PAL +0100 +16 +156 180 238 +106 156 74 +156 189 131 +205 222 197 +255 255 255 +24 32 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +49 98 0 +41 90 0 +255 255 255 +49 115 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/icon_palettes.pal b/res/battle/graphic/objects/palettes/icon_palettes.pal similarity index 91% rename from res/battle/graphic/pl_batt_obj/palettes/icon_palettes.pal rename to res/battle/graphic/objects/palettes/icon_palettes.pal index 0442b5a5ff..dbf9700302 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/icon_palettes.pal +++ b/res/battle/graphic/objects/palettes/icon_palettes.pal @@ -1,51 +1,51 @@ -JASC-PAL -0100 -48 -0 0 0 -255 213 49 -246 82 49 -148 49 41 -230 197 106 -189 164 57 -139 106 49 -255 255 123 -172 172 123 -222 222 197 -115 90 74 -74 65 57 -189 189 213 -0 0 0 -131 123 115 -255 255 255 -0 0 0 -205 197 255 -172 148 246 -115 90 156 -106 148 246 -156 222 222 -213 255 238 -74 57 82 -255 90 139 -255 197 180 -148 98 98 -164 65 164 -222 131 189 -148 148 164 -131 123 115 -255 255 255 -0 0 0 -197 255 98 -123 205 82 -90 131 65 -115 57 255 -74 57 148 -189 164 255 -172 189 32 -222 230 49 -123 148 16 -106 164 148 -115 205 180 -32 106 98 -0 0 0 -131 123 115 -255 255 255 +JASC-PAL +0100 +48 +0 0 0 +255 213 49 +246 82 49 +148 49 41 +230 197 106 +189 164 57 +139 106 49 +255 255 123 +172 172 123 +222 222 197 +115 90 74 +74 65 57 +189 189 213 +0 0 0 +131 123 115 +255 255 255 +0 0 0 +205 197 255 +172 148 246 +115 90 156 +106 148 246 +156 222 222 +213 255 238 +74 57 82 +255 90 139 +255 197 180 +148 98 98 +164 65 164 +222 131 189 +148 148 164 +131 123 115 +255 255 255 +0 0 0 +197 255 98 +123 205 82 +90 131 65 +115 57 255 +74 57 148 +189 164 255 +172 189 32 +222 230 49 +123 148 16 +106 164 148 +115 205 180 +32 106 98 +0 0 0 +131 123 115 +255 255 255 diff --git a/res/battle/graphic/pl_batt_obj/palettes/luxury_ball_throw.pal b/res/battle/graphic/objects/palettes/luxury_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/luxury_ball_throw.pal rename to res/battle/graphic/objects/palettes/luxury_ball_throw.pal index 29ac4242cd..16f169b187 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/luxury_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/luxury_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -131 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 164 139 -255 82 0 -156 32 82 -213 90 90 -148 148 164 -246 230 0 -222 180 0 -246 230 205 -180 41 41 -255 255 205 -0 0 0 +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 164 139 +255 82 0 +156 32 82 +213 90 90 +148 148 164 +246 230 0 +222 180 0 +246 230 205 +180 41 41 +255 255 205 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/master_ball_throw.pal b/res/battle/graphic/objects/palettes/master_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/master_ball_throw.pal rename to res/battle/graphic/objects/palettes/master_ball_throw.pal index d1b94f87f2..41d68f3400 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/master_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/master_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -57 74 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -189 180 255 -139 115 238 -189 74 139 -98 74 172 -148 148 164 -98 57 106 -238 65 164 -255 123 205 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +57 74 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +189 180 255 +139 115 238 +189 74 139 +98 74 172 +148 148 164 +98 57 106 +238 65 164 +255 123 205 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/meson.build b/res/battle/graphic/objects/palettes/meson.build similarity index 100% rename from res/battle/graphic/pl_batt_obj/palettes/meson.build rename to res/battle/graphic/objects/palettes/meson.build diff --git a/res/battle/graphic/pl_batt_obj/palettes/mud_throw.pal b/res/battle/graphic/objects/palettes/mud_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/mud_throw.pal rename to res/battle/graphic/objects/palettes/mud_throw.pal index 41c968b088..97db57b4c5 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/mud_throw.pal +++ b/res/battle/graphic/objects/palettes/mud_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -82 189 156 -82 82 98 -139 106 82 -148 98 57 -49 49 49 -205 197 172 -246 139 41 -106 74 57 -49 115 246 -148 148 164 -172 106 41 -180 148 106 -255 115 180 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +82 189 156 +82 82 98 +139 106 82 +148 98 57 +49 49 49 +205 197 172 +246 139 41 +106 74 57 +49 115 246 +148 148 164 +172 106 41 +180 148 106 +255 115 180 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/nest_ball_throw.pal b/res/battle/graphic/objects/palettes/nest_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/nest_ball_throw.pal rename to res/battle/graphic/objects/palettes/nest_ball_throw.pal index bbf21fc04b..c38d32ac10 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/nest_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/nest_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -57 74 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -139 189 123 -49 156 41 -156 32 82 -65 106 8 -148 148 164 -0 0 0 -164 131 0 -180 164 123 -131 106 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +57 74 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +139 189 123 +49 156 41 +156 32 82 +65 106 8 +148 148 164 +0 0 0 +164 131 0 +180 164 123 +131 106 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/net_ball_throw.pal b/res/battle/graphic/objects/palettes/net_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/net_ball_throw.pal rename to res/battle/graphic/objects/palettes/net_ball_throw.pal index dda3d29b80..f0c6da4438 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/net_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/net_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -131 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -139 222 230 -32 180 205 -156 32 82 -74 131 180 -148 148 164 -82 82 98 -74 131 180 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +139 222 230 +32 180 205 +156 32 82 +74 131 180 +148 148 164 +82 82 98 +74 131 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/park_ball_throw.pal b/res/battle/graphic/objects/palettes/park_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/park_ball_throw.pal rename to res/battle/graphic/objects/palettes/park_ball_throw.pal index 940c44d81c..647df4b7ac 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/park_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/park_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -230 106 156 -82 82 98 -213 172 82 -255 197 90 -49 49 49 -205 197 172 -246 139 41 -41 82 189 -49 115 246 -148 148 164 -172 106 41 -255 246 213 -255 115 180 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +230 106 156 +82 82 98 +213 172 82 +255 197 90 +49 49 49 +205 197 172 +246 139 41 +41 82 189 +49 115 246 +148 148 164 +172 106 41 +255 246 213 +255 115 180 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/party_gauge.pal b/res/battle/graphic/objects/palettes/party_gauge.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/party_gauge.pal rename to res/battle/graphic/objects/palettes/party_gauge.pal index 2e0c228655..ab06b153d6 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/party_gauge.pal +++ b/res/battle/graphic/objects/palettes/party_gauge.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -123 131 255 -164 164 172 -213 213 222 -255 255 255 -57 49 49 -41 82 41 -32 115 32 -16 148 24 -8 180 16 -0 213 8 -131 131 139 -255 106 106 -222 57 57 -213 115 139 -189 90 106 -156 98 98 +JASC-PAL +0100 +16 +123 131 255 +164 164 172 +213 213 222 +255 255 255 +57 49 49 +41 82 41 +32 115 32 +16 148 24 +8 180 16 +0 213 8 +131 131 139 +255 106 106 +222 57 57 +213 115 139 +189 90 106 +156 98 98 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000000.pal b/res/battle/graphic/objects/palettes/pl_batt_obj_00000000.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000000.pal rename to res/battle/graphic/objects/palettes/pl_batt_obj_00000000.pal index 93447325d6..b7fe064cef 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000000.pal +++ b/res/battle/graphic/objects/palettes/pl_batt_obj_00000000.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -106 213 49 -65 65 65 -255 255 255 -205 205 205 -148 148 123 -82 123 189 -16 65 131 -41 49 65 -82 98 139 -255 213 82 -255 180 65 -230 98 115 -16 238 238 -32 156 164 -246 246 246 -0 0 0 -0 255 0 -0 0 0 -57 74 65 -222 106 90 -123 148 131 -255 255 222 -32 57 0 -197 189 115 -255 230 0 -90 213 131 -222 213 180 -82 106 98 -255 255 255 -115 255 172 -255 172 123 -74 65 90 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +106 213 49 +65 65 65 +255 255 255 +205 205 205 +148 148 123 +82 123 189 +16 65 131 +41 49 65 +82 98 139 +255 213 82 +255 180 65 +230 98 115 +16 238 238 +32 156 164 +246 246 246 +0 0 0 +0 255 0 +0 0 0 +57 74 65 +222 106 90 +123 148 131 +255 255 222 +32 57 0 +197 189 115 +255 230 0 +90 213 131 +222 213 180 +82 106 98 +255 255 255 +115 255 172 +255 172 123 +74 65 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000070.pal b/res/battle/graphic/objects/palettes/pl_batt_obj_00000070.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000070.pal rename to res/battle/graphic/objects/palettes/pl_batt_obj_00000070.pal index a6d3d14091..e22f1acd03 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000070.pal +++ b/res/battle/graphic/objects/palettes/pl_batt_obj_00000070.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -0 0 0 -0 0 0 -172 172 189 -180 180 189 -189 189 197 -255 255 255 -222 222 205 -197 197 197 -139 139 156 -222 238 238 -246 246 246 -156 156 172 -0 0 0 -205 205 205 -82 82 82 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +172 172 189 +180 180 189 +189 189 197 +255 255 255 +222 222 205 +197 197 197 +139 139 156 +222 238 238 +246 246 246 +156 156 172 +0 0 0 +205 205 205 +82 82 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000072.pal b/res/battle/graphic/objects/palettes/pl_batt_obj_00000072.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000072.pal rename to res/battle/graphic/objects/palettes/pl_batt_obj_00000072.pal index c52c8b72b2..005eceb49b 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000072.pal +++ b/res/battle/graphic/objects/palettes/pl_batt_obj_00000072.pal @@ -1,115 +1,115 @@ -JASC-PAL -0100 -112 -123 131 255 -139 139 148 -172 172 189 -255 255 255 -57 49 49 -255 148 131 -255 82 57 -164 65 123 -205 205 213 -82 82 82 -222 139 164 -189 82 98 -131 74 74 -0 0 0 -139 139 139 -123 123 123 -123 131 255 -139 139 148 -213 213 222 -255 255 255 -49 49 49 -246 139 139 -255 106 106 -115 115 115 -164 65 82 -189 106 123 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -131 131 131 -106 106 106 -98 98 205 -255 255 255 -238 213 213 -90 32 32 -255 255 255 -238 230 189 -98 65 0 -255 255 255 -213 238 213 -32 74 24 -255 255 255 -205 205 230 -16 32 90 -0 0 0 -0 0 0 -172 230 189 -98 98 205 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -148 148 131 -115 115 106 -32 32 24 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -123 131 255 -57 65 57 -115 139 115 -139 106 16 -255 230 8 -180 65 0 -255 131 0 -148 0 32 -255 106 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 82 98 -255 255 255 -255 255 255 -205 205 205 -0 0 0 -172 172 172 -148 148 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -123 131 255 -255 255 255 -238 213 213 -90 32 32 -255 255 255 -205 205 230 -16 32 90 -0 57 255 -106 205 255 -255 0 32 -255 156 156 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +112 +123 131 255 +139 139 148 +172 172 189 +255 255 255 +57 49 49 +255 148 131 +255 82 57 +164 65 123 +205 205 213 +82 82 82 +222 139 164 +189 82 98 +131 74 74 +0 0 0 +139 139 139 +123 123 123 +123 131 255 +139 139 148 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +255 106 106 +115 115 115 +164 65 82 +189 106 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +131 131 131 +106 106 106 +98 98 205 +255 255 255 +238 213 213 +90 32 32 +255 255 255 +238 230 189 +98 65 0 +255 255 255 +213 238 213 +32 74 24 +255 255 255 +205 205 230 +16 32 90 +0 0 0 +0 0 0 +172 230 189 +98 98 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 131 +115 115 106 +32 32 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +123 131 255 +57 65 57 +115 139 115 +139 106 16 +255 230 8 +180 65 0 +255 131 0 +148 0 32 +255 106 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 82 98 +255 255 255 +255 255 255 +205 205 205 +0 0 0 +172 172 172 +148 148 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +123 131 255 +255 255 255 +238 213 213 +90 32 32 +255 255 255 +205 205 230 +16 32 90 +0 57 255 +106 205 255 +255 0 32 +255 156 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000073.pal b/res/battle/graphic/objects/palettes/pl_batt_obj_00000073.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000073.pal rename to res/battle/graphic/objects/palettes/pl_batt_obj_00000073.pal index 1a2567d257..ec2916a9e5 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000073.pal +++ b/res/battle/graphic/objects/palettes/pl_batt_obj_00000073.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -255 255 255 -255 0 0 -222 0 0 -98 41 246 -139 8 41 -197 0 0 -0 0 0 -255 197 180 -255 131 131 -197 106 98 -156 74 65 -148 139 205 -0 0 0 -106 90 156 -106 74 82 -49 41 57 +JASC-PAL +0100 +16 +255 255 255 +255 0 0 +222 0 0 +98 41 246 +139 8 41 +197 0 0 +0 0 0 +255 197 180 +255 131 131 +197 106 98 +156 74 65 +148 139 205 +0 0 0 +106 90 156 +106 74 82 +49 41 57 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000075.pal b/res/battle/graphic/objects/palettes/pl_batt_obj_00000075.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000075.pal rename to res/battle/graphic/objects/palettes/pl_batt_obj_00000075.pal index 98addad595..10f944de15 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000075.pal +++ b/res/battle/graphic/objects/palettes/pl_batt_obj_00000075.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -8 16 16 -41 49 49 -106 115 115 -172 180 180 -205 213 213 -24 41 82 -74 82 82 -139 148 148 -57 65 65 -238 255 255 -90 98 98 -24 32 32 -123 131 131 -189 197 197 -222 230 230 -156 164 164 +JASC-PAL +0100 +16 +8 16 16 +41 49 49 +106 115 115 +172 180 180 +205 213 213 +24 41 82 +74 82 82 +139 148 148 +57 65 65 +238 255 255 +90 98 98 +24 32 32 +123 131 131 +189 197 197 +222 230 230 +156 164 164 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000079.pal b/res/battle/graphic/objects/palettes/pl_batt_obj_00000079.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000079.pal rename to res/battle/graphic/objects/palettes/pl_batt_obj_00000079.pal index 5bd5fcccfa..c5e7e06317 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000079.pal +++ b/res/battle/graphic/objects/palettes/pl_batt_obj_00000079.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -123 131 255 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 139 139 -246 65 41 -156 32 82 -213 16 90 -148 148 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +123 131 255 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 65 41 +156 32 82 +213 16 90 +148 148 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000111.pal b/res/battle/graphic/objects/palettes/pl_batt_obj_00000111.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000111.pal rename to res/battle/graphic/objects/palettes/pl_batt_obj_00000111.pal index 30bf18950e..30e24af8e2 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/pl_batt_obj_00000111.pal +++ b/res/battle/graphic/objects/palettes/pl_batt_obj_00000111.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -156 197 106 -82 82 90 -164 164 172 -238 32 16 -255 172 189 -0 115 255 -123 189 238 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -255 189 197 -222 222 222 -148 213 255 -255 255 255 +JASC-PAL +0100 +16 +156 197 106 +82 82 90 +164 164 172 +238 32 16 +255 172 189 +0 115 255 +123 189 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +255 189 197 +222 222 222 +148 213 255 +255 255 255 diff --git a/res/battle/graphic/pl_batt_obj/palettes/player_barry_back.pal b/res/battle/graphic/objects/palettes/player_barry_back.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/player_barry_back.pal rename to res/battle/graphic/objects/palettes/player_barry_back.pal index 19bee2fb03..04d6edb077 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/player_barry_back.pal +++ b/res/battle/graphic/objects/palettes/player_barry_back.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -205 189 156 -139 189 106 -197 115 57 -255 148 74 -82 90 106 -131 148 156 -255 222 123 -189 222 156 -205 205 222 -197 164 115 -123 65 65 -222 164 123 -255 213 189 -0 0 0 -172 164 205 -238 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +205 189 156 +139 189 106 +197 115 57 +255 148 74 +82 90 106 +131 148 156 +255 222 123 +189 222 156 +205 205 222 +197 164 115 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/player_buck_back.pal b/res/battle/graphic/objects/palettes/player_buck_back.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/player_buck_back.pal rename to res/battle/graphic/objects/palettes/player_buck_back.pal index efe8d27a8d..227e928d85 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/player_buck_back.pal +++ b/res/battle/graphic/objects/palettes/player_buck_back.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -197 189 156 -98 139 213 -189 74 65 -246 82 82 -57 65 82 -57 98 139 -255 222 90 -123 172 222 -205 205 222 -205 156 57 -123 65 65 -205 148 123 -230 189 164 -0 0 0 -172 164 205 -238 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +197 189 156 +98 139 213 +189 74 65 +246 82 82 +57 65 82 +57 98 139 +255 222 90 +123 172 222 +205 205 222 +205 156 57 +123 65 65 +205 148 123 +230 189 164 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/player_cheryl_back.pal b/res/battle/graphic/objects/palettes/player_cheryl_back.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/player_cheryl_back.pal rename to res/battle/graphic/objects/palettes/player_cheryl_back.pal index df198e5fe9..ab42c1cb52 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/player_cheryl_back.pal +++ b/res/battle/graphic/objects/palettes/player_cheryl_back.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -197 189 156 -82 123 90 -197 57 57 -255 238 172 -57 65 82 -90 98 115 -172 205 148 -90 172 106 -205 205 222 -148 180 123 -123 65 65 -222 164 123 -255 213 189 -0 0 0 -172 164 205 -238 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +197 189 156 +82 123 90 +197 57 57 +255 238 172 +57 65 82 +90 98 115 +172 205 148 +90 172 106 +205 205 222 +148 180 123 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/player_dawn_back.pal b/res/battle/graphic/objects/palettes/player_dawn_back.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/player_dawn_back.pal rename to res/battle/graphic/objects/palettes/player_dawn_back.pal index e5acd6f1d2..db1953bc74 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/player_dawn_back.pal +++ b/res/battle/graphic/objects/palettes/player_dawn_back.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -197 189 156 -197 106 156 -197 57 57 -246 106 74 -57 65 82 -82 98 139 -255 222 90 -238 148 197 -205 205 222 -205 156 57 -123 65 65 -222 164 123 -255 213 189 -0 0 0 -172 164 205 -238 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +197 189 156 +197 106 156 +197 57 57 +246 106 74 +57 65 82 +82 98 139 +255 222 90 +238 148 197 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/player_lucas_back.pal b/res/battle/graphic/objects/palettes/player_lucas_back.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/player_lucas_back.pal rename to res/battle/graphic/objects/palettes/player_lucas_back.pal index ed023b25a4..5bd90cd284 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/player_lucas_back.pal +++ b/res/battle/graphic/objects/palettes/player_lucas_back.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -197 189 156 -98 139 213 -197 57 57 -246 106 74 -57 65 82 -57 98 139 -255 222 90 -123 172 222 -205 205 222 -205 156 57 -123 65 65 -222 164 123 -255 213 189 -0 0 0 -172 164 205 -238 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +197 189 156 +98 139 213 +197 57 57 +246 106 74 +57 65 82 +57 98 139 +255 222 90 +123 172 222 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/player_marley_back.pal b/res/battle/graphic/objects/palettes/player_marley_back.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/player_marley_back.pal rename to res/battle/graphic/objects/palettes/player_marley_back.pal index fe9aeb863a..e6e3cc363e 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/player_marley_back.pal +++ b/res/battle/graphic/objects/palettes/player_marley_back.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -197 189 156 -41 41 49 -197 57 57 -255 238 172 -65 65 74 -98 98 115 -255 222 90 -222 98 156 -205 205 222 -205 156 57 -123 65 65 -222 164 123 -255 213 189 -0 0 0 -172 164 205 -246 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +197 189 156 +41 41 49 +197 57 57 +255 238 172 +65 65 74 +98 98 115 +255 222 90 +222 98 156 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +246 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/player_mira_back.pal b/res/battle/graphic/objects/palettes/player_mira_back.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/player_mira_back.pal rename to res/battle/graphic/objects/palettes/player_mira_back.pal index d6fe59a828..3a226cf12a 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/player_mira_back.pal +++ b/res/battle/graphic/objects/palettes/player_mira_back.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -197 189 156 -180 65 115 -197 57 57 -255 238 172 -57 65 82 -82 98 139 -255 222 90 -222 98 156 -205 205 222 -205 156 57 -123 65 65 -222 164 123 -255 213 189 -0 0 0 -172 164 205 -238 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +197 189 156 +180 65 115 +197 57 57 +255 238 172 +57 65 82 +82 98 139 +255 222 90 +222 98 156 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/player_riley_back.pal b/res/battle/graphic/objects/palettes/player_riley_back.pal similarity index 86% rename from res/battle/graphic/pl_batt_obj/palettes/player_riley_back.pal rename to res/battle/graphic/objects/palettes/player_riley_back.pal index ecafecad0d..61fa8c59f6 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/player_riley_back.pal +++ b/res/battle/graphic/objects/palettes/player_riley_back.pal @@ -1,259 +1,259 @@ -JASC-PAL -0100 -256 -197 189 156 -98 106 139 -74 82 115 -106 156 205 -57 65 82 -57 82 115 -82 139 189 -123 131 164 -255 222 115 -65 106 156 -123 65 65 -222 164 123 -255 213 189 -0 0 0 -172 164 205 -238 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +256 +197 189 156 +98 106 139 +74 82 115 +106 156 205 +57 65 82 +57 82 115 +82 139 189 +123 131 164 +255 222 115 +65 106 156 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/poke_ball_throw.pal b/res/battle/graphic/objects/palettes/poke_ball_throw.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/poke_ball_throw.pal rename to res/battle/graphic/objects/palettes/poke_ball_throw.pal index 4a62092d92..93b576b9a7 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/poke_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/poke_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -57 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 139 139 -246 65 41 -156 32 82 -213 16 90 -148 148 164 -0 0 0 -0 0 0 -213 16 90 -148 148 164 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +57 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 65 41 +156 32 82 +213 16 90 +148 148 164 +0 0 0 +0 0 0 +213 16 90 +148 148 164 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/premier_ball_throw.pal b/res/battle/graphic/objects/palettes/premier_ball_throw.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/premier_ball_throw.pal rename to res/battle/graphic/objects/palettes/premier_ball_throw.pal index 3c18251456..39f891c08c 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/premier_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/premier_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -230 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 139 139 -246 139 41 -156 32 0 -213 49 32 -148 148 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +230 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 139 41 +156 32 0 +213 49 32 +148 148 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/quick_ball_throw.pal b/res/battle/graphic/objects/palettes/quick_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/quick_ball_throw.pal rename to res/battle/graphic/objects/palettes/quick_ball_throw.pal index d3aaea663c..314d66dcef 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/quick_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/quick_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -131 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 139 139 -74 139 222 -139 213 255 -213 16 90 -148 148 164 -0 0 0 -255 222 0 -213 172 0 -74 106 164 -255 246 189 -0 0 0 +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +74 139 222 +139 213 255 +213 16 90 +148 148 164 +0 0 0 +255 222 0 +213 172 0 +74 106 164 +255 246 189 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/repeat_ball_throw.pal b/res/battle/graphic/objects/palettes/repeat_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/repeat_ball_throw.pal rename to res/battle/graphic/objects/palettes/repeat_ball_throw.pal index 8a88c0fc3a..e25758ca84 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/repeat_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/repeat_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -131 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 139 139 -246 98 41 -156 32 82 -213 90 90 -148 148 164 -246 230 0 -222 180 0 -246 230 205 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 98 41 +156 32 82 +213 90 90 +148 148 164 +246 230 0 +222 180 0 +246 230 205 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/safari_ball_throw.pal b/res/battle/graphic/objects/palettes/safari_ball_throw.pal similarity index 90% rename from res/battle/graphic/pl_batt_obj/palettes/safari_ball_throw.pal rename to res/battle/graphic/objects/palettes/safari_ball_throw.pal index 886c041b0f..b84ccb4d4d 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/safari_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/safari_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -57 74 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -189 197 139 -148 148 41 -156 32 82 -98 115 41 -148 148 164 -180 115 82 -123 90 57 -0 98 0 -230 197 164 -139 156 123 -0 0 0 +JASC-PAL +0100 +16 +57 74 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +189 197 139 +148 148 41 +156 32 82 +98 115 41 +148 148 164 +180 115 82 +123 90 57 +0 98 0 +230 197 164 +139 156 123 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/timer_ball_throw.pal b/res/battle/graphic/objects/palettes/timer_ball_throw.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/timer_ball_throw.pal rename to res/battle/graphic/objects/palettes/timer_ball_throw.pal index 9b1c80a645..e6ccbd4fdd 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/timer_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/timer_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -230 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -246 139 139 -246 65 41 -156 32 82 -213 16 90 -148 148 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +230 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +246 139 139 +246 65 41 +156 32 82 +213 16 90 +148 148 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/palettes/ultra_ball_throw.pal b/res/battle/graphic/objects/palettes/ultra_ball_throw.pal similarity index 89% rename from res/battle/graphic/pl_batt_obj/palettes/ultra_ball_throw.pal rename to res/battle/graphic/objects/palettes/ultra_ball_throw.pal index 66c2880f14..2352f0e0db 100644 --- a/res/battle/graphic/pl_batt_obj/palettes/ultra_ball_throw.pal +++ b/res/battle/graphic/objects/palettes/ultra_ball_throw.pal @@ -1,19 +1,19 @@ -JASC-PAL -0100 -16 -131 106 156 -82 82 98 -213 213 222 -255 255 255 -49 49 49 -238 246 205 -246 230 106 -156 32 82 -180 172 90 -148 148 164 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +JASC-PAL +0100 +16 +131 106 156 +82 82 98 +213 213 222 +255 255 255 +49 49 49 +238 246 205 +246 230 106 +156 32 82 +180 172 90 +148 148 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/battle/graphic/pl_batt_obj/pl_batt_obj.ignore b/res/battle/graphic/objects/pl_batt_obj.ignore similarity index 100% rename from res/battle/graphic/pl_batt_obj/pl_batt_obj.ignore rename to res/battle/graphic/objects/pl_batt_obj.ignore diff --git a/res/battle/graphic/pl_batt_obj/pl_batt_obj.order b/res/battle/graphic/objects/pl_batt_obj.order similarity index 96% rename from res/battle/graphic/pl_batt_obj/pl_batt_obj.order rename to res/battle/graphic/objects/pl_batt_obj.order index 00dd4d5b77..421f3b7042 100644 --- a/res/battle/graphic/pl_batt_obj/pl_batt_obj.order +++ b/res/battle/graphic/objects/pl_batt_obj.order @@ -1,343 +1,343 @@ -pl_batt_obj_00000000.NCLR -battle_terrain_grass_day.NCLR -battle_terrain_grass_afternoon.NCLR -battle_terrain_grass_night.NCLR -battle_terrain_surf_day.NCLR -battle_terrain_surf_afternoon.NCLR -battle_terrain_surf_night.NCLR -battle_terrain_path_day.NCLR -battle_terrain_path_afternoon.NCLR -battle_terrain_path_night.NCLR -battle_terrain_ice_day.NCLR -battle_terrain_ice_afternoon.NCLR -battle_terrain_ice_night.NCLR -battle_terrain_mountain_day.NCLR -battle_terrain_mountain_afternoon.NCLR -battle_terrain_mountain_night.NCLR -battle_terrain_snow_day.NCLR -battle_terrain_snow_afternoon.NCLR -battle_terrain_snow_night.NCLR -battle_terrain_indoors_day.NCLR -battle_terrain_indoors_afternoon.NCLR -battle_terrain_indoors_night.NCLR -battle_terrain_sand_day.NCLR -battle_terrain_sand_afternoon.NCLR -battle_terrain_sand_night.NCLR -battle_terrain_mud_day.NCLR -battle_terrain_mud_afternoon.NCLR -battle_terrain_mud_night.NCLR -battle_terrain_cave_day.NCLR -battle_terrain_cave_afternoon.NCLR -battle_terrain_cave_night.NCLR -battle_terrain_puddle_day.NCLR -battle_terrain_puddle_afternoon.NCLR -battle_terrain_puddle_night.NCLR -battle_terrain_elite4_aaron_day.NCLR -battle_terrain_elite4_aaron_afternoon.NCLR -battle_terrain_elite4_aaron_night.NCLR -battle_terrain_elite4_bertha_day.NCLR -battle_terrain_elite4_bertha_afternoon.NCLR -battle_terrain_elite4_bertha_night.NCLR -battle_terrain_elite4_flint_day.NCLR -battle_terrain_elite4_flint_afternoon.NCLR -battle_terrain_elite4_flint_night.NCLR -battle_terrain_elite4_lucian_day.NCLR -battle_terrain_elite4_lucian_afternoon.NCLR -battle_terrain_elite4_lucian_night.NCLR -battle_terrain_champion_day.NCLR -battle_terrain_champion_afternoon.NCLR -battle_terrain_champion_night.NCLR -battle_terrain_distortion_world_day.NCLR -battle_terrain_distortion_world_afternoon.NCLR -battle_terrain_distortion_world_night.NCLR -battle_terrain_tower_day.NCLR -battle_terrain_tower_afternoon.NCLR -battle_terrain_tower_night.NCLR -battle_terrain_factory_day.NCLR -battle_terrain_factory_afternoon.NCLR -battle_terrain_factory_night.NCLR -battle_terrain_arcade_day.NCLR -battle_terrain_arcade_afternoon.NCLR -battle_terrain_arcade_night.NCLR -battle_terrain_castle_day.NCLR -battle_terrain_castle_afternoon.NCLR -battle_terrain_castle_night.NCLR -battle_terrain_hall_day.NCLR -battle_terrain_hall_afternoon.NCLR -battle_terrain_hall_night.NCLR -battle_terrain_giratina_day.NCLR -battle_terrain_giratina_afternoon.NCLR -battle_terrain_giratina_night.NCLR -pl_batt_obj_00000070.NCLR -healthbox_normal.NCLR -pl_batt_obj_00000072.NCLR -pl_batt_obj_00000073.NCLR -icon_palettes.NCLR -pl_batt_obj_00000075.NCLR -pl_batt_obj_00000076.NCGR -pl_batt_obj_00000077.NCER -pl_batt_obj_00000078.NANR -pl_batt_obj_00000079.NCLR -battle_subscreen_cursor_corner.NCLR -healthbox_safari.NCLR -bg_party_level_up.NCLR -player_lucas_back.NCLR -player_dawn_back.NCLR -player_barry_back.NCLR -player_cheryl_back.NCLR -player_riley_back.NCLR -player_marley_back.NCLR -player_buck_back.NCLR -player_mira_back.NCLR -poke_ball_throw.NCLR -master_ball_throw.NCLR -ultra_ball_throw.NCLR -great_ball_throw.NCLR -safari_ball_throw.NCLR -net_ball_throw.NCLR -dive_ball_throw.NCLR -nest_ball_throw.NCLR -repeat_ball_throw.NCLR -timer_ball_throw.NCLR -luxury_ball_throw.NCLR -premier_ball_throw.NCLR -quick_ball_throw.NCLR -dusk_ball_throw.NCLR -heal_ball_throw.NCLR -cherish_ball_throw.NCLR -park_ball_throw.NCLR -bait_throw.NCLR -mud_throw.NCLR -party_gauge.NCLR -pl_batt_obj_00000111.NCLR -pl_batt_obj_00000112.NCGR -pl_batt_obj_00000113.NCER -pl_batt_obj_00000114.NANR -pl_batt_obj_00000115.NANR.lz -pl_batt_obj_00000116.NCER.lz -pl_batt_obj_00000117.NCGR.lz -pl_batt_obj_00000118.NANR.lz -pl_batt_obj_00000119.NCER.lz -pl_batt_obj_00000120.NCGR.lz -pl_batt_obj_00000121.NCGR.lz -pl_batt_obj_00000122.NCER.lz -pl_batt_obj_00000123.NANR.lz -pl_batt_obj_00000124.NCGR.lz -pl_batt_obj_00000125.NCER.lz -pl_batt_obj_00000126.NANR.lz -battle_terrain_grass_player.NCGR.lz -battle_terrain_player.NCER.lz -battle_terrain_player.NANR.lz -battle_terrain_grass_opponent.NCGR.lz -battle_terrain_opponent.NCER.lz -battle_terrain_opponent.NANR.lz -battle_terrain_surf_player.NCGR.lz -battle_terrain_surf_opponent.NCGR.lz -battle_terrain_path_player.NCGR.lz -battle_terrain_path_opponent.NCGR.lz -battle_terrain_ice_player.NCGR.lz -battle_terrain_ice_opponent.NCGR.lz -battle_terrain_mountain_player.NCGR.lz -battle_terrain_mountain_opponent.NCGR.lz -battle_terrain_snow_player.NCGR.lz -battle_terrain_snow_opponent.NCGR.lz -battle_terrain_indoors_player.NCGR.lz -battle_terrain_indoors_opponent.NCGR.lz -battle_terrain_sand_player.NCGR.lz -battle_terrain_sand_opponent.NCGR.lz -battle_terrain_mud_player.NCGR.lz -battle_terrain_mud_opponent.NCGR.lz -battle_terrain_cave_player.NCGR.lz -battle_terrain_cave_opponent.NCGR.lz -battle_terrain_puddle_player.NCGR.lz -battle_terrain_puddle_opponent.NCGR.lz -battle_terrain_elite4_aaron_player.NCGR.lz -battle_terrain_elite4_aaron_opponent.NCGR.lz -battle_terrain_elite4_bertha_player.NCGR.lz -battle_terrain_elite4_bertha_opponent.NCGR.lz -battle_terrain_elite4_flint_player.NCGR.lz -battle_terrain_elite4_flint_opponent.NCGR.lz -battle_terrain_elite4_lucian_player.NCGR.lz -battle_terrain_elite4_lucian_opponent.NCGR.lz -battle_terrain_champion_player.NCGR.lz -battle_terrain_champion_opponent.NCGR.lz -battle_terrain_distortion_world_player.NCGR.lz -battle_terrain_distortion_world_opponent.NCGR.lz -battle_terrain_tower_player.NCGR.lz -battle_terrain_tower_opponent.NCGR.lz -battle_terrain_factory_player.NCGR.lz -battle_terrain_factory_opponent.NCGR.lz -battle_terrain_arcade_player.NCGR.lz -battle_terrain_arcade_opponent.NCGR.lz -battle_terrain_castle_player.NCGR.lz -battle_terrain_castle_opponent.NCGR.lz -battle_terrain_hall_player.NCGR.lz -battle_terrain_hall_opponent.NCGR.lz -battle_terrain_giratina_player.NCGR.lz -battle_terrain_giratina_opponent.NCGR.lz -pl_batt_obj_00000177.NANR.lz -pl_batt_obj_00000178.NCER.lz -pl_batt_obj_00000179.NCGR.lz -pl_batt_obj_00000180.NANR.lz -pl_batt_obj_00000181.NCER.lz -pl_batt_obj_00000182.NCGR.lz -pl_batt_obj_00000183.NANR.lz -pl_batt_obj_00000184.NCER.lz -pl_batt_obj_00000185.NCGR.lz -healthbox_singles_opponent.NANR.lz -healthbox_singles_opponent.NCER.lz -healthbox_singles_opponent.NCGR.lz -healthbox_singles_player.NANR.lz -healthbox_singles_player.NCER.lz -healthbox_singles_player.NCGR.lz -healthbox_doubles_opponent_1.NANR.lz -healthbox_doubles_opponent_1.NCER.lz -healthbox_doubles_opponent_1.NCGR.lz -healthbox_doubles_opponent_2.NANR.lz -healthbox_doubles_opponent_2.NCER.lz -healthbox_doubles_opponent_2.NCGR.lz -healthbox_doubles_player_1.NANR.lz -healthbox_doubles_player_1.NCER.lz -healthbox_doubles_player_1.NCGR.lz -healthbox_doubles_player_2.NANR.lz -healthbox_doubles_player_2.NCER.lz -healthbox_doubles_player_2.NCGR.lz -ball_status_indicator_opponent.NCER.lz -ball_status_indicator_opponent.NCGR.lz -ball_status_indicator_opponent.NANR.lz -ball_status_indicator_player.NCER.lz -ball_status_indicator_player.NCGR.lz -ball_status_indicator_player.NANR.lz -pl_batt_obj_00000210.NCER.lz -pl_batt_obj_00000211.NCGR.lz -pl_batt_obj_00000212.NANR.lz -pl_batt_obj_00000213.NCER.lz -pl_batt_obj_00000214.NCGR.lz -pl_batt_obj_00000215.NANR.lz -pl_batt_obj_00000216.NCER.lz -pl_batt_obj_00000217.NCGR.lz -pl_batt_obj_00000218.NANR.lz -contest_icon_beauty.NCGR.lz -contest_icon_cute.NCGR.lz -type_icon_dragon.NCGR.lz -type_icon_electric.NCGR.lz -type_icon_psychic.NCGR.lz -type_icon_dark.NCGR.lz -type_icon_fighting.NCGR.lz -type_icon_fire.NCGR.lz -type_icon_flying.NCGR.lz -type_icon_ghost.NCGR.lz -type_icon_ground.NCGR.lz -type_icon_ice.NCGR.lz -type_icon_bug.NCGR.lz -contest_icon_smart.NCGR.lz -type_icon_grass.NCGR.lz -type_icon_normal.NCGR.lz -type_icon_poison.NCGR.lz -type_icon_mystery.NCGR.lz -type_icon_rock.NCGR.lz -type_icon_steel.NCGR.lz -contest_icon_tough.NCGR.lz -contest_icon_cool.NCGR.lz -type_icon_water.NCGR.lz -move_type_icon.NCER.lz -move_type_icon.NANR.lz -move_class_physical.NCGR.lz -move_class_status.NCGR.lz -move_class_special.NCGR.lz -pl_batt_obj_00000247.NCGR.lz -pl_batt_obj_00000248.NCER.lz -pl_batt_obj_00000249.NANR.lz -battle_subscreen_cursor_corner.NCGR.lz -battle_subscreen_cursor_corner.NCER.lz -battle_subscreen_cursor_corner.NANR.lz -healthbox_safari.NCGR.lz -healthbox_safari.NCER.lz -healthbox_safari.NANR.lz -bg_party_level_up.NCGR.lz -bg_party_level_up.NCER.lz -bg_party_level_up.NANR.lz -player_lucas_back.NCGR.lz -player_dawn_back.NCGR.lz -player_barry_back.NCGR.lz -player_cheryl_back.NCGR.lz -player_riley_back.NCGR.lz -player_marley_back.NCGR.lz -player_buck_back.NCGR.lz -player_mira_back.NCGR.lz -pl_batt_obj_00000267.NCER.lz -pl_batt_obj_00000268.NCER.lz -pl_batt_obj_00000269.NCER.lz -pl_batt_obj_00000270.NCER.lz -pl_batt_obj_00000271.NCER.lz -pl_batt_obj_00000272.NCER.lz -pl_batt_obj_00000273.NCER.lz -pl_batt_obj_00000274.NCER.lz -pl_batt_obj_00000275.NANR.lz -pl_batt_obj_00000276.NANR.lz -pl_batt_obj_00000277.NANR.lz -pl_batt_obj_00000278.NANR.lz -pl_batt_obj_00000279.NANR.lz -pl_batt_obj_00000280.NANR.lz -pl_batt_obj_00000281.NANR.lz -pl_batt_obj_00000282.NANR.lz -poke_ball_throw.NANR.lz -poke_ball_throw.NCER.lz -poke_ball_throw.NCGR.lz -master_ball_throw.NANR.lz -master_ball_throw.NCER.lz -master_ball_throw.NCGR.lz -ultra_ball_throw.NANR.lz -ultra_ball_throw.NCER.lz -ultra_ball_throw.NCGR.lz -great_ball_throw.NANR.lz -great_ball_throw.NCER.lz -great_ball_throw.NCGR.lz -safari_ball_throw.NANR.lz -safari_ball_throw.NCER.lz -safari_ball_throw.NCGR.lz -net_ball_throw.NANR.lz -net_ball_throw.NCER.lz -net_ball_throw.NCGR.lz -dive_ball_throw.NANR.lz -dive_ball_throw.NCER.lz -dive_ball_throw.NCGR.lz -nest_ball_throw.NANR.lz -nest_ball_throw.NCER.lz -nest_ball_throw.NCGR.lz -repeat_ball_throw.NANR.lz -repeat_ball_throw.NCER.lz -repeat_ball_throw.NCGR.lz -timer_ball_throw.NANR.lz -timer_ball_throw.NCER.lz -timer_ball_throw.NCGR.lz -luxury_ball_throw.NANR.lz -luxury_ball_throw.NCER.lz -luxury_ball_throw.NCGR.lz -premier_ball_throw.NANR.lz -premier_ball_throw.NCER.lz -premier_ball_throw.NCGR.lz -quick_ball_throw.NANR.lz -quick_ball_throw.NCER.lz -quick_ball_throw.NCGR.lz -dusk_ball_throw.NANR.lz -dusk_ball_throw.NCER.lz -dusk_ball_throw.NCGR.lz -heal_ball_throw.NANR.lz -heal_ball_throw.NCER.lz -heal_ball_throw.NCGR.lz -cherish_ball_throw.NANR.lz -cherish_ball_throw.NCER.lz -cherish_ball_throw.NCGR.lz -park_ball_throw.NANR.lz -park_ball_throw.NCER.lz -park_ball_throw.NCGR.lz -bait_throw.NANR.lz -bait_throw.NCER.lz -bait_throw.NCGR.lz -mud_throw.NANR.lz -mud_throw.NCER.lz -mud_throw.NCGR.lz -party_gauge.NCGR.lz -party_gauge.NCER.lz +pl_batt_obj_00000000.NCLR +battle_terrain_grass_day.NCLR +battle_terrain_grass_afternoon.NCLR +battle_terrain_grass_night.NCLR +battle_terrain_surf_day.NCLR +battle_terrain_surf_afternoon.NCLR +battle_terrain_surf_night.NCLR +battle_terrain_path_day.NCLR +battle_terrain_path_afternoon.NCLR +battle_terrain_path_night.NCLR +battle_terrain_ice_day.NCLR +battle_terrain_ice_afternoon.NCLR +battle_terrain_ice_night.NCLR +battle_terrain_mountain_day.NCLR +battle_terrain_mountain_afternoon.NCLR +battle_terrain_mountain_night.NCLR +battle_terrain_snow_day.NCLR +battle_terrain_snow_afternoon.NCLR +battle_terrain_snow_night.NCLR +battle_terrain_indoors_day.NCLR +battle_terrain_indoors_afternoon.NCLR +battle_terrain_indoors_night.NCLR +battle_terrain_sand_day.NCLR +battle_terrain_sand_afternoon.NCLR +battle_terrain_sand_night.NCLR +battle_terrain_mud_day.NCLR +battle_terrain_mud_afternoon.NCLR +battle_terrain_mud_night.NCLR +battle_terrain_cave_day.NCLR +battle_terrain_cave_afternoon.NCLR +battle_terrain_cave_night.NCLR +battle_terrain_puddle_day.NCLR +battle_terrain_puddle_afternoon.NCLR +battle_terrain_puddle_night.NCLR +battle_terrain_elite4_aaron_day.NCLR +battle_terrain_elite4_aaron_afternoon.NCLR +battle_terrain_elite4_aaron_night.NCLR +battle_terrain_elite4_bertha_day.NCLR +battle_terrain_elite4_bertha_afternoon.NCLR +battle_terrain_elite4_bertha_night.NCLR +battle_terrain_elite4_flint_day.NCLR +battle_terrain_elite4_flint_afternoon.NCLR +battle_terrain_elite4_flint_night.NCLR +battle_terrain_elite4_lucian_day.NCLR +battle_terrain_elite4_lucian_afternoon.NCLR +battle_terrain_elite4_lucian_night.NCLR +battle_terrain_champion_day.NCLR +battle_terrain_champion_afternoon.NCLR +battle_terrain_champion_night.NCLR +battle_terrain_distortion_world_day.NCLR +battle_terrain_distortion_world_afternoon.NCLR +battle_terrain_distortion_world_night.NCLR +battle_terrain_tower_day.NCLR +battle_terrain_tower_afternoon.NCLR +battle_terrain_tower_night.NCLR +battle_terrain_factory_day.NCLR +battle_terrain_factory_afternoon.NCLR +battle_terrain_factory_night.NCLR +battle_terrain_arcade_day.NCLR +battle_terrain_arcade_afternoon.NCLR +battle_terrain_arcade_night.NCLR +battle_terrain_castle_day.NCLR +battle_terrain_castle_afternoon.NCLR +battle_terrain_castle_night.NCLR +battle_terrain_hall_day.NCLR +battle_terrain_hall_afternoon.NCLR +battle_terrain_hall_night.NCLR +battle_terrain_giratina_day.NCLR +battle_terrain_giratina_afternoon.NCLR +battle_terrain_giratina_night.NCLR +pl_batt_obj_00000070.NCLR +healthbox_normal.NCLR +pl_batt_obj_00000072.NCLR +pl_batt_obj_00000073.NCLR +icon_palettes.NCLR +pl_batt_obj_00000075.NCLR +pl_batt_obj_00000076.NCGR +pl_batt_obj_00000077.NCER +pl_batt_obj_00000078.NANR +pl_batt_obj_00000079.NCLR +battle_subscreen_cursor_corner.NCLR +healthbox_safari.NCLR +bg_party_level_up.NCLR +player_lucas_back.NCLR +player_dawn_back.NCLR +player_barry_back.NCLR +player_cheryl_back.NCLR +player_riley_back.NCLR +player_marley_back.NCLR +player_buck_back.NCLR +player_mira_back.NCLR +poke_ball_throw.NCLR +master_ball_throw.NCLR +ultra_ball_throw.NCLR +great_ball_throw.NCLR +safari_ball_throw.NCLR +net_ball_throw.NCLR +dive_ball_throw.NCLR +nest_ball_throw.NCLR +repeat_ball_throw.NCLR +timer_ball_throw.NCLR +luxury_ball_throw.NCLR +premier_ball_throw.NCLR +quick_ball_throw.NCLR +dusk_ball_throw.NCLR +heal_ball_throw.NCLR +cherish_ball_throw.NCLR +park_ball_throw.NCLR +bait_throw.NCLR +mud_throw.NCLR +party_gauge.NCLR +pl_batt_obj_00000111.NCLR +pl_batt_obj_00000112.NCGR +pl_batt_obj_00000113.NCER +pl_batt_obj_00000114.NANR +pl_batt_obj_00000115.NANR.lz +pl_batt_obj_00000116.NCER.lz +pl_batt_obj_00000117.NCGR.lz +pl_batt_obj_00000118.NANR.lz +pl_batt_obj_00000119.NCER.lz +pl_batt_obj_00000120.NCGR.lz +pl_batt_obj_00000121.NCGR.lz +pl_batt_obj_00000122.NCER.lz +pl_batt_obj_00000123.NANR.lz +pl_batt_obj_00000124.NCGR.lz +pl_batt_obj_00000125.NCER.lz +pl_batt_obj_00000126.NANR.lz +battle_terrain_grass_player.NCGR.lz +battle_terrain_player.NCER.lz +battle_terrain_player.NANR.lz +battle_terrain_grass_opponent.NCGR.lz +battle_terrain_opponent.NCER.lz +battle_terrain_opponent.NANR.lz +battle_terrain_surf_player.NCGR.lz +battle_terrain_surf_opponent.NCGR.lz +battle_terrain_path_player.NCGR.lz +battle_terrain_path_opponent.NCGR.lz +battle_terrain_ice_player.NCGR.lz +battle_terrain_ice_opponent.NCGR.lz +battle_terrain_mountain_player.NCGR.lz +battle_terrain_mountain_opponent.NCGR.lz +battle_terrain_snow_player.NCGR.lz +battle_terrain_snow_opponent.NCGR.lz +battle_terrain_indoors_player.NCGR.lz +battle_terrain_indoors_opponent.NCGR.lz +battle_terrain_sand_player.NCGR.lz +battle_terrain_sand_opponent.NCGR.lz +battle_terrain_mud_player.NCGR.lz +battle_terrain_mud_opponent.NCGR.lz +battle_terrain_cave_player.NCGR.lz +battle_terrain_cave_opponent.NCGR.lz +battle_terrain_puddle_player.NCGR.lz +battle_terrain_puddle_opponent.NCGR.lz +battle_terrain_elite4_aaron_player.NCGR.lz +battle_terrain_elite4_aaron_opponent.NCGR.lz +battle_terrain_elite4_bertha_player.NCGR.lz +battle_terrain_elite4_bertha_opponent.NCGR.lz +battle_terrain_elite4_flint_player.NCGR.lz +battle_terrain_elite4_flint_opponent.NCGR.lz +battle_terrain_elite4_lucian_player.NCGR.lz +battle_terrain_elite4_lucian_opponent.NCGR.lz +battle_terrain_champion_player.NCGR.lz +battle_terrain_champion_opponent.NCGR.lz +battle_terrain_distortion_world_player.NCGR.lz +battle_terrain_distortion_world_opponent.NCGR.lz +battle_terrain_tower_player.NCGR.lz +battle_terrain_tower_opponent.NCGR.lz +battle_terrain_factory_player.NCGR.lz +battle_terrain_factory_opponent.NCGR.lz +battle_terrain_arcade_player.NCGR.lz +battle_terrain_arcade_opponent.NCGR.lz +battle_terrain_castle_player.NCGR.lz +battle_terrain_castle_opponent.NCGR.lz +battle_terrain_hall_player.NCGR.lz +battle_terrain_hall_opponent.NCGR.lz +battle_terrain_giratina_player.NCGR.lz +battle_terrain_giratina_opponent.NCGR.lz +pl_batt_obj_00000177.NANR.lz +pl_batt_obj_00000178.NCER.lz +pl_batt_obj_00000179.NCGR.lz +pl_batt_obj_00000180.NANR.lz +pl_batt_obj_00000181.NCER.lz +pl_batt_obj_00000182.NCGR.lz +pl_batt_obj_00000183.NANR.lz +pl_batt_obj_00000184.NCER.lz +pl_batt_obj_00000185.NCGR.lz +healthbox_singles_opponent.NANR.lz +healthbox_singles_opponent.NCER.lz +healthbox_singles_opponent.NCGR.lz +healthbox_singles_player.NANR.lz +healthbox_singles_player.NCER.lz +healthbox_singles_player.NCGR.lz +healthbox_doubles_opponent_1.NANR.lz +healthbox_doubles_opponent_1.NCER.lz +healthbox_doubles_opponent_1.NCGR.lz +healthbox_doubles_opponent_2.NANR.lz +healthbox_doubles_opponent_2.NCER.lz +healthbox_doubles_opponent_2.NCGR.lz +healthbox_doubles_player_1.NANR.lz +healthbox_doubles_player_1.NCER.lz +healthbox_doubles_player_1.NCGR.lz +healthbox_doubles_player_2.NANR.lz +healthbox_doubles_player_2.NCER.lz +healthbox_doubles_player_2.NCGR.lz +ball_status_indicator_opponent.NCER.lz +ball_status_indicator_opponent.NCGR.lz +ball_status_indicator_opponent.NANR.lz +ball_status_indicator_player.NCER.lz +ball_status_indicator_player.NCGR.lz +ball_status_indicator_player.NANR.lz +pl_batt_obj_00000210.NCER.lz +pl_batt_obj_00000211.NCGR.lz +pl_batt_obj_00000212.NANR.lz +pl_batt_obj_00000213.NCER.lz +pl_batt_obj_00000214.NCGR.lz +pl_batt_obj_00000215.NANR.lz +pl_batt_obj_00000216.NCER.lz +pl_batt_obj_00000217.NCGR.lz +pl_batt_obj_00000218.NANR.lz +contest_icon_beauty.NCGR.lz +contest_icon_cute.NCGR.lz +type_icon_dragon.NCGR.lz +type_icon_electric.NCGR.lz +type_icon_psychic.NCGR.lz +type_icon_dark.NCGR.lz +type_icon_fighting.NCGR.lz +type_icon_fire.NCGR.lz +type_icon_flying.NCGR.lz +type_icon_ghost.NCGR.lz +type_icon_ground.NCGR.lz +type_icon_ice.NCGR.lz +type_icon_bug.NCGR.lz +contest_icon_smart.NCGR.lz +type_icon_grass.NCGR.lz +type_icon_normal.NCGR.lz +type_icon_poison.NCGR.lz +type_icon_mystery.NCGR.lz +type_icon_rock.NCGR.lz +type_icon_steel.NCGR.lz +contest_icon_tough.NCGR.lz +contest_icon_cool.NCGR.lz +type_icon_water.NCGR.lz +move_type_icon.NCER.lz +move_type_icon.NANR.lz +move_class_physical.NCGR.lz +move_class_status.NCGR.lz +move_class_special.NCGR.lz +pl_batt_obj_00000247.NCGR.lz +pl_batt_obj_00000248.NCER.lz +pl_batt_obj_00000249.NANR.lz +battle_subscreen_cursor_corner.NCGR.lz +battle_subscreen_cursor_corner.NCER.lz +battle_subscreen_cursor_corner.NANR.lz +healthbox_safari.NCGR.lz +healthbox_safari.NCER.lz +healthbox_safari.NANR.lz +bg_party_level_up.NCGR.lz +bg_party_level_up.NCER.lz +bg_party_level_up.NANR.lz +player_lucas_back.NCGR.lz +player_dawn_back.NCGR.lz +player_barry_back.NCGR.lz +player_cheryl_back.NCGR.lz +player_riley_back.NCGR.lz +player_marley_back.NCGR.lz +player_buck_back.NCGR.lz +player_mira_back.NCGR.lz +pl_batt_obj_00000267.NCER.lz +pl_batt_obj_00000268.NCER.lz +pl_batt_obj_00000269.NCER.lz +pl_batt_obj_00000270.NCER.lz +pl_batt_obj_00000271.NCER.lz +pl_batt_obj_00000272.NCER.lz +pl_batt_obj_00000273.NCER.lz +pl_batt_obj_00000274.NCER.lz +pl_batt_obj_00000275.NANR.lz +pl_batt_obj_00000276.NANR.lz +pl_batt_obj_00000277.NANR.lz +pl_batt_obj_00000278.NANR.lz +pl_batt_obj_00000279.NANR.lz +pl_batt_obj_00000280.NANR.lz +pl_batt_obj_00000281.NANR.lz +pl_batt_obj_00000282.NANR.lz +poke_ball_throw.NANR.lz +poke_ball_throw.NCER.lz +poke_ball_throw.NCGR.lz +master_ball_throw.NANR.lz +master_ball_throw.NCER.lz +master_ball_throw.NCGR.lz +ultra_ball_throw.NANR.lz +ultra_ball_throw.NCER.lz +ultra_ball_throw.NCGR.lz +great_ball_throw.NANR.lz +great_ball_throw.NCER.lz +great_ball_throw.NCGR.lz +safari_ball_throw.NANR.lz +safari_ball_throw.NCER.lz +safari_ball_throw.NCGR.lz +net_ball_throw.NANR.lz +net_ball_throw.NCER.lz +net_ball_throw.NCGR.lz +dive_ball_throw.NANR.lz +dive_ball_throw.NCER.lz +dive_ball_throw.NCGR.lz +nest_ball_throw.NANR.lz +nest_ball_throw.NCER.lz +nest_ball_throw.NCGR.lz +repeat_ball_throw.NANR.lz +repeat_ball_throw.NCER.lz +repeat_ball_throw.NCGR.lz +timer_ball_throw.NANR.lz +timer_ball_throw.NCER.lz +timer_ball_throw.NCGR.lz +luxury_ball_throw.NANR.lz +luxury_ball_throw.NCER.lz +luxury_ball_throw.NCGR.lz +premier_ball_throw.NANR.lz +premier_ball_throw.NCER.lz +premier_ball_throw.NCGR.lz +quick_ball_throw.NANR.lz +quick_ball_throw.NCER.lz +quick_ball_throw.NCGR.lz +dusk_ball_throw.NANR.lz +dusk_ball_throw.NCER.lz +dusk_ball_throw.NCGR.lz +heal_ball_throw.NANR.lz +heal_ball_throw.NCER.lz +heal_ball_throw.NCGR.lz +cherish_ball_throw.NANR.lz +cherish_ball_throw.NCER.lz +cherish_ball_throw.NCGR.lz +park_ball_throw.NANR.lz +park_ball_throw.NCER.lz +park_ball_throw.NCGR.lz +bait_throw.NANR.lz +bait_throw.NCER.lz +bait_throw.NCGR.lz +mud_throw.NANR.lz +mud_throw.NCER.lz +mud_throw.NCGR.lz +party_gauge.NCGR.lz +party_gauge.NCER.lz party_gauge.NANR.lz \ No newline at end of file diff --git a/res/battle/graphic/pl_batt_obj/sprites/bait_throw.png b/res/battle/graphic/objects/sprites/bait_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/bait_throw.png rename to res/battle/graphic/objects/sprites/bait_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/ball_status_indicator_opponent.png b/res/battle/graphic/objects/sprites/ball_status_indicator_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/ball_status_indicator_opponent.png rename to res/battle/graphic/objects/sprites/ball_status_indicator_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/ball_status_indicator_player.png b/res/battle/graphic/objects/sprites/ball_status_indicator_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/ball_status_indicator_player.png rename to res/battle/graphic/objects/sprites/ball_status_indicator_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_subscreen_cursor_corner.png b/res/battle/graphic/objects/sprites/battle_subscreen_cursor_corner.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_subscreen_cursor_corner.png rename to res/battle/graphic/objects/sprites/battle_subscreen_cursor_corner.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_arcade_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_arcade_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_arcade_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_arcade_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_arcade_player.png b/res/battle/graphic/objects/sprites/battle_terrain_arcade_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_arcade_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_arcade_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_castle_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_castle_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_castle_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_castle_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_castle_player.png b/res/battle/graphic/objects/sprites/battle_terrain_castle_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_castle_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_castle_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_cave_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_cave_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_cave_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_cave_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_cave_player.png b/res/battle/graphic/objects/sprites/battle_terrain_cave_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_cave_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_cave_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_champion_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_champion_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_champion_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_champion_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_champion_player.png b/res/battle/graphic/objects/sprites/battle_terrain_champion_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_champion_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_champion_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_distortion_world_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_distortion_world_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_player.png b/res/battle/graphic/objects/sprites/battle_terrain_distortion_world_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_distortion_world_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_distortion_world_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_aaron_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_elite4_aaron_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_aaron_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_elite4_aaron_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_aaron_player.png b/res/battle/graphic/objects/sprites/battle_terrain_elite4_aaron_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_aaron_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_elite4_aaron_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_bertha_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_elite4_bertha_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_bertha_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_elite4_bertha_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_bertha_player.png b/res/battle/graphic/objects/sprites/battle_terrain_elite4_bertha_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_bertha_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_elite4_bertha_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_flint_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_elite4_flint_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_flint_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_elite4_flint_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_flint_player.png b/res/battle/graphic/objects/sprites/battle_terrain_elite4_flint_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_flint_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_elite4_flint_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_lucian_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_elite4_lucian_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_lucian_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_elite4_lucian_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_lucian_player.png b/res/battle/graphic/objects/sprites/battle_terrain_elite4_lucian_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_elite4_lucian_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_elite4_lucian_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_factory_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_factory_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_factory_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_factory_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_factory_player.png b/res/battle/graphic/objects/sprites/battle_terrain_factory_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_factory_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_factory_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_giratina_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_giratina_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_giratina_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_giratina_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_giratina_player.png b/res/battle/graphic/objects/sprites/battle_terrain_giratina_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_giratina_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_giratina_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_grass_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_grass_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_grass_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_grass_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_grass_player.png b/res/battle/graphic/objects/sprites/battle_terrain_grass_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_grass_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_grass_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_hall_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_hall_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_hall_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_hall_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_hall_player.png b/res/battle/graphic/objects/sprites/battle_terrain_hall_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_hall_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_hall_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_ice_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_ice_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_ice_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_ice_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_ice_player.png b/res/battle/graphic/objects/sprites/battle_terrain_ice_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_ice_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_ice_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_indoors_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_indoors_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_indoors_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_indoors_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_indoors_player.png b/res/battle/graphic/objects/sprites/battle_terrain_indoors_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_indoors_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_indoors_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_mountain_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_mountain_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_player.png b/res/battle/graphic/objects/sprites/battle_terrain_mountain_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mountain_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_mountain_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_mud_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_mud_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_player.png b/res/battle/graphic/objects/sprites/battle_terrain_mud_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_mud_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_mud_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_path_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_path_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_player.png b/res/battle/graphic/objects/sprites/battle_terrain_path_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_path_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_path_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_puddle_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_puddle_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_puddle_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_puddle_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_puddle_player.png b/res/battle/graphic/objects/sprites/battle_terrain_puddle_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_puddle_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_puddle_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_sand_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_sand_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_player.png b/res/battle/graphic/objects/sprites/battle_terrain_sand_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_sand_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_sand_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_snow_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_snow_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_player.png b/res/battle/graphic/objects/sprites/battle_terrain_snow_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_snow_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_snow_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_surf_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_surf_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_player.png b/res/battle/graphic/objects/sprites/battle_terrain_surf_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_surf_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_surf_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_tower_opponent.png b/res/battle/graphic/objects/sprites/battle_terrain_tower_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_tower_opponent.png rename to res/battle/graphic/objects/sprites/battle_terrain_tower_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/battle_terrain_tower_player.png b/res/battle/graphic/objects/sprites/battle_terrain_tower_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/battle_terrain_tower_player.png rename to res/battle/graphic/objects/sprites/battle_terrain_tower_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/bg_party_level_up.png b/res/battle/graphic/objects/sprites/bg_party_level_up.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/bg_party_level_up.png rename to res/battle/graphic/objects/sprites/bg_party_level_up.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/cherish_ball_throw.png b/res/battle/graphic/objects/sprites/cherish_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/cherish_ball_throw.png rename to res/battle/graphic/objects/sprites/cherish_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/contest_icon_beauty.png b/res/battle/graphic/objects/sprites/contest_icon_beauty.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/contest_icon_beauty.png rename to res/battle/graphic/objects/sprites/contest_icon_beauty.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/contest_icon_cool.png b/res/battle/graphic/objects/sprites/contest_icon_cool.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/contest_icon_cool.png rename to res/battle/graphic/objects/sprites/contest_icon_cool.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/contest_icon_cute.png b/res/battle/graphic/objects/sprites/contest_icon_cute.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/contest_icon_cute.png rename to res/battle/graphic/objects/sprites/contest_icon_cute.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/contest_icon_smart.png b/res/battle/graphic/objects/sprites/contest_icon_smart.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/contest_icon_smart.png rename to res/battle/graphic/objects/sprites/contest_icon_smart.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/contest_icon_tough.png b/res/battle/graphic/objects/sprites/contest_icon_tough.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/contest_icon_tough.png rename to res/battle/graphic/objects/sprites/contest_icon_tough.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/dive_ball_throw.png b/res/battle/graphic/objects/sprites/dive_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/dive_ball_throw.png rename to res/battle/graphic/objects/sprites/dive_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/dusk_ball_throw.png b/res/battle/graphic/objects/sprites/dusk_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/dusk_ball_throw.png rename to res/battle/graphic/objects/sprites/dusk_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/great_ball_throw.png b/res/battle/graphic/objects/sprites/great_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/great_ball_throw.png rename to res/battle/graphic/objects/sprites/great_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/heal_ball_throw.png b/res/battle/graphic/objects/sprites/heal_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/heal_ball_throw.png rename to res/battle/graphic/objects/sprites/heal_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_opponent_1.png b/res/battle/graphic/objects/sprites/healthbox_doubles_opponent_1.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_opponent_1.png rename to res/battle/graphic/objects/sprites/healthbox_doubles_opponent_1.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_opponent_2.png b/res/battle/graphic/objects/sprites/healthbox_doubles_opponent_2.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_opponent_2.png rename to res/battle/graphic/objects/sprites/healthbox_doubles_opponent_2.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_player_1.png b/res/battle/graphic/objects/sprites/healthbox_doubles_player_1.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_player_1.png rename to res/battle/graphic/objects/sprites/healthbox_doubles_player_1.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_player_2.png b/res/battle/graphic/objects/sprites/healthbox_doubles_player_2.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbox_doubles_player_2.png rename to res/battle/graphic/objects/sprites/healthbox_doubles_player_2.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbox_safari.png b/res/battle/graphic/objects/sprites/healthbox_safari.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbox_safari.png rename to res/battle/graphic/objects/sprites/healthbox_safari.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbox_singles_opponent.png b/res/battle/graphic/objects/sprites/healthbox_singles_opponent.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbox_singles_opponent.png rename to res/battle/graphic/objects/sprites/healthbox_singles_opponent.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/healthbox_singles_player.png b/res/battle/graphic/objects/sprites/healthbox_singles_player.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/healthbox_singles_player.png rename to res/battle/graphic/objects/sprites/healthbox_singles_player.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/luxury_ball_throw.png b/res/battle/graphic/objects/sprites/luxury_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/luxury_ball_throw.png rename to res/battle/graphic/objects/sprites/luxury_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/master_ball_throw.png b/res/battle/graphic/objects/sprites/master_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/master_ball_throw.png rename to res/battle/graphic/objects/sprites/master_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/meson.build b/res/battle/graphic/objects/sprites/meson.build similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/meson.build rename to res/battle/graphic/objects/sprites/meson.build diff --git a/res/battle/graphic/pl_batt_obj/sprites/move_class_physical.png b/res/battle/graphic/objects/sprites/move_class_physical.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/move_class_physical.png rename to res/battle/graphic/objects/sprites/move_class_physical.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/move_class_special.png b/res/battle/graphic/objects/sprites/move_class_special.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/move_class_special.png rename to res/battle/graphic/objects/sprites/move_class_special.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/move_class_status.png b/res/battle/graphic/objects/sprites/move_class_status.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/move_class_status.png rename to res/battle/graphic/objects/sprites/move_class_status.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/mud_throw.png b/res/battle/graphic/objects/sprites/mud_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/mud_throw.png rename to res/battle/graphic/objects/sprites/mud_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/nest_ball_throw.png b/res/battle/graphic/objects/sprites/nest_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/nest_ball_throw.png rename to res/battle/graphic/objects/sprites/nest_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/net_ball_throw.png b/res/battle/graphic/objects/sprites/net_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/net_ball_throw.png rename to res/battle/graphic/objects/sprites/net_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/park_ball_throw.png b/res/battle/graphic/objects/sprites/park_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/park_ball_throw.png rename to res/battle/graphic/objects/sprites/park_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/party_gauge.png b/res/battle/graphic/objects/sprites/party_gauge.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/party_gauge.png rename to res/battle/graphic/objects/sprites/party_gauge.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000076.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000076.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000076.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000076.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000112.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000112.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000112.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000112.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000117.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000117.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000117.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000117.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000120.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000120.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000120.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000120.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000121.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000121.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000121.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000121.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000124.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000124.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000124.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000124.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000179.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000179.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000179.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000179.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000182.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000182.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000182.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000182.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000185.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000185.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000185.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000185.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000211.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000211.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000211.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000211.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000214.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000214.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000214.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000214.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000217.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000217.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000217.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000217.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000247.png b/res/battle/graphic/objects/sprites/pl_batt_obj_00000247.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/pl_batt_obj_00000247.png rename to res/battle/graphic/objects/sprites/pl_batt_obj_00000247.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_barry_back.png b/res/battle/graphic/objects/sprites/player_barry_back.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/player_barry_back.png rename to res/battle/graphic/objects/sprites/player_barry_back.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_buck_back.png b/res/battle/graphic/objects/sprites/player_buck_back.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/player_buck_back.png rename to res/battle/graphic/objects/sprites/player_buck_back.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_cheryl_back.png b/res/battle/graphic/objects/sprites/player_cheryl_back.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/player_cheryl_back.png rename to res/battle/graphic/objects/sprites/player_cheryl_back.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_dawn_back.png b/res/battle/graphic/objects/sprites/player_dawn_back.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/player_dawn_back.png rename to res/battle/graphic/objects/sprites/player_dawn_back.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_lucas_back.png b/res/battle/graphic/objects/sprites/player_lucas_back.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/player_lucas_back.png rename to res/battle/graphic/objects/sprites/player_lucas_back.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_marley_back.png b/res/battle/graphic/objects/sprites/player_marley_back.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/player_marley_back.png rename to res/battle/graphic/objects/sprites/player_marley_back.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_mira_back.png b/res/battle/graphic/objects/sprites/player_mira_back.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/player_mira_back.png rename to res/battle/graphic/objects/sprites/player_mira_back.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/player_riley_back.png b/res/battle/graphic/objects/sprites/player_riley_back.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/player_riley_back.png rename to res/battle/graphic/objects/sprites/player_riley_back.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/poke_ball_throw.png b/res/battle/graphic/objects/sprites/poke_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/poke_ball_throw.png rename to res/battle/graphic/objects/sprites/poke_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/premier_ball_throw.png b/res/battle/graphic/objects/sprites/premier_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/premier_ball_throw.png rename to res/battle/graphic/objects/sprites/premier_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/quick_ball_throw.png b/res/battle/graphic/objects/sprites/quick_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/quick_ball_throw.png rename to res/battle/graphic/objects/sprites/quick_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/repeat_ball_throw.png b/res/battle/graphic/objects/sprites/repeat_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/repeat_ball_throw.png rename to res/battle/graphic/objects/sprites/repeat_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/safari_ball_throw.png b/res/battle/graphic/objects/sprites/safari_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/safari_ball_throw.png rename to res/battle/graphic/objects/sprites/safari_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/timer_ball_throw.png b/res/battle/graphic/objects/sprites/timer_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/timer_ball_throw.png rename to res/battle/graphic/objects/sprites/timer_ball_throw.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_bug.png b/res/battle/graphic/objects/sprites/type_icon_bug.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_bug.png rename to res/battle/graphic/objects/sprites/type_icon_bug.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_dark.png b/res/battle/graphic/objects/sprites/type_icon_dark.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_dark.png rename to res/battle/graphic/objects/sprites/type_icon_dark.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_dragon.png b/res/battle/graphic/objects/sprites/type_icon_dragon.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_dragon.png rename to res/battle/graphic/objects/sprites/type_icon_dragon.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_electric.png b/res/battle/graphic/objects/sprites/type_icon_electric.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_electric.png rename to res/battle/graphic/objects/sprites/type_icon_electric.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_fighting.png b/res/battle/graphic/objects/sprites/type_icon_fighting.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_fighting.png rename to res/battle/graphic/objects/sprites/type_icon_fighting.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_fire.png b/res/battle/graphic/objects/sprites/type_icon_fire.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_fire.png rename to res/battle/graphic/objects/sprites/type_icon_fire.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_flying.png b/res/battle/graphic/objects/sprites/type_icon_flying.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_flying.png rename to res/battle/graphic/objects/sprites/type_icon_flying.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_ghost.png b/res/battle/graphic/objects/sprites/type_icon_ghost.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_ghost.png rename to res/battle/graphic/objects/sprites/type_icon_ghost.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_grass.png b/res/battle/graphic/objects/sprites/type_icon_grass.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_grass.png rename to res/battle/graphic/objects/sprites/type_icon_grass.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_ground.png b/res/battle/graphic/objects/sprites/type_icon_ground.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_ground.png rename to res/battle/graphic/objects/sprites/type_icon_ground.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_ice.png b/res/battle/graphic/objects/sprites/type_icon_ice.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_ice.png rename to res/battle/graphic/objects/sprites/type_icon_ice.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_mystery.png b/res/battle/graphic/objects/sprites/type_icon_mystery.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_mystery.png rename to res/battle/graphic/objects/sprites/type_icon_mystery.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_normal.png b/res/battle/graphic/objects/sprites/type_icon_normal.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_normal.png rename to res/battle/graphic/objects/sprites/type_icon_normal.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_poison.png b/res/battle/graphic/objects/sprites/type_icon_poison.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_poison.png rename to res/battle/graphic/objects/sprites/type_icon_poison.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_psychic.png b/res/battle/graphic/objects/sprites/type_icon_psychic.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_psychic.png rename to res/battle/graphic/objects/sprites/type_icon_psychic.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_rock.png b/res/battle/graphic/objects/sprites/type_icon_rock.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_rock.png rename to res/battle/graphic/objects/sprites/type_icon_rock.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_steel.png b/res/battle/graphic/objects/sprites/type_icon_steel.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_steel.png rename to res/battle/graphic/objects/sprites/type_icon_steel.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/type_icon_water.png b/res/battle/graphic/objects/sprites/type_icon_water.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/type_icon_water.png rename to res/battle/graphic/objects/sprites/type_icon_water.png diff --git a/res/battle/graphic/pl_batt_obj/sprites/ultra_ball_throw.png b/res/battle/graphic/objects/sprites/ultra_ball_throw.png similarity index 100% rename from res/battle/graphic/pl_batt_obj/sprites/ultra_ball_throw.png rename to res/battle/graphic/objects/sprites/ultra_ball_throw.png diff --git a/src/applications/pokemon_summary_screen/sprite.c b/src/applications/pokemon_summary_screen/sprite.c index e3a38cb586..b2f716dcaa 100644 --- a/src/applications/pokemon_summary_screen/sprite.c +++ b/src/applications/pokemon_summary_screen/sprite.c @@ -464,7 +464,7 @@ void PokemonSummaryScreen_UpdateMoveCategoryIcon(PokemonSummaryScreen *summarySc { u32 category = MoveTable_LoadParam(move, MOVEATTRIBUTE_CLASS); - sub_0200D948(summaryScreen->renderer, summaryScreen->gfxHandler, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(category), 1, 10); + sub_0200D948(summaryScreen->renderer, summaryScreen->gfxHandler, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_GetMoveClassTiles(category), 1, 10); sub_0200D414(summaryScreen->unk_41C[18], BattleIcon_GetMoveClassPaletteIndex(category) + 3); } diff --git a/src/battle/battle_icon.c b/src/battle/battle_icon.c index a8e302871f..432e07cfbc 100644 --- a/src/battle/battle_icon.c +++ b/src/battle/battle_icon.c @@ -11,7 +11,7 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "palette.h" #include "unk_0200C6E4.h" @@ -94,9 +94,9 @@ __attribute__((aligned(4))) static const u32 sMoveClassIconTiles[] = { * Maps move classes (Physical, Special, Status) to the corresponding palette index in NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ__TYPE_PALETTE. */ __attribute__((aligned(4))) static const u8 sMoveClassIconPaletteIndex[] = { - [CLASS_PHYSICAL] = 0x0, - [CLASS_SPECIAL] = 0x1, - [CLASS_STATUS] = 0x0 + [CLASS_PHYSICAL] = 0, + [CLASS_SPECIAL] = 1, + [CLASS_STATUS] = 0 }; /* @@ -118,14 +118,22 @@ u32 BattleIcon_GetMoveTypePaletteFileIndex(void) return icon_palettes_NCLR; } -u32 sub_0207C924(void) +/* + * Returns the NARC member within pl_batt_obj containing cells for battle icons. + * See also BattleIcon_GetNARCIndex. + */ +u32 BattleIcon_GetMoveTypeCellsFileIndex(void) { - return 242; + return move_type_icon_NCER_lz; } -u32 sub_0207C928(void) +/* + * Returns the NARC member within pl_batt_obj containing animations for battle icons. + * See also BattleIcon_GetNARCIndex. + */ +u32 BattleIcon_GetMoveTypeAnimFileIndex(void) { - return 243; + return move_type_icon_NANR_lz; } /* @@ -146,58 +154,54 @@ u32 BattleIcon_GetNARCIndex(void) return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } -void BattleIcon_MakeTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int typeIndex, u32 param4) +void BattleIcon_MakeTypeSpriteTiles(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NNS_G2D_VRAM_TYPE vramType, int typeIndex, u32 resourceID) { - sub_0200CBDC(param0, param1, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(typeIndex), 1, param2, param4); + sub_0200CBDC(renderer, gfxHandler, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(typeIndex), TRUE, vramType, resourceID); } -void BattleIcon_MakeTypeSpritePalette(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) +void BattleIcon_MakeTypeSpritePalette(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NNS_G2D_VRAM_TYPE vramType, u32 resourceID) { - sub_0200CC9C(param0, param1, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypePaletteFileIndex(), 0, 3, param2, param3); + sub_0200CC9C(renderer, gfxHandler, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypePaletteFileIndex(), FALSE, 3, vramType, resourceID); } -void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5) +void BattleIcon_LoadTypeSpritePalette(PaletteData *palette, enum PaletteBufferID bufferID, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NNS_G2D_VRAM_TYPE vramType, u32 resourceID) { - sub_0200CD7C(param0, param1, param2, param3, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypePaletteFileIndex(), 0, 3, param4, param5); + sub_0200CD7C(palette, bufferID, renderer, gfxHandler, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypePaletteFileIndex(), FALSE, 3, vramType, resourceID); } -void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3) +void BattleIcon_MakeTypeSpriteCellsAnim(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, u32 cellResourceID, u32 animResourceID) { - sub_0200CE0C(param0, param1, BattleIcon_GetNARCIndex(), sub_0207C924(), 1, param2); - sub_0200CE3C(param0, param1, BattleIcon_GetNARCIndex(), sub_0207C928(), 1, param3); + sub_0200CE0C(renderer, gfxHandler, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeCellsFileIndex(), TRUE, cellResourceID); + sub_0200CE3C(renderer, gfxHandler, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeAnimFileIndex(), TRUE, animResourceID); } -void sub_0207CA34(SpriteGfxHandler *param0, u32 param1) +void BattleIcon_UnloadTypeSpriteTiles(SpriteGfxHandler *gfxHandler, u32 resourceID) { - SpriteGfxHandler_UnloadCharObjById(param0, param1); + SpriteGfxHandler_UnloadCharObjById(gfxHandler, resourceID); } -void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1) +void BattleIcon_UnloadTypeSpritePalette(SpriteGfxHandler *gfxHandler, u32 resourceID) { - SpriteGfxHandler_UnloadPlttObjById(param0, param1); + SpriteGfxHandler_UnloadPlttObjById(gfxHandler, resourceID); } -void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2) +void BattleIcon_UnloadTypeSpriteCellsAnim(SpriteGfxHandler *gfxHandler, u32 cellResourceID, u32 animResourceID) { - SpriteGfxHandler_UnloadCellObjById(param0, param1); - SpriteGfxHandler_UnloadAnimObjById(param0, param2); + SpriteGfxHandler_UnloadCellObjById(gfxHandler, cellResourceID); + SpriteGfxHandler_UnloadAnimObjById(gfxHandler, animResourceID); } -CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3) +CellActorData *BattleIcon_CreateCellActorForTypeSprite(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, int typeIndex, const SpriteTemplate *template) { - CellActorData *v0; - SpriteTemplate v1; - - v1 = *param3; - v1.plttIdx = BattleIcon_GetMoveTypePaletteIndex(param2); - v0 = SpriteActor_LoadResources(param0, param1, &v1); + SpriteTemplate overrideTemplate = *template; + overrideTemplate.plttIdx = BattleIcon_GetMoveTypePaletteIndex(typeIndex); - return v0; + return SpriteActor_LoadResources(renderer, gfxHandler, &overrideTemplate); } -void sub_0207CA88(CellActorData *param0) +void BattleIcon_DeleteMoveTypeCellActorData(CellActorData *data) { - sub_0200D0F4(param0); + sub_0200D0F4(data); } /* @@ -224,22 +228,22 @@ u8 BattleIcon_GetMoveClassPaletteIndex(int moveClassIndex) * Returns the index of the NARC for pl_batt_obj. * (This is identical to BattleIcon_GetNARCIndex). */ -u32 BattleIcon_GetMoveClassPalettteFileIndex(void) +u32 BattleIcon_GetMoveClassNARCIndex(void) { return NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ; } -void BattleIcon_MakeMoveTypeSpriteTiles(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int moveTypeIndex, u32 param4) +void BattleIcon_MakeMoveClassSpriteTiles(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NNS_G2D_VRAM_TYPE vramType, int moveTypeIndex, u32 resourceID) { - sub_0200CBDC(param0, param1, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(moveTypeIndex), 1, param2, param4); + sub_0200CBDC(renderer, gfxHandler, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_GetMoveClassTiles(moveTypeIndex), TRUE, vramType, resourceID); } -void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1) +void BattleIcon_UnloadMoveClassSpriteTiles(SpriteGfxHandler *gfxHandler, u32 resourceID) { - SpriteGfxHandler_UnloadCharObjById(param0, param1); + SpriteGfxHandler_UnloadCharObjById(gfxHandler, resourceID); } -void sub_0207CB00(CellActorData *param0) +void BattleIcon_DeleteMoveClassCellActorData(CellActorData *data) { - sub_0200D0F4(param0); + sub_0200D0F4(data); } diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 5ce1b01938..d28a93aeec 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -38,7 +38,7 @@ #include "battle/battle_mon.h" #include "battle/btlcmd.h" #include "battle/common.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "battle/ov16_0223B140.h" #include "battle/ov16_0223DF00.h" #include "battle/ov16_02268520.h" diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 4dd785beae..f09f37096d 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -11,7 +11,7 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_022674C4.h" #include "gmm/message_bank_battle_strings.h" diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index ed77617e1c..f4a8c71904 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -11,7 +11,7 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_02268520.h" diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index c015b1a173..3b9e42a25e 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -17,7 +17,7 @@ #include "battle/battle_display.h" #include "battle/battle_icon.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "battle/ov16_0223DF00.h" #include "battle/ov16_0226DB7C.h" #include "battle/ov16_0226DE44.h" @@ -1225,8 +1225,8 @@ void ov16_02268A88(UnkStruct_ov16_02268A14 *param0) Graphics_LoadTilesToBgLayer(7, v5, v0, 4, 0, 0x6000, 1, 5); } - sub_0207C9EC(v1, v2, 20017, 20017); - sub_0207C9B0(BattleSystem_PaletteSys(param0->unk_00), 3, v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 20020); + BattleIcon_MakeTypeSpriteCellsAnim(v1, v2, 20017, 20017); + BattleIcon_LoadTypeSpritePalette(BattleSystem_PaletteSys(param0->unk_00), 3, v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 20020); for (v4 = 0; v4 < 4; v4++) { BattleIcon_MakeTypeSpriteTiles(v1, v2, NNS_G2D_VRAM_TYPE_2DSUB, 0, 20025 + v4); @@ -1248,11 +1248,11 @@ void ov16_02268B8C(UnkStruct_ov16_02268A14 *param0) v2 = ov16_0223E018(param0->unk_00); for (v0 = 0; v0 < 4; v0++) { - sub_0207CA34(v2, 20025 + v0); + BattleIcon_UnloadTypeSpriteTiles(v2, 20025 + v0); } - sub_0207CA3C(v2, 20020); - sub_0207CA44(v2, 20017, 20017); + BattleIcon_UnloadTypeSpritePalette(v2, 20020); + BattleIcon_UnloadTypeSpriteCellsAnim(v2, 20017, 20017); if (BattleSystem_BattleType(param0->unk_00) & 0x400) { ov16_0226DF68(param0->unk_6C4.unk_00); @@ -2880,7 +2880,7 @@ static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0) v3.x = Unk_ov16_022702B4[v0][0]; v3.y = Unk_ov16_022702B4[v0][1]; - param0->unk_5EC[v0] = sub_0207CA58(v1, v2, v5, &v3); + param0->unk_5EC[v0] = BattleIcon_CreateCellActorForTypeSprite(v1, v2, v5, &v3); sub_0200D500(param0->unk_5EC[v0], v3.x, v3.y, ((192 + 80) << FX32_SHIFT)); @@ -2908,7 +2908,7 @@ static void ov16_0226AFF4(UnkStruct_ov16_02268A14 *param0) for (v0 = 0; v0 < 4; v0++) { if (param0->unk_5EC[v0] != NULL) { - sub_0207CA88(param0->unk_5EC[v0]); + BattleIcon_DeleteMoveTypeCellActorData(param0->unk_5EC[v0]); param0->unk_5EC[v0] = NULL; } } @@ -2925,8 +2925,8 @@ static void ov16_0226B028(UnkStruct_ov16_02268A14 *param0) for (v0 = 0; v0 < 4; v0++) { if (param0->unk_5FC[v0] != NULL) { - sub_0207CB00(param0->unk_5FC[v0]); - sub_0207CAF8(v2, 20029 + v0); + BattleIcon_DeleteMoveClassCellActorData(param0->unk_5FC[v0]); + BattleIcon_UnloadMoveClassSpriteTiles(v2, 20029 + v0); param0->unk_5FC[v0] = NULL; } } diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index f1454385be..a9cd7a4fe1 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -8,7 +8,7 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "heap.h" #include "narc.h" diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c index d15c946030..aaa8a89f60 100644 --- a/src/battle/party_gauge.c +++ b/src/battle/party_gauge.c @@ -12,7 +12,7 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "battle/ov16_0223DF00.h" #include "assert.h" diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 8d1d63dc57..0e5e15bf50 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -17,7 +17,7 @@ #include "struct_defs/struct_02099F80.h" #include "applications/pokemon_summary_screen/main.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "overlay010/struct_ov10_0221F800.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index 6800b54632..a6229ffaa6 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -10,7 +10,7 @@ #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "functypes/funcptr_020146F4.h" #include "overlay012/ov12_0221FC20.h" #include "overlay012/ov12_022237EC.h" diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index e4fe46bfb3..758a78a254 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -291,14 +291,14 @@ static void ov13_02224720(UnkStruct_ov13_022213F0 *param0) v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0207C9B0(param0->unk_1E4, 3, v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 45065); - sub_0207C9EC(v0, param0->unk_1FB0, 45065, 45065); + BattleIcon_LoadTypeSpritePalette(param0->unk_1E4, 3, v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 45065); + BattleIcon_MakeTypeSpriteCellsAnim(v0, param0->unk_1FB0, 45065, 45065); for (v1 = 45070; v1 <= 45076; v1++) { BattleIcon_MakeTypeSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, v1); } - BattleIcon_MakeMoveTypeSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 45077); + BattleIcon_MakeMoveClassSpriteTiles(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 45077); } static void ov13_02224798(UnkStruct_ov13_022213F0 *param0) @@ -408,7 +408,7 @@ static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1 { SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); - sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(param2), 1, 45077); + sub_0200D948(v0, param0->unk_1FB0, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_GetMoveClassTiles(param2), 1, 45077); sub_0200D41C(param1, BattleIcon_GetMoveClassPaletteIndex(param2) + 4); } diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c index b7e6b896b4..a6f0304a68 100644 --- a/src/overlay017/ov17_02252AB0.c +++ b/src/overlay017/ov17_02252AB0.c @@ -8,7 +8,7 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "battle/graphic/pl_batt_obj/pl_batt_obj.naix" +#include "battle/graphic/objects/pl_batt_obj.naix" #include "heap.h" #include "palette.h" diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index e5bdc7bb2d..a2ed2b877a 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -37,8 +37,8 @@ typedef struct { u32 BattleIcon_GetMoveTypeTiles(int param0); u32 BattleIcon_GetMoveTypePaletteFileIndex(void); -u32 sub_0207C924(void); -u32 sub_0207C928(void); +u32 BattleIcon_GetMoveTypeCellsFileIndex(void); +u32 BattleIcon_GetMoveTypeAnimFileIndex(void); u8 BattleIcon_GetMoveTypePaletteIndex(int param0); u32 BattleIcon_GetNARCIndex(void); void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2); @@ -78,7 +78,7 @@ BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_30 = NULL; param0->unk_44 = MessageLoader_GetNewStrbuf(param5, 21); param0->unk_48 = MessageLoader_GetNewStrbuf(param5, 22); - param0->unk_34 = Graphics_GetCellBank(BattleIcon_GetNARCIndex(), sub_0207C924(), 1, &(param0->unk_38), 10); + param0->unk_34 = Graphics_GetCellBank(BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeCellsFileIndex(), 1, &(param0->unk_38), 10); for (v0 = 0; v0 < 2; v0++) { param0->unk_3C[v0] = NULL; diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index 4aa705a46c..14b56356c4 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -238,7 +238,7 @@ static void ov84_022404C0(UnkStruct_ov84_0223B5A0 *param0) sub_0200CBDC(param0->unk_D8, param0->unk_DC, 62, 4, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49408); sub_0200CBDC(param0->unk_D8, param0->unk_DC, 16, Item_FileID(0, 1), 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49407); BattleIcon_MakeTypeSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49409); - BattleIcon_MakeMoveTypeSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49410); + BattleIcon_MakeMoveClassSpriteTiles(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49410); sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, v1, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49401); sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 20, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 49402); sub_0200CC9C(param0->unk_D8, param0->unk_DC, 16, Item_FileID(0, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49404); @@ -261,7 +261,7 @@ static void ov84_022404C0(UnkStruct_ov84_0223B5A0 *param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_D8, param0->unk_DC, param0->unk_D4, 34, 0, 49406); sub_0200CE3C(param0->unk_D8, param0->unk_DC, 16, Item_IconNANRFile(), 0, 49407); sub_0200CE3C(param0->unk_D8, param0->unk_DC, 62, 6, 0, 49408); - sub_0207C9EC(param0->unk_D8, param0->unk_DC, 49409, 49409); + BattleIcon_MakeTypeSpriteCellsAnim(param0->unk_D8, param0->unk_DC, 49409, 49409); } static void ov84_02240950(UnkStruct_ov84_0223B5A0 *param0) @@ -450,7 +450,7 @@ void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2) sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetNARCIndex(), BattleIcon_GetMoveTypeTiles(v1), 1, 49409); sub_0200D41C(param0->unk_E0[10], BattleIcon_GetMoveTypePaletteIndex(v1) + 6); - sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(v2), 1, 49410); + sub_0200D948(param0->unk_D8, param0->unk_DC, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_GetMoveClassTiles(v2), 1, 49410); sub_0200D41C(param0->unk_E0[11], BattleIcon_GetMoveClassPaletteIndex(v2) + 6); } diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index afc848b024..ed05efacfc 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1343,7 +1343,7 @@ static void ov91_021D2110(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) BattleIcon_MakeTypeSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, v0); } - BattleIcon_MakeMoveTypeSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 47275); + BattleIcon_MakeMoveClassSpriteTiles(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 47275); sub_0200CD0C(param0->unk_110, param0->unk_114, param1, 9, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47272); BattleIcon_MakeTypeSpritePalette(param0->unk_110, param0->unk_114, NNS_G2D_VRAM_TYPE_2DMAIN, 47273); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 4, 0, 47272); @@ -1352,7 +1352,7 @@ static void ov91_021D2110(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 3, 0, 47272); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 6, 0, 47273); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_110, param0->unk_114, param1, 0, 0, 47274); - sub_0207C9EC(param0->unk_110, param0->unk_114, 47275, 47275); + BattleIcon_MakeTypeSpriteCellsAnim(param0->unk_110, param0->unk_114, 47275, 47275); } static void ov91_021D22A0(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param2) @@ -1443,7 +1443,7 @@ static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); - sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetMoveClassPalettteFileIndex(), BattleIcon_GetMoveClassTiles(v0), 1, 47275); + sub_0200D948(param0->unk_110, param0->unk_114, BattleIcon_GetMoveClassNARCIndex(), BattleIcon_GetMoveClassTiles(v0), 1, 47275); sub_0200D41C(param0->unk_118[5], BattleIcon_GetMoveClassPaletteIndex(v0) + 2); }