diff --git a/platinum.us/filesys.csv b/platinum.us/filesys.csv index 6c3347db88..d1aa85c157 100644 --- a/platinum.us/filesys.csv +++ b/platinum.us/filesys.csv @@ -189,7 +189,7 @@ res/prebuilt/poketool/waza/waza_tbl.narc,/poketool/waza/waza_tbl.narc res/field/scripts/scr_seq.narc,/fielddata/script/scr_seq.narc res/prebuilt/graphic/bag_gra.narc,/graphic/bag_gra.narc res/prebuilt/graphic/box.narc,/graphic/box.narc -res/prebuilt/graphic/btower.narc,/graphic/btower.narc +res/graphics/frontier/tower/records.narc,/graphic/btower.narc res/prebuilt/graphic/bucket.narc,/graphic/bucket.narc res/graphics/options_menu/config_gra.narc,/graphic/config_gra.narc res/prebuilt/graphic/demo_trade.narc,/graphic/demo_trade.narc diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index b750194641..86588555ec 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -188,7 +188,7 @@ e3bb819c8dbab8a8db5e4ddccc788b234424e605 *res/graphics/battle/moves/anim_nclr.na 9f4d3587b7032f4f673ccc1b8971685b2199396b *res/field/scripts/scr_seq.narc 86e4a1030a0f3939eff107e94023140dd91acf6a *res/prebuilt/graphic/bag_gra.narc 1c6bab5b5b8295bb3e6b8b6a271a7ca20c1ae177 *res/prebuilt/graphic/box.narc -cf140701a40be4f23bb24fb17145b1a176ceabcd *res/prebuilt/graphic/btower.narc +cf140701a40be4f23bb24fb17145b1a176ceabcd *res/graphics/frontier/tower/records.narc f0dd678b1de5b9231ffad99f207085a1dab37491 *res/prebuilt/graphic/bucket.narc 9d3829844b18063946f3bddcf67a839c95c0186f *res/graphics/options_menu/config_gra.narc 937807f1632664139194b95e3f7b8a58ac33f89a *res/prebuilt/graphic/demo_trade.narc diff --git a/res/graphics/frontier/meson.build b/res/graphics/frontier/meson.build new file mode 100644 index 0000000000..c517639868 --- /dev/null +++ b/res/graphics/frontier/meson.build @@ -0,0 +1 @@ +subdir('tower') diff --git a/res/graphics/frontier/tower/meson.build b/res/graphics/frontier/tower/meson.build new file mode 100644 index 0000000000..9c9ade1a06 --- /dev/null +++ b/res/graphics/frontier/tower/meson.build @@ -0,0 +1,46 @@ +tower_records_narc = custom_target('tower_records_narc', + output: [ + 'records.narc', + 'records.naix', + ], + + input: [ + ncgr_cell_gen.process( + files('sprites.png'), + extra_args: [ '-bitdepth', '4', '-version101', '-clobbersize' ], + ), + + ncgr_gen.process( + files('records_tiles.png'), + extra_args: [ '-bitdepth', '4', '-version101', '-sopc' ], + ), + + nclr_gen.process( + files('sprites.pal', 'records_tiles.pal'), + extra_args: [ '-bitdepth', '4', '-nopad', '-pcmp' ], + ), + + ncer_gen.process(files('sprites_cell.json')), + nanr_gen.process(files('sprites_anim.json')), + + copy_gen.process( + files( + 'records_solo.NSCR', + 'records_ranks.NSCR', + 'records_wifi.NSCR', + ) + ), + ], + + command: [ + nitroarc_exe, + '--create', + '--index', + '--files-from', files('records.order'), + '--file', '@OUTPUT0@', + '@PRIVATE_DIR@', + ], +) + +nitrofs_files += tower_records_narc +naix_headers += tower_records_narc[1] diff --git a/res/graphics/frontier/tower/records.order b/res/graphics/frontier/tower/records.order new file mode 100644 index 0000000000..321af6fcac --- /dev/null +++ b/res/graphics/frontier/tower/records.order @@ -0,0 +1,9 @@ +sprites.NCLR +sprites.NCGR +sprites_cell.NCER +sprites_anim.NANR +records_tiles.NCLR +records_tiles.NCGR +records_solo.NSCR +records_ranks.NSCR +records_wifi.NSCR diff --git a/res/graphics/frontier/tower/records_ranks.NSCR b/res/graphics/frontier/tower/records_ranks.NSCR new file mode 100644 index 0000000000..05e3a43a03 Binary files /dev/null and b/res/graphics/frontier/tower/records_ranks.NSCR differ diff --git a/res/graphics/frontier/tower/records_solo.NSCR b/res/graphics/frontier/tower/records_solo.NSCR new file mode 100644 index 0000000000..83c785581c Binary files /dev/null and b/res/graphics/frontier/tower/records_solo.NSCR differ diff --git a/res/graphics/frontier/tower/records_tiles.pal b/res/graphics/frontier/tower/records_tiles.pal new file mode 100644 index 0000000000..12e2432d76 --- /dev/null +++ b/res/graphics/frontier/tower/records_tiles.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +205 238 255 +57 65 82 +49 74 139 +230 205 32 +123 139 164 +238 230 115 +148 213 255 +74 123 205 +98 164 230 +123 189 246 +172 222 255 +189 172 57 +238 238 172 +90 98 115 +65 74 90 +238 246 255 +205 238 255 +57 65 82 +123 139 164 +238 246 255 +123 139 164 +222 74 24 +246 148 90 +164 172 180 +74 82 90 +16 98 205 +123 180 213 +180 41 41 +222 131 123 +0 0 0 +0 0 0 +90 98 115 +205 238 255 +16 98 205 +123 180 213 +180 41 41 +222 131 123 +222 74 24 +246 148 90 +238 246 255 +123 139 164 +57 65 82 +123 139 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 98 115 diff --git a/res/graphics/frontier/tower/records_tiles.png b/res/graphics/frontier/tower/records_tiles.png new file mode 100644 index 0000000000..e8c05fac80 Binary files /dev/null and b/res/graphics/frontier/tower/records_tiles.png differ diff --git a/res/graphics/frontier/tower/records_wifi.NSCR b/res/graphics/frontier/tower/records_wifi.NSCR new file mode 100644 index 0000000000..7eef0e6589 Binary files /dev/null and b/res/graphics/frontier/tower/records_wifi.NSCR differ diff --git a/res/graphics/frontier/tower/sprites.pal b/res/graphics/frontier/tower/sprites.pal new file mode 100644 index 0000000000..b9f2d88687 --- /dev/null +++ b/res/graphics/frontier/tower/sprites.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +205 230 246 +238 0 0 +115 131 156 +90 98 115 +0 0 0 +0 0 0 +106 172 230 +156 230 246 +123 172 205 +123 197 255 +205 131 164 +255 115 115 +246 98 98 +123 197 222 +205 230 238 +246 246 246 +172 255 238 +205 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 164 255 +156 148 213 +205 131 164 +255 115 115 +246 98 98 +255 0 0 +16 164 255 +255 255 255 diff --git a/res/graphics/frontier/tower/sprites.png b/res/graphics/frontier/tower/sprites.png new file mode 100644 index 0000000000..e9ff0cbf83 Binary files /dev/null and b/res/graphics/frontier/tower/sprites.png differ diff --git a/res/graphics/frontier/tower/sprites_anim.json b/res/graphics/frontier/tower/sprites_anim.json new file mode 100644 index 0000000000..f3f3337695 --- /dev/null +++ b/res/graphics/frontier/tower/sprites_anim.json @@ -0,0 +1,117 @@ +{ + "labelEnabled": true, + "uaatEnabled": false, + "sequenceCount": 4, + "frameCount": 12, + "sequences": [{ + "frameCount": 2, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 20, + "resultId": 0 + }, { + "frameDelay": 20, + "resultId": 1 + }] + }, { + "frameCount": 2, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 2 + }, { + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 4 + }, { + "frameDelay": 6, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 6, + "resultId": 5 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 7 + }, { + "frameDelay": 6, + "resultId": 8 + }, { + "frameDelay": 6, + "resultId": 9 + }, { + "frameDelay": 6, + "resultId": 8 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }, { + "resultType": 0, + "index": 5 + }, { + "resultType": 0, + "index": 6 + }, { + "resultType": 2, + "index": 3, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 3, + "positionX": 0, + "positionY": -1 + }, { + "resultType": 2, + "index": 3, + "positionX": 0, + "positionY": -2 + }, { + "resultType": 2, + "index": 4, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 4, + "positionX": 0, + "positionY": 1 + }, { + "resultType": 2, + "index": 4, + "positionX": 0, + "positionY": 2 + }], + "resultCount": 10, + "labels": ["Cursol", "modoru", "up", "down"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/graphics/frontier/tower/sprites_cell.json b/res/graphics/frontier/tower/sprites_cell.json new file mode 100644 index 0000000000..cac45e9469 --- /dev/null +++ b/res/graphics/frontier/tower/sprites_cell.json @@ -0,0 +1,404 @@ +{ + "labelEnabled": true, + "dontPadKbec": false, + "extended": true, + "vramTransferEnabled": false, + "ucatEnabled": false, + "cellCount": 8, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 2, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 2, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 40, + "Priority": 2, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 2, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 40, + "Priority": 2, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 2, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -16, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -16, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 8 + }, + "maxX": 27, + "maxY": 15, + "minX": -28, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -28, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 2, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 112, + "Priority": 2, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 20, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 120, + "Priority": 2, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 8 + }, + "maxX": 27, + "maxY": 15, + "minX": -28, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -28, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 124, + "Priority": 2, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 140, + "Priority": 2, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 20, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 148, + "Priority": 2, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 0 + }, + "maxX": 0, + "maxY": 0, + "minX": 0, + "minY": 0, + "oamCount": 0, + "OAM": [] + }], + "labels": ["Cursol", "modoru", "up", "down"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/graphics/meson.build b/res/graphics/meson.build index f441bf4f19..4ec7627cb9 100644 --- a/res/graphics/meson.build +++ b/res/graphics/meson.build @@ -1,6 +1,7 @@ subdir('bag') subdir('battle') subdir('diploma') +subdir('frontier') subdir('item_icons') subdir('main_menu') subdir('mining') diff --git a/res/prebuilt/graphic/btower.narc b/res/prebuilt/graphic/btower.narc deleted file mode 100644 index d16bdabdae..0000000000 Binary files a/res/prebuilt/graphic/btower.narc and /dev/null differ diff --git a/res/prebuilt/graphic/meson.build b/res/prebuilt/graphic/meson.build index 5519b5c59e..001b447c93 100644 --- a/res/prebuilt/graphic/meson.build +++ b/res/prebuilt/graphic/meson.build @@ -1,7 +1,6 @@ prebuilt_files = [ 'bag_gra.narc', 'box.narc', - 'btower.narc', 'bucket.narc', 'demo_trade.narc', 'dendou_demo.narc',