diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-03-23 19:34:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-23 19:34:52 -0700 |
| commit | 65d6fbb5f99b8a89c23e467d12ec3d06b41126cd (patch) | |
| tree | 1bbd3e5c3893ee4ecf289330e02b1afe965815c9 /tools/src | |
| parent | fc3dc169519bc30da79d89ac9afaff7ca71b8eed (diff) | |
| parent | ce0ffa2a6ba13ea49ebee5b374cebc067952b134 (diff) | |
Merge pull request #456 from Henny022p/transitions
Transition Data
Diffstat (limited to 'tools/src')
| -rw-r--r-- | tools/src/asset_processor/assets/exitlist.cpp | 43 | ||||
| -rw-r--r-- | tools/src/asset_processor/assets/exitlist.h | 7 | ||||
| -rw-r--r-- | tools/src/asset_processor/main.cpp | 3 |
3 files changed, 0 insertions, 53 deletions
diff --git a/tools/src/asset_processor/assets/exitlist.cpp b/tools/src/asset_processor/assets/exitlist.cpp deleted file mode 100644 index 85051fd1..00000000 --- a/tools/src/asset_processor/assets/exitlist.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "exitlist.h" -#include "reader.h" -#include <fmt/format.h> -#include <util/file.h> - -void ExitListAsset::convertToHumanReadable(const std::vector<char>& baserom) { - Reader reader(baserom, start, size); - auto file = util::open_file(assetPath, "w"); - while (reader.cursor < size) { - u16 transition_type = reader.read_u16(); - u16 x_pos = reader.read_u16(); - u16 y_pos = reader.read_u16(); - u16 dest_x = reader.read_u16(); - u16 dest_y = reader.read_u16(); - u8 screen_edge = reader.read_u8(); - u8 dest_area = reader.read_u8(); - u8 dest_room = reader.read_u8(); - u8 unknown_2 = reader.read_u8(); - u8 unknown_3 = reader.read_u8(); - u8 unknown_4 = reader.read_u8(); - u16 unknown_5 = reader.read_u16(); - u16 padding_1 = reader.read_u16(); - if (transition_type == 0xffff) { - std::fputs("\texit_list_end\n", file.get()); - break; - } - auto line = fmt::format("\texit transition={}", transition_type); - line += opt_param(", x={:#x}", 0, x_pos); - line += opt_param(", y={:#x}", 0, y_pos); - line += opt_param(", destX={:#x}", 0, dest_x); - line += opt_param(", destY={:#x}", 0, dest_y); - line += opt_param(", screenEdge={:#x}", 0, screen_edge); - line += opt_param(", destArea={:#x}", 0, dest_area); - line += opt_param(", destRoom={:#x}", 0, dest_room); - line += opt_param(", unknown={:#x}", 0, unknown_2); - line += opt_param(", unknown2={:#x}", 0, unknown_3); - line += opt_param(", unknown3={:#x}", 0, unknown_4); - line += opt_param(", unknown4={:#x}", 0, unknown_5); - line += opt_param(", padding={:#x}", 0, padding_1); - std::fputs(line.c_str(), file.get()); - std::fputc('\n', file.get()); - } -}
\ No newline at end of file diff --git a/tools/src/asset_processor/assets/exitlist.h b/tools/src/asset_processor/assets/exitlist.h deleted file mode 100644 index 2b039124..00000000 --- a/tools/src/asset_processor/assets/exitlist.h +++ /dev/null @@ -1,7 +0,0 @@ -#include "macroasm.h" - -class ExitListAsset : public BaseMacroAsmAsset { - public: - using BaseMacroAsmAsset::BaseMacroAsmAsset; - virtual void convertToHumanReadable(const std::vector<char>& baserom); -};
\ No newline at end of file diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp index 1e6df2a0..2e6da1d1 100644 --- a/tools/src/asset_processor/main.cpp +++ b/tools/src/asset_processor/main.cpp @@ -1,7 +1,6 @@ #include "main.h" #include "assets/aif.h" #include "assets/animation.h" -#include "assets/exitlist.h" #include "assets/frameobjlists.h" #include "assets/gfx.h" #include "assets/midi.h" @@ -267,8 +266,6 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa assetHandler = std::make_unique<AnimationAsset>(path, start, size, asset); } else if (type == "sprite_frame") { assetHandler = std::make_unique<SpriteFrameAsset>(path, start, size, asset); - } else if (type == "exit_list") { - assetHandler = std::make_unique<ExitListAsset>(path, start, size, asset); } else if (type == "frame_obj_lists") { assetHandler = std::make_unique<FrameObjListsAsset>(path, start, size, asset); } else if (type == "midi") { |
