diff --git a/platinum.us/filesys.csv b/platinum.us/filesys.csv index 82fa2098c5..3cb0f5ff1c 100644 --- a/platinum.us/filesys.csv +++ b/platinum.us/filesys.csv @@ -237,7 +237,7 @@ res/prebuilt/graphic/touch_subwindow.narc,/graphic/touch_subwindow.narc res/prebuilt/graphic/trainer_case.narc,/graphic/trainer_case.narc res/prebuilt/graphic/unionobj2d_onlyfront.narc,/graphic/unionobj2d_onlyfront.narc res/prebuilt/graphic/unionroom.narc,/graphic/unionroom.narc -res/prebuilt/graphic/waza_oshie_gra.narc,/graphic/waza_oshie_gra.narc +res/graphics/move_tutor/move_tutor.narc,/graphic/waza_oshie_gra.narc res/prebuilt/graphic/wifi2dchar.narc,/graphic/wifi2dchar.narc res/prebuilt/graphic/wifi_lobby.narc,/graphic/wifi_lobby.narc res/prebuilt/graphic/wifi_lobby_other.narc,/graphic/wifi_lobby_other.narc diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index 2e7184712d..cc925fd5b7 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -236,7 +236,7 @@ f79e12419475818dcdb42df7fbf843e3c8f71252 *res/prebuilt/graphic/tmap_gra.narc 3446f96721b7dee9983222f2ecf4bc30e1530f27 *res/prebuilt/graphic/trainer_case.narc 474dd2ac959d28cf2be9cdc2fb0626b091ab281e *res/prebuilt/graphic/unionobj2d_onlyfront.narc a90eefcf0fe8e649978329bec0185c072392ee58 *res/prebuilt/graphic/unionroom.narc -b653d274c54681632e3c4f166f523573be9be08e *res/prebuilt/graphic/waza_oshie_gra.narc +b653d274c54681632e3c4f166f523573be9be08e *res/graphics/move_tutor/move_tutor.narc aa8f109bb43f94b0c8cf3cf5c27fb166da269823 *res/prebuilt/graphic/wifi2dchar.narc 16b0d7afaa52c353007b44bbdfbb73e9ccf0207c *res/prebuilt/graphic/wifi_lobby.narc 9cafec00fea9184395906e6063dad7ad456b99d3 *res/prebuilt/graphic/wifi_lobby_other.narc diff --git a/res/graphics/meson.build b/res/graphics/meson.build index 7f5570796f..cfbc0ae8d8 100644 --- a/res/graphics/meson.build +++ b/res/graphics/meson.build @@ -3,6 +3,7 @@ subdir('battle') subdir('diploma') subdir('item_icons') subdir('mining') +subdir('move_tutor') subdir('naming_screen') subdir('options_menu') subdir('party_menu') diff --git a/res/graphics/move_tutor/meson.build b/res/graphics/move_tutor/meson.build new file mode 100644 index 0000000000..6bd11589aa --- /dev/null +++ b/res/graphics/move_tutor/meson.build @@ -0,0 +1,73 @@ +move_tutor_tiles = ncgr_cell_gen.process( + files( + 'select_box.png', + 'view_change_arrows.png', + 'scroll_arrows.png', + ), + extra_args: [ + '-version101', + '-clobbersize', + ] +) + +move_tutor_bg_tiles = ncgr_gen.process( + files( + 'move_tutor_bg_tiles.png', + ), + extra_args: [ + '-version101', + '-sopc', + '-convertTo4Bpp', + ] +) + +move_tutor_cells = ncer_gen.process(files( + 'select_box_cell.json', + 'view_change_arrows_cell.json', + 'scroll_arrows_cell.json', +)) + +move_tutor_anims = nanr_gen.process(files( + 'select_box_anim.json', + 'view_change_arrows_anim.json', + 'scroll_arrows_anim.json', +)) + +move_tutor_pals = nclr_gen.process( + files( + 'sprites.pal', + 'move_tutor_bg_tiles.png', + ), + extra_args: [ + '-bitdepth', '4', + ], +) + +move_tutor_nscr = copy_gen.process(files('move_tutor_background.NSCR')) + +move_tutor_order = files('move_tutor.order') + +move_tutor_narc = custom_target('move_tutor.narc', + output: [ + 'move_tutor.narc', + 'move_tutor.naix.h', + ], + input: [ + move_tutor_tiles, + move_tutor_bg_tiles, + move_tutor_cells, + move_tutor_anims, + move_tutor_pals, + move_tutor_nscr, + ], + command: [ + narc_exe, 'create', + '--naix', + '--order', move_tutor_order, + '--output', '@OUTPUT0@', + '@PRIVATE_DIR@', + ] +) + +nitrofs_files += move_tutor_narc +naix_headers += move_tutor_narc[1] diff --git a/res/graphics/move_tutor/move_tutor.order b/res/graphics/move_tutor/move_tutor.order new file mode 100644 index 0000000000..cd8211197b --- /dev/null +++ b/res/graphics/move_tutor/move_tutor.order @@ -0,0 +1,13 @@ +select_box_anim.NANR +select_box_cell.NCER +select_box.NCGR +view_change_arrows_anim.NANR +view_change_arrows_cell.NCER +view_change_arrows.NCGR +scroll_arrows_anim.NANR +scroll_arrows_cell.NCER +scroll_arrows.NCGR +sprites.NCLR +move_tutor_bg_tiles.NCGR +move_tutor_background.NSCR +move_tutor_bg_tiles.NCLR diff --git a/res/graphics/move_tutor/move_tutor_background.NSCR b/res/graphics/move_tutor/move_tutor_background.NSCR new file mode 100644 index 0000000000..0433ebb437 Binary files /dev/null and b/res/graphics/move_tutor/move_tutor_background.NSCR differ diff --git a/res/graphics/move_tutor/move_tutor_bg_tiles.png b/res/graphics/move_tutor/move_tutor_bg_tiles.png new file mode 100644 index 0000000000..3901ef6d39 Binary files /dev/null and b/res/graphics/move_tutor/move_tutor_bg_tiles.png differ diff --git a/res/graphics/move_tutor/scroll_arrows.png b/res/graphics/move_tutor/scroll_arrows.png new file mode 100644 index 0000000000..30ac70d6c9 Binary files /dev/null and b/res/graphics/move_tutor/scroll_arrows.png differ diff --git a/res/graphics/move_tutor/scroll_arrows_anim.json b/res/graphics/move_tutor/scroll_arrows_anim.json new file mode 100644 index 0000000000..c13816c371 --- /dev/null +++ b/res/graphics/move_tutor/scroll_arrows_anim.json @@ -0,0 +1,101 @@ +{ + "labelEnabled": true, + "uaatEnabled": false, + "sequenceCount": 2, + "frameCount": 12, + "sequences": [{ + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 1 + }] + }, { + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }, { + "frameDelay": 4, + "resultId": 5 + }, { + "frameDelay": 4, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 7 + }, { + "frameDelay": 4, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 5 + }] + }], + "animationResults": [{ + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": -1 + }, { + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": -2 + }, { + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": -3 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": 1 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": 2 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": 3 + }], + "resultCount": 8, + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/move_tutor/scroll_arrows_cell.json b/res/graphics/move_tutor/scroll_arrows_cell.json new file mode 100644 index 0000000000..2e34f9b084 --- /dev/null +++ b/res/graphics/move_tutor/scroll_arrows_cell.json @@ -0,0 +1,80 @@ +{ + "labelEnabled": true, + "dontPadKbec": false, + "extended": true, + "vramTransferEnabled": false, + "ucatEnabled": false, + "cellCount": 2, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 7, + "maxY": 3, + "minX": -8, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 7, + "maxY": 3, + "minX": -8, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/move_tutor/select_box.png b/res/graphics/move_tutor/select_box.png new file mode 100644 index 0000000000..4a5b984e06 Binary files /dev/null and b/res/graphics/move_tutor/select_box.png differ diff --git a/res/graphics/move_tutor/select_box_anim.json b/res/graphics/move_tutor/select_box_anim.json new file mode 100644 index 0000000000..c058d74532 --- /dev/null +++ b/res/graphics/move_tutor/select_box_anim.json @@ -0,0 +1,24 @@ +{ + "labelEnabled": true, + "uaatEnabled": false, + "sequenceCount": 1, + "frameCount": 1, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }], + "resultCount": 1, + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/move_tutor/select_box_cell.json b/res/graphics/move_tutor/select_box_cell.json new file mode 100644 index 0000000000..bb1f71feb1 --- /dev/null +++ b/res/graphics/move_tutor/select_box_cell.json @@ -0,0 +1,106 @@ +{ + "labelEnabled": true, + "dontPadKbec": false, + "extended": true, + "vramTransferEnabled": false, + "ucatEnabled": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 16 + }, + "maxX": 63, + "maxY": 7, + "minX": -64, + "minY": -8, + "oamCount": 4, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/move_tutor/sprites.pal b/res/graphics/move_tutor/sprites.pal new file mode 100644 index 0000000000..a86b22f163 --- /dev/null +++ b/res/graphics/move_tutor/sprites.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +41 82 131 +74 65 57 +246 255 255 +255 164 74 +255 106 57 +255 65 57 +189 8 16 +164 238 205 +148 230 230 +131 213 213 +255 238 148 +255 205 74 +255 172 41 +139 131 123 +189 189 164 +106 98 90 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +246 255 255 +115 106 98 +246 222 222 +246 180 180 +255 123 189 +255 49 172 +230 156 57 +255 222 98 +255 213 90 +255 180 82 +57 82 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/graphics/move_tutor/view_change_arrows.png b/res/graphics/move_tutor/view_change_arrows.png new file mode 100644 index 0000000000..c73ee44bc8 Binary files /dev/null and b/res/graphics/move_tutor/view_change_arrows.png differ diff --git a/res/graphics/move_tutor/view_change_arrows_anim.json b/res/graphics/move_tutor/view_change_arrows_anim.json new file mode 100644 index 0000000000..f4bc00463a --- /dev/null +++ b/res/graphics/move_tutor/view_change_arrows_anim.json @@ -0,0 +1,101 @@ +{ + "labelEnabled": true, + "uaatEnabled": false, + "sequenceCount": 2, + "frameCount": 12, + "sequences": [{ + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 1 + }] + }, { + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }, { + "frameDelay": 4, + "resultId": 5 + }, { + "frameDelay": 4, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 7 + }, { + "frameDelay": 4, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 5 + }] + }], + "animationResults": [{ + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": -1, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": -2, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": -3, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 1, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 2, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 3, + "positionY": 0 + }], + "resultCount": 8, + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/move_tutor/view_change_arrows_cell.json b/res/graphics/move_tutor/view_change_arrows_cell.json new file mode 100644 index 0000000000..1c6f309cb9 --- /dev/null +++ b/res/graphics/move_tutor/view_change_arrows_cell.json @@ -0,0 +1,80 @@ +{ + "labelEnabled": true, + "dontPadKbec": false, + "extended": true, + "vramTransferEnabled": false, + "ucatEnabled": false, + "cellCount": 2, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/prebuilt/graphic/meson.build b/res/prebuilt/graphic/meson.build index 2c792f8d27..a07a79d2f5 100644 --- a/res/prebuilt/graphic/meson.build +++ b/res/prebuilt/graphic/meson.build @@ -38,7 +38,6 @@ prebuilt_files = [ 'trainer_case.narc', 'unionobj2d_onlyfront.narc', 'unionroom.narc', - 'waza_oshie_gra.narc', 'wifi_lobby_other.narc', 'wifi_lobby.narc', 'wifi_unionobj.narc', diff --git a/res/prebuilt/graphic/waza_oshie_gra.narc b/res/prebuilt/graphic/waza_oshie_gra.narc deleted file mode 100644 index de83eb83ab..0000000000 Binary files a/res/prebuilt/graphic/waza_oshie_gra.narc and /dev/null differ