diff --git a/Makefile b/Makefile index 0411d4c..4773492 100644 --- a/Makefile +++ b/Makefile @@ -46,14 +46,15 @@ LINUX_INCLUDES= \ LINUX_LIBS= \ $(GTK_LIBS) \ - `sdl2-config --static-libs` + `sdl2-config --static-libs` \ + -L$(3RD_PARTY)/wren-0.1.0/lib LINUX64_LIBS= \ - $(LINUX_LIBS) \ + $(GTK_LIBS) \ -L$(PRE_BUILT)/linux64 LINUX32_LIBS= \ - $(LINUX_LIBS) \ + $(GTK_LIBS) \ -L$(PRE_BUILT)/linux32 LINUX_ARM_LIBS= \ @@ -323,14 +324,14 @@ run: mingw-pro $(MINGW_OUTPUT) linux64-lto: - $(CC) $(LINUX_INCLUDES) $(SOURCES) $(TIC80_SRC) $(SOURCES_EXT) $(OPT) $(INCLUDES) $(LINUX64_LIBS) $(LINUX_LINKER_LTO_FLAGS) -flto -o $(BIN_NAME) + $(CC) $(GTK_INCLUDES) $(SOURCES) $(TIC80_SRC) $(SOURCES_EXT) $(OPT) $(INCLUDES) $(LINUX64_LIBS) $(LINUX_LINKER_LTO_FLAGS) -flto -o $(BIN_NAME) linux64-lto-pro: $(eval OPT += $(OPT_PRO)) make linux64-lto OPT="$(OPT)" linux32-lto: - $(CC) $(LINUX_INCLUDES) $(SOURCES) $(TIC80_SRC) $(SOURCES_EXT) $(OPT) $(INCLUDES) $(LINUX32_LIBS) $(LINUX_LINKER_LTO_FLAGS) -flto -o $(BIN_NAME) + $(CC) $(GTK_INCLUDES) $(SOURCES) $(TIC80_SRC) $(SOURCES_EXT) $(OPT) $(INCLUDES) $(LINUX32_LIBS) $(LINUX_LINKER_LTO_FLAGS) -flto -o $(BIN_NAME) linux32-lto-pro: $(eval OPT += $(OPT_PRO)) diff --git a/README.md b/README.md index d2474a8..b3a7dc4 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,50 @@ -# TIC-80 issues tracker and wiki +![TIC-80](https://tic.computer/img/logo64.png) +**TIC-80 TINY COMPUTER** - [https://tic.computer/](https://tic.computer/) -[Discord chat](https://discord.gg/DkD73dP) +# About +TIC-80 is a **FREE** and **OPEN SOURCE** fantasy computer for making, playing and sharing tiny games. -This is the official issues tracker of . If you are experiencing a bug or would like to see a new feature [browse existing issues](https://github.com/nesbox/tic.computer/issues) or [create a new one](https://github.com/nesbox/tic.computer/issues/new). +With TIC-80 you get built-in tools for development: code, sprites, maps, sound editors and the command line, which is enough to create a mini retro game. -Documentation is available in the [wiki](https://github.com/nesbox/tic.computer/wiki). +Games are packeged into a cartridge file, which can be easily distributed. TIC-80 works on all popular platforms. This means your cartridge can be played in any device. -Thanks! +To make a retro styled game, the whole process of creation and execution takes place under some technical limitations: 240x136 pixels display, 16 color palette, 256 8x8 color sprites, 4 channel sound and etc. + +![TIC-80](https://user-images.githubusercontent.com/1101448/29687467-3ddc432e-8925-11e7-8156-5cec3700cc04.gif) + +### Features +- Multiple progamming languages: Lua, Moonscript, Javascript and Wren +- Games can have mouse and keyboard as input +- Games can have up to 4 controllers as input +- Builtin editors: for code, sprites, world maps, sound effects and music +- An aditional memory bank: load different assets from your cartridge while your game is executing + +# Binaries Downloads +You can download compiled versions for the major operating systems directly from our [releases page](https://github.com/nesbox/TIC-80/releases). + +# Pro Version +To help supporting the TIC-80 development, we have a [PRO Version](https://nesbox.itch.io/tic). +This version has a few aditional features and can only be download on [our Itch.io page](https://nesbox.itch.io/tic). + +For users who can't spend the money, we made it easy to build the pro version from the source code. + +### Pro features + +- Save/load cartridges in text format, and create your game in any editor you want, also useful for version control systems. +- Even more memory banks: instead of having only 1 memory bank you have 8. +- Export your game only without editors, and then publish it to app stores (WIP). + +# Community +You can play and share games, tools and music at [tic.computer](https://tic.computer/play). + +The community also hangs and discuss on [Discord chat](https://discord.gg/DkD73dP). + +# Contributing +You are can contribute by issuing a bug or requesting a new feature on our [issues page](https://github.com/nesbox/tic.computer/issues). +Keep in mind when engaging on a discussion to follow our [Code of Conduct](https://github.com/nesbox/TIC-80/blob/master/CODE_OF_CONDUCT.md). + +You can also contribute by reviewing or improving our [wiki](https://github.com/nesbox/tic.computer/wiki). +The [wiki](https://github.com/nesbox/tic.computer/wiki) holds TIC-80 documentation, code snippets and game development tutorials. # Build instructions @@ -30,7 +68,9 @@ run the following commands in the Terminal ``` sudo apt-get install git build-essential libgtk-3-dev libsdl2-dev lua5.3-dev zlib1g-dev git clone --recursive https://github.com/nesbox/TIC-80 -cd TIC-80 +cd 3rd-party/wren-0.1.0/ +make static +cd ../.. make linux ``` diff --git a/bin/assets/config.tic.dat b/bin/assets/config.tic.dat index f4f4787..f66a40b 100644 --- a/bin/assets/config.tic.dat +++ b/bin/assets/config.tic.dat @@ -1 +1 @@ -0x78, 0xda, 0xed, 0x59, 0x4d, 0x68, 0x23, 0xc9, 0x15, 0x2e, 0xcf, 0xcf, 0xee, 0x4a, 0xe3, 0x4c, 0x59, 0x10, 0x96, 0xfc, 0x6c, 0x32, 0x8d, 0xb2, 0x07, 0x0f, 0xd8, 0x8c, 0xc6, 0x72, 0x26, 0xc1, 0xa0, 0x10, 0xaf, 0xd4, 0x63, 0x2b, 0x6b, 0x4b, 0x46, 0x3f, 0x33, 0x19, 0x06, 0xd6, 0xd1, 0x7a, 0xd4, 0x33, 0x02, 0x5b, 0xda, 0x48, 0xf6, 0x0e, 0x3b, 0xc1, 0xb0, 0x0c, 0x2c, 0x28, 0x27, 0xe7, 0x30, 0x81, 0xe8, 0xa4, 0x0d, 0x73, 0x08, 0x38, 0x97, 0x5c, 0x7c, 0x89, 0x0e, 0x26, 0x39, 0x2e, 0x24, 0x84, 0x25, 0xe4, 0xb0, 0x2c, 0xb9, 0x84, 0xbd, 0xb6, 0xeb, 0x34, 0x64, 0x58, 0x98, 0xca, 0xab, 0xea, 0x6a, 0xa9, 0xba, 0xfb, 0x95, 0xec, 0xc0, 0xee, 0x06, 0x82, 0xaa, 0xfd, 0xf4, 0xba, 0xea, 0xf5, 0x7b, 0xf5, 0xf3, 0xbd, 0x57, 0xd5, 0xaf, 0x3d, 0xf5, 0xe1, 0x4b, 0xe4, 0x05, 0x87, 0x92, 0x4c, 0x26, 0x0f, 0xba, 0xdd, 0xee, 0x81, 0xe0, 0x50, 0x3d, 0xe0, 0x6c, 0x48, 0x9c, 0x9f, 0xb8, 0xc9, 0x24, 0x77, 0xbb, 0x5d, 0xe6, 0x26, 0x1f, 0x33, 0x97, 0x1f, 0x30, 0xce, 0x0e, 0x18, 0xf3, 0x49, 0xea, 0x27, 0x12, 0x89, 0x96, 0xe3, 0x38, 0x2d, 0xc1, 0xa1, 0xda, 0x02, 0x3d, 0x9f, 0x84, 0x7e, 0x22, 0xc1, 0x5d, 0xc7, 0x61, 0x6e, 0xa2, 0x06, 0xfa, 0x2d, 0xe6, 0x32, 0x8f, 0x4e, 0x58, 0x8b, 0x70, 0xa9, 0x9f, 0xcb, 0xe5, 0xfa, 0xbd, 0x5e, 0xaf, 0x2f, 0x38, 0x54, 0xfb, 0x14, 0x08, 0x74, 0xfb, 0x4a, 0x3f, 0x97, 0xe3, 0x6e, 0xaf, 0xc7, 0xdc, 0xdc, 0x13, 0xd0, 0xef, 0x33, 0x97, 0x02, 0xb1, 0x3e, 0xe8, 0xf7, 0x95, 0x7e, 0xb5, 0x5a, 0x3d, 0x1e, 0x0c, 0x06, 0xc7, 0x82, 0x43, 0x55, 0x12, 0x25, 0x54, 0x70, 0xa1, 0x5f, 0xad, 0x72, 0x77, 0x30, 0x60, 0x6e, 0xf5, 0x08, 0xf4, 0x8f, 0xc1, 0xe6, 0x31, 0x63, 0x04, 0x48, 0xf0, 0x0f, 0x0f, 0x0f, 0xe3, 0x87, 0xa2, 0x2c, 0x3d, 0x3d, 0x3c, 0x4c, 0xa7, 0x0f, 0x97, 0xd2, 0xe9, 0xa7, 0xa2, 0x0a, 0x3f, 0x4b, 0xa9, 0x74, 0xfa, 0xbc, 0x2f, 0x97, 0xed, 0x20, 0x97, 0xcf, 0x45, 0xe4, 0x4f, 0x95, 0xbe, 0xe2, 0x50, 0x0f, 0xc8, 0x97, 0x94, 0xfd, 0x25, 0xa5, 0xbf, 0x34, 0xd2, 0xff, 0xc3, 0x60, 0x70, 0x69, 0x70, 0xf7, 0x68, 0x30, 0x38, 0xba, 0xeb, 0x51, 0xb5, 0x2a, 0x39, 0xb4, 0xdc, 0xdd, 0xa8, 0x56, 0x2f, 0xfe, 0xcc, 0x71, 0x5e, 0x72, 0x12, 0x35, 0xc7, 0xa9, 0xbd, 0xea, 0xe8, 0x1c, 0xee, 0x5e, 0x9d, 0x49, 0x24, 0xa6, 0xde, 0xef, 0x76, 0x5f, 0xe9, 0x3e, 0x9e, 0xed, 0x4a, 0x9a, 0x7d, 0xdc, 0xf5, 0xef, 0xe1, 0x6e, 0xd6, 0x4a, 0x26, 0xcf, 0xfd, 0xaa, 0xd7, 0x8b, 0xf5, 0x9e, 0xe4, 0x7b, 0x92, 0xf2, 0x39, 0x58, 0x65, 0xc1, 0x9f, 0xf4, 0x9e, 0xc0, 0xef, 0x8f, 0x73, 0xb9, 0x0b, 0x12, 0x6f, 0x81, 0xbd, 0xbc, 0xfe, 0x2d, 0xef, 0xaf, 0x81, 0x1f, 0x70, 0xc2, 0xc4, 0xda, 0xbe, 0xe0, 0x07, 0x84, 0x03, 0xf6, 0x27, 0x07, 0x80, 0x7f, 0x57, 0x91, 0xf0, 0x07, 0xc2, 0x4e, 0x5c, 0xce, 0x5d, 0x57, 0xe2, 0x2d, 0xb0, 0x77, 0x9e, 0x01, 0x17, 0x97, 0xe3, 0x5c, 0x01, 0x3f, 0x18, 0xea, 0xb7, 0x18, 0x03, 0xec, 0x25, 0xb5, 0x1c, 0xc6, 0xa5, 0x1f, 0x24, 0x46, 0xfa, 0x12, 0x6f, 0x81, 0xfd, 0xf3, 0xe7, 0xcf, 0xfb, 0xbd, 0x7e, 0x5f, 0xdc, 0x17, 0xc1, 0x0f, 0x86, 0xfa, 0x7d, 0xc6, 0x00, 0x7b, 0xf6, 0x1c, 0xa8, 0xdf, 0x63, 0x5c, 0xfa, 0x41, 0x6e, 0xa4, 0x2f, 0xb1, 0x16, 0xd8, 0x0f, 0x04, 0xff, 0x5c, 0xde, 0x6f, 0x82, 0x1f, 0x0c, 0xf5, 0x8f, 0x09, 0x07, 0xec, 0x4f, 0x8e, 0x01, 0xff, 0x81, 0x22, 0xe1, 0x0f, 0xbe, 0x3e, 0x81, 0x62, 0xf2, 0x01, 0xd1, 0xae, 0xcb, 0xc3, 0x3e, 0x10, 0x94, 0x47, 0x7d, 0x20, 0x20, 0x47, 0x7c, 0xc0, 0x97, 0x9b, 0x7c, 0x40, 0xb4, 0x0b, 0xb9, 0xc9, 0x07, 0x44, 0xbb, 0x90, 0x9b, 0x7c, 0x40, 0xb4, 0x0b, 0xb9, 0xc9, 0x07, 0x44, 0x3b, 0x1a, 0xbf, 0xb2, 0x38, 0xad, 0x16, 0x7f, 0x16, 0x8e, 0x5f, 0x2e, 0xf0, 0x6c, 0x09, 0x4c, 0x81, 0x9e, 0x01, 0x11, 0x32, 0x93, 0x80, 0xbf, 0x04, 0x01, 0xdd, 0x19, 0x45, 0x81, 0x02, 0xfd, 0x8b, 0x1f, 0x70, 0x55, 0xf1, 0x88, 0x4f, 0x53, 0x3e, 0xbd, 0x55, 0x75, 0xdd, 0xa3, 0xcf, 0x3f, 0x73, 0x8f, 0x06, 0x1e, 0x89, 0xba, 0x5e, 0xc8, 0xa4, 0x7c, 0xa9, 0x65, 0x14, 0xbf, 0x82, 0x3f, 0xe3, 0xd1, 0xf8, 0x25, 0x22, 0x66, 0x4f, 0x20, 0x76, 0xa5, 0x0f, 0x84, 0xe3, 0xd7, 0x87, 0xd9, 0xc7, 0x5e, 0x02, 0x2c, 0xfc, 0x41, 0xf8, 0x85, 0xc4, 0x7e, 0x88, 0xb5, 0xc2, 0x7e, 0xca, 0xf3, 0x07, 0xd5, 0xff, 0x8f, 0xd2, 0xae, 0xdb, 0x79, 0xf8, 0xaf, 0x21, 0x89, 0xba, 0x5e, 0xce, 0x7d, 0x74, 0x65, 0x02, 0xd2, 0xa4, 0x4c, 0xca, 0xa4, 0x98, 0x0b, 0xd7, 0x88, 0x68, 0x5c, 0x15, 0x71, 0x4a, 0x09, 0x32, 0x15, 0x21, 0xe3, 0x9c, 0x06, 0x78, 0x40, 0x0e, 0x6d, 0x94, 0x0a, 0x0e, 0x15, 0xb8, 0xe1, 0x21, 0xfb, 0x20, 0x05, 0xa1, 0xbc, 0x51, 0x8c, 0x06, 0xf5, 0x3d, 0x35, 0xc2, 0xe0, 0x87, 0x32, 0x8f, 0x87, 0x0c, 0x10, 0x36, 0x6e, 0x7e, 0x4a, 0xee, 0x53, 0xc8, 0xfc, 0xa8, 0x8d, 0x1a, 0x6c, 0x51, 0xd1, 0x3f, 0x95, 0xe3, 0x17, 0x3c, 0xac, 0x3f, 0xec, 0x83, 0x13, 0x5c, 0xa6, 0xf7, 0x45, 0xcd, 0xe3, 0x65, 0xfc, 0x74, 0xa8, 0x18, 0x55, 0x36, 0xb0, 0x09, 0x8e, 0x58, 0xc4, 0x2e, 0x87, 0x56, 0x9f, 0x22, 0xfd, 0x70, 0xd5, 0x37, 0xf7, 0xef, 0x83, 0x16, 0x24, 0x5e, 0x8c, 0x2a, 0x3b, 0x1e, 0xc6, 0x41, 0xb9, 0x1a, 0x94, 0x58, 0x1f, 0x66, 0xb6, 0xcf, 0x99, 0xff, 0x2c, 0x89, 0xe8, 0x73, 0xad, 0x9f, 0xb0, 0x7f, 0x8c, 0xfa, 0x25, 0xe8, 0xf8, 0xf5, 0xfe, 0x15, 0x43, 0xe7, 0xcf, 0x0c, 0xfa, 0xa3, 0x76, 0x0f, 0x9c, 0x88, 0x5c, 0x5b, 0x73, 0x6c, 0xfd, 0xc3, 0xf2, 0x08, 0xbe, 0x1a, 0x36, 0x12, 0x1c, 0x66, 0xc6, 0x1e, 0xf3, 0x81, 0x80, 0x1e, 0xe2, 0x3b, 0x4c, 0x9b, 0x3f, 0x1a, 0xbf, 0xca, 0x6f, 0x29, 0xf7, 0x22, 0xcb, 0x34, 0x7f, 0x49, 0xdc, 0xe3, 0x61, 0xfc, 0x3d, 0xd9, 0x88, 0xe3, 0xfa, 0x26, 0x7c, 0x82, 0xfe, 0xc7, 0xb9, 0x19, 0x7f, 0x93, 0x7f, 0x05, 0xe4, 0xc8, 0xfc, 0x65, 0x3b, 0xa3, 0x1a, 0x8e, 0xba, 0xfb, 0x05, 0xe7, 0x16, 0x9e, 0x9f, 0x7c, 0x7e, 0xac, 0xff, 0xd3, 0x21, 0xc8, 0x1c, 0xf1, 0x6f, 0x69, 0x53, 0xf8, 0x36, 0x55, 0x3e, 0x1e, 0x5e, 0xbf, 0x30, 0x85, 0xed, 0x33, 0x35, 0x36, 0xb9, 0x4f, 0xd2, 0xc8, 0xfe, 0x27, 0xed, 0x53, 0xf5, 0x0c, 0xc3, 0xc6, 0x3f, 0x3e, 0xbe, 0x03, 0xeb, 0xcf, 0xcd, 0xf1, 0x11, 0xd4, 0xa7, 0x63, 0xf4, 0xa3, 0xeb, 0xc7, 0xfd, 0xfd, 0x8f, 0x63, 0xfe, 0x41, 0xa3, 0x8b, 0x80, 0xe1, 0x63, 0x1a, 0x7f, 0x58, 0x46, 0xa3, 0xe7, 0x07, 0xa5, 0xa3, 0x35, 0xe4, 0x0c, 0xc7, 0x5f, 0x9f, 0x67, 0x30, 0x7e, 0xa9, 0x47, 0xfa, 0x38, 0xc3, 0xf8, 0x6b, 0x7b, 0x4b, 0x18, 0x3f, 0x16, 0x3a, 0x5f, 0x58, 0xf4, 0x78, 0x0a, 0xc5, 0x3e, 0x45, 0xcf, 0x84, 0xe1, 0xf9, 0x43, 0x91, 0xed, 0x9d, 0x45, 0xcf, 0x45, 0xe3, 0x19, 0xc1, 0x29, 0xbe, 0x7f, 0x9c, 0xa2, 0x23, 0xf6, 0x6e, 0x6f, 0xff, 0x46, 0xfc, 0x37, 0xe4, 0x03, 0x98, 0xbe, 0x5c, 0x26, 0x1a, 0xed, 0x9f, 0x28, 0x9b, 0x26, 0xfb, 0x43, 0x1f, 0x64, 0x9a, 0x1f, 0x05, 0x06, 0x40, 0xbd, 0xb5, 0x57, 0x9c, 0x51, 0x7c, 0xff, 0xa4, 0x2a, 0x8e, 0x48, 0x28, 0x46, 0x39, 0xb2, 0x07, 0x45, 0x26, 0x48, 0x46, 0x67, 0x20, 0x36, 0x7e, 0x7d, 0xa3, 0xa7, 0x98, 0x7d, 0x7d, 0x7f, 0x44, 0xf0, 0xd5, 0x89, 0x20, 0xf3, 0xf7, 0xcf, 0x46, 0x19, 0xff, 0x14, 0x91, 0x8f, 0x1b, 0x7f, 0x28, 0x86, 0xb1, 0x33, 0xe4, 0xf4, 0x3d, 0x20, 0x84, 0x0f, 0x33, 0x9c, 0x01, 0xc8, 0xfe, 0xab, 0xe3, 0x8f, 0xc6, 0x7f, 0x18, 0x3b, 0x64, 0xfe, 0x7e, 0xdf, 0x26, 0xff, 0x18, 0x8e, 0x9d, 0xa1, 0xea, 0xc1, 0x3d, 0x80, 0x61, 0xeb, 0xeb, 0xad, 0x8b, 0xef, 0x67, 0xa6, 0xfe, 0x19, 0xe2, 0x3f, 0x91, 0x3d, 0x80, 0x23, 0xfe, 0x43, 0xb5, 0x38, 0xe6, 0xd1, 0xf8, 0x8d, 0x10, 0x16, 0xff, 0xdc, 0x10, 0xff, 0xc4, 0x7b, 0x01, 0x66, 0x6c, 0x92, 0xaa, 0x4c, 0xca, 0xa4, 0x4c, 0xca, 0x17, 0x5c, 0xc2, 0xfb, 0x12, 0xfd, 0x3f, 0xcb, 0xff, 0x59, 0x68, 0x8e, 0xec, 0x0b, 0xce, 0xff, 0x95, 0x9e, 0x3c, 0x17, 0xe8, 0x29, 0xef, 0x5a, 0x63, 0xc6, 0xca, 0x39, 0x3d, 0x3b, 0x5e, 0xff, 0x65, 0xfe, 0x2f, 0xcf, 0x37, 0x6a, 0x78, 0x3f, 0xa0, 0xc1, 0x77, 0x50, 0x2c, 0x7f, 0xf0, 0xf3, 0x62, 0x6a, 0xca, 0xff, 0x89, 0xca, 0xff, 0x31, 0xfb, 0x4c, 0xbd, 0x57, 0x8d, 0xc9, 0xff, 0xa9, 0xd6, 0x0f, 0x96, 0x5f, 0xfa, 0x72, 0x6a, 0xca, 0xff, 0x43, 0x6b, 0x10, 0xd5, 0xa7, 0x01, 0x8e, 0xcb, 0xf1, 0xfc, 0x3f, 0xb0, 0xe6, 0xf4, 0x14, 0x4c, 0x30, 0x7c, 0xcf, 0x90, 0xff, 0xfb, 0x6b, 0x8a, 0xf9, 0xc0, 0xe9, 0xf9, 0x3f, 0x19, 0xae, 0x3f, 0x1a, 0xbf, 0x67, 0xc8, 0xff, 0xa9, 0xba, 0x3c, 0x2c, 0xa2, 0xef, 0x7e, 0x54, 0xe1, 0x42, 0x09, 0x9e, 0xdf, 0x05, 0xc2, 0x8b, 0xe3, 0xfa, 0xa3, 0x3e, 0xcc, 0xf8, 0x9b, 0xfc, 0x4b, 0x97, 0x53, 0x62, 0xe8, 0x9f, 0x51, 0x0d, 0xc7, 0xd0, 0xbb, 0xa1, 0x36, 0xb7, 0xe8, 0xfc, 0x68, 0x20, 0xfe, 0x8d, 0xfe, 0xad, 0x08, 0xdb, 0xbf, 0xa8, 0x7a, 0x2f, 0xa5, 0x48, 0x9e, 0x16, 0x7e, 0xf5, 0xe3, 0xc8, 0xf8, 0x38, 0x1b, 0xe5, 0xfe, 0x51, 0x7d, 0x2f, 0x6e, 0xa5, 0x9c, 0x45, 0xe5, 0x2c, 0xb4, 0xbe, 0x58, 0xfc, 0xea, 0x6b, 0x4f, 0x89, 0x19, 0x7f, 0x34, 0xff, 0x8b, 0xe8, 0x53, 0x74, 0xfd, 0x99, 0x21, 0x7e, 0xc3, 0xeb, 0x8b, 0xe6, 0xef, 0x63, 0xc6, 0x1f, 0x90, 0xb1, 0x31, 0xfa, 0x2a, 0x77, 0x0a, 0x9f, 0x3f, 0xba, 0x1e, 0x43, 0xf1, 0x09, 0xd9, 0xa6, 0xd8, 0xf7, 0xc5, 0x51, 0xec, 0x99, 0xde, 0xff, 0x89, 0xe1, 0xfd, 0xff, 0xab, 0xce, 0xff, 0x23, 0xe3, 0x33, 0xec, 0x39, 0x91, 0x1c, 0x9b, 0x78, 0x44, 0x90, 0xef, 0x07, 0x32, 0x77, 0x52, 0x72, 0x74, 0x7f, 0x94, 0xfa, 0xaa, 0x1b, 0x8e, 0x4c, 0x60, 0x8c, 0xfd, 0xd1, 0x37, 0x62, 0xaa, 0xf4, 0x91, 0x8f, 0xde, 0xfe, 0x77, 0x05, 0xd3, 0xf9, 0xaa, 0xc6, 0x47, 0xb4, 0xb3, 0xc8, 0x38, 0x7e, 0xf4, 0x1f, 0x00, 0xaa, 0x5f, 0x86, 0xac, 0x15, 0xd3, 0x0d, 0x79, 0xa4, 0x63, 0xe4, 0x35, 0xd1, 0x40, 0x1f, 0x63, 0x37, 0x00, 0x86, 0xe7, 0xff, 0xbe, 0xff, 0x62, 0xf9, 0xff, 0xd8, 0xf1, 0x6b, 0xf3, 0x67, 0x84, 0xa2, 0x09, 0x7a, 0x18, 0x3f, 0x76, 0x2a, 0xfe, 0xd4, 0xa0, 0x6f, 0x70, 0x25, 0x95, 0xdf, 0x63, 0xb9, 0x73, 0x04, 0x3b, 0x86, 0x9d, 0x71, 0xe3, 0xfd, 0x63, 0x28, 0x67, 0x38, 0xfe, 0xfa, 0x1e, 0x80, 0xbd, 0xab, 0x0e, 0xd7, 0xc5, 0xf7, 0x13, 0x83, 0x7d, 0xcc, 0x7f, 0x46, 0xdf, 0xd8, 0xb5, 0xb9, 0xfc, 0x4f, 0xf2, 0xff, 0x0b, 0x33, 0x84, 0xbc, 0x12, 0x8b, 0x5f, 0x9a, 0xfe, 0xda, 0x65, 0xfa, 0x8d, 0x6f, 0x7e, 0xeb, 0xdb, 0xaf, 0x7d, 0xe7, 0xbb, 0x57, 0x2e, 0xfe, 0xee, 0x1c, 0xa9, 0xac, 0xda, 0xeb, 0x76, 0x26, 0xfe, 0x8b, 0x78, 0x2c, 0x5b, 0x2d, 0x95, 0x8b, 0xa5, 0x4c, 0x3c, 0x06, 0xf7, 0xb1, 0xf2, 0x46, 0x29, 0x5f, 0xb1, 0x33, 0xf3, 0xd7, 0xe7, 0xa0, 0xb2, 0x91, 0xff, 0xa9, 0xbd, 0xb6, 0xb9, 0x61, 0x97, 0x6e, 0xda, 0xd9, 0x4a, 0x66, 0xb7, 0xbd, 0x57, 0x87, 0xd6, 0xfd, 0xb9, 0x38, 0xe8, 0x14, 0x73, 0xb6, 0xa5, 0x54, 0xde, 0x58, 0xb1, 0x44, 0xc9, 0x48, 0x95, 0x72, 0xa5, 0x94, 0x2f, 0xac, 0x40, 0x65, 0x51, 0xd4, 0x0a, 0xd5, 0xf5, 0x37, 0xec, 0x12, 0xd4, 0xd2, 0xa2, 0xf6, 0xa6, 0x7d, 0xe7, 0x76, 0xb1, 0x94, 0xcb, 0xdc, 0x10, 0x95, 0xe5, 0x8d, 0xbc, 0xa7, 0x25, 0xd5, 0xb2, 0xc5, 0xf5, 0x75, 0xbb, 0x50, 0xc9, 0xfc, 0x40, 0xda, 0xc8, 0xaf, 0x14, 0xa4, 0x28, 0x25, 0x6a, 0xb7, 0x96, 0x4b, 0xde, 0x83, 0xdf, 0x17, 0xb5, 0x22, 0x8c, 0x1b, 0xea, 0x19, 0x29, 0x2a, 0xdb, 0x6b, 0x30, 0x30, 0x2b, 0x23, 0xad, 0x7b, 0xd3, 0xb0, 0x3c, 0xeb, 0xe5, 0xd5, 0xe5, 0x5c, 0xf1, 0xb6, 0x15, 0x18, 0xf3, 0xca, 0xf2, 0xba, 0xbd, 0xb1, 0x9c, 0x53, 0xa3, 0xae, 0x14, 0xab, 0xd9, 0x55, 0xb8, 0x97, 0x95, 0xd8, 0xf2, 0xda, 0xc6, 0xea, 0x72, 0xe6, 0xfa, 0x0f, 0xa5, 0xd9, 0x7d, 0x4f, 0x63, 0x3f, 0x1e, 0xcf, 0xae, 0xda, 0xd9, 0x37, 0x37, 0x0b, 0xf6, 0xed, 0xcd, 0x5b, 0x76, 0xa9, 0x9c, 0x2f, 0x16, 0x32, 0x4e, 0x6d, 0xbb, 0x53, 0x8f, 0x17, 0x8a, 0x9b, 0xe5, 0x62, 0xb5, 0x90, 0x53, 0xd5, 0x95, 0xfc, 0xcd, 0xcd, 0x35, 0xbb, 0xb0, 0x52, 0x59, 0xcd, 0x2c, 0xa4, 0xac, 0xf9, 0x79, 0xab, 0xd1, 0xb4, 0x3a, 0xf5, 0xad, 0x56, 0xf3, 0x5e, 0x47, 0xca, 0xca, 0xd9, 0xe5, 0x35, 0x3b, 0xb3, 0x10, 0x8f, 0x83, 0x68, 0xaf, 0x53, 0xb7, 0x6e, 0xd5, 0xdb, 0xbb, 0x8d, 0xad, 0xda, 0xb6, 0x55, 0x7e, 0xaf, 0xb9, 0xf5, 0xa0, 0xdd, 0x6a, 0x36, 0x1e, 0xd5, 0x76, 0x1b, 0xad, 0xa6, 0x90, 0x37, 0x1c, 0xab, 0xf6, 0x6e, 0xad, 0x51, 0x7b, 0x7b, 0xbb, 0x1e, 0xaf, 0x96, 0xed, 0xcd, 0x5b, 0xe5, 0x3b, 0x85, 0xac, 0x9c, 0x87, 0x54, 0xef, 0x3c, 0x68, 0x3d, 0xb4, 0x44, 0x93, 0xb5, 0x5d, 0x7b, 0xbb, 0xbe, 0x6d, 0x89, 0xb6, 0x87, 0x0f, 0xea, 0x4d, 0xab, 0x92, 0xcf, 0x5a, 0xf7, 0xda, 0xad, 0x77, 0x3a, 0xd6, 0x8d, 0xd4, 0xea, 0x23, 0xcb, 0x69, 0xd7, 0x76, 0xea, 0x9d, 0x78, 0x79, 0xb5, 0x78, 0x7b, 0x53, 0x5a, 0xf0, 0x46, 0x0a, 0x8f, 0x1b, 0x4b, 0xdc, 0xd9, 0x6b, 0x6e, 0x89, 0x61, 0x08, 0x5b, 0xb3, 0x57, 0xe3, 0xb1, 0xad, 0xed, 0x8e, 0x60, 0xdb, 0x2d, 0x31, 0x54, 0xd9, 0x5d, 0x26, 0x59, 0x79, 0xd0, 0xe8, 0x58, 0xf0, 0xd7, 0x79, 0xaf, 0xb3, 0x5b, 0xdf, 0xb1, 0x60, 0x8e, 0x4e, 0xe3, 0xfe, 0x5e, 0x5b, 0x0e, 0xdf, 0xda, 0xaa, 0xb5, 0x77, 0xdb, 0x8d, 0x7b, 0xf7, 0xeb, 0x49, 0x5f, 0xab, 0xd3, 0x78, 0x54, 0xcf, 0xbc, 0xd3, 0x6e, 0x34, 0x77, 0x67, 0xa5, 0x81, 0xb9, 0xd4, 0xdc, 0xfc, 0x0d, 0xb0, 0xa9, 0x37, 0xcd, 0x2e, 0x2c, 0xa6, 0xe6, 0xc5, 0x83, 0x57, 0xaf, 0x5d, 0x5b, 0x98, 0x9b, 0xbd, 0x9e, 0xbe, 0x01, 0x8f, 0xc0, 0xed, 0xd5, 0x78, 0xbd, 0x79, 0x2f, 0xf6, 0x27, 0x42, 0x2e, 0xca, 0x8b, 0xc6, 0xc4, 0x75, 0x49, 0x5e, 0xf2, 0x9e, 0x9c, 0xe5, 0x3a, 0x27, 0x23, 0xe1, 0xbc, 0xb8, 0x2e, 0xc0, 0xf5, 0x32, 0x5c, 0xd3, 0xe7, 0xa7, 0x63, 0x24, 0x78, 0x4d, 0x87, 0x2e, 0xdd, 0xc2, 0x79, 0x30, 0xf1, 0x3e, 0xb9, 0x4c, 0x2e, 0x4f, 0x5d, 0x9e, 0x3a, 0x5b, 0x9f, 0xe1, 0xeb, 0x42, 0x3c, 0xe5, 0x9f, 0xb2, 0xde, 0x7b, 0x8e, 0xe0, 0x33, 0x0b, 0x95, 0x77, 0x7f, 0xf3, 0xc7, 0x4f, 0x5f, 0x9c, 0xfc, 0xe5, 0xf7, 0xbf, 0xbc, 0x6f, 0x7f, 0x6f, 0xca, 0xaf, 0xfb, 0x7c, 0x1a, 0x74, 0xbe, 0x3e, 0xfd, 0x5a, 0xee, 0xf5, 0xc5, 0xd4, 0xe2, 0x4e, 0xe1, 0x27, 0x85, 0x0f, 0xd6, 0x52, 0x8b, 0xf5, 0xd7, 0xff, 0x76, 0x73, 0x75, 0xef, 0xe7, 0xb5, 0x3b, 0xfb, 0x7f, 0xfd, 0x78, 0x7f, 0xee, 0x83, 0x5f, 0xff, 0x76, 0xe7, 0x70, 0xee, 0xe3, 0xc3, 0xde, 0xce, 0x9f, 0x3f, 0xfa, 0xe4, 0xef, 0x6f, 0xfd, 0xd3, 0xfd, 0xc7, 0x7f, 0x00, 0xdf, 0xd5, 0x25, 0x20, \ No newline at end of file +0x78, 0xda, 0xed, 0x59, 0x4d, 0x6c, 0x1b, 0xc7, 0x15, 0x1e, 0xf9, 0x27, 0x09, 0xd7, 0xaa, 0x47, 0x04, 0x8a, 0x20, 0x4d, 0xd3, 0x7a, 0xc1, 0xe6, 0x20, 0x03, 0x12, 0x4c, 0x8b, 0x8a, 0x1b, 0x08, 0x60, 0x50, 0x85, 0x5c, 0x8b, 0x6c, 0x24, 0x52, 0xe0, 0x8f, 0x5d, 0xc3, 0x40, 0x54, 0x46, 0xe6, 0xda, 0x04, 0x24, 0x32, 0x21, 0xa5, 0x18, 0x71, 0x21, 0x20, 0x30, 0x10, 0x80, 0x39, 0x29, 0x07, 0x17, 0x28, 0x4f, 0x4c, 0xe1, 0x4b, 0xa1, 0x5e, 0x7a, 0xd1, 0xa5, 0x3c, 0x08, 0xed, 0x31, 0x40, 0x8b, 0x22, 0x28, 0x7a, 0x08, 0x82, 0x5e, 0x8a, 0x5c, 0x57, 0x73, 0x32, 0x6a, 0x04, 0xf0, 0x74, 0x66, 0x76, 0x96, 0x9c, 0x9d, 0x7d, 0x43, 0xa9, 0x40, 0x92, 0x02, 0x05, 0x67, 0xf5, 0xf8, 0x76, 0xe6, 0xed, 0x7b, 0xf3, 0xf3, 0xbd, 0x37, 0xb3, 0x6f, 0x35, 0xf5, 0xe9, 0x73, 0xe8, 0x19, 0x65, 0x25, 0x91, 0x48, 0xec, 0x77, 0xbb, 0xdd, 0x7d, 0xce, 0x59, 0x75, 0x9f, 0x92, 0x21, 0x51, 0x7a, 0xec, 0x25, 0x12, 0xd4, 0xeb, 0x76, 0x89, 0x97, 0x78, 0x48, 0x3c, 0xba, 0x4f, 0x28, 0xd9, 0x27, 0x24, 0x20, 0xa1, 0x1f, 0x8f, 0xc7, 0x5b, 0xae, 0xeb, 0xb6, 0x38, 0x67, 0xd5, 0x16, 0xd3, 0x0b, 0x88, 0xeb, 0xc7, 0xe3, 0xd4, 0x73, 0x5d, 0xe2, 0xc5, 0x6b, 0x4c, 0xbf, 0x45, 0x3c, 0xe2, 0xd3, 0x31, 0x69, 0x21, 0x2a, 0xf4, 0xb3, 0xd9, 0x6c, 0xbf, 0xd7, 0xeb, 0xf5, 0x39, 0x67, 0xd5, 0x3e, 0x66, 0xc4, 0x74, 0xfb, 0x52, 0x3f, 0x9b, 0xa5, 0x5e, 0xaf, 0x47, 0xbc, 0xec, 0x23, 0xa6, 0xdf, 0x27, 0x1e, 0x66, 0x44, 0xfa, 0x4c, 0xbf, 0x2f, 0xf5, 0xab, 0xd5, 0xea, 0xd1, 0x60, 0x30, 0x38, 0xe2, 0x9c, 0x55, 0x05, 0x61, 0x84, 0x39, 0xe7, 0xfa, 0xd5, 0x2a, 0xf5, 0x06, 0x03, 0xe2, 0x55, 0x0f, 0x99, 0xfe, 0x11, 0xb3, 0x79, 0x44, 0x08, 0x62, 0xc4, 0xf9, 0xa7, 0x07, 0x07, 0xd6, 0x01, 0x2f, 0x4b, 0x8f, 0x0f, 0x0e, 0x52, 0xa9, 0x83, 0xa5, 0x54, 0xea, 0x31, 0xaf, 0xb2, 0x9f, 0xa5, 0x64, 0x2a, 0x75, 0x36, 0x90, 0x8b, 0x76, 0x26, 0x17, 0xcf, 0x45, 0xe4, 0x8f, 0xa5, 0xbe, 0xe4, 0xac, 0x1e, 0x92, 0x2f, 0x49, 0xfb, 0x4b, 0x52, 0x7f, 0x69, 0xa4, 0xff, 0x87, 0xc1, 0xe0, 0xc2, 0xe0, 0xf6, 0xe1, 0x60, 0x70, 0x78, 0xdb, 0xa7, 0x6a, 0x55, 0x70, 0xd6, 0x72, 0x7b, 0xbd, 0x5a, 0x3d, 0xff, 0x4b, 0xd7, 0x7d, 0xce, 0x8d, 0xd7, 0x5c, 0xb7, 0xf6, 0xa2, 0xab, 0x72, 0x76, 0xf7, 0xe2, 0x4c, 0x3c, 0x3e, 0xf5, 0x61, 0xb7, 0xfb, 0x42, 0xf7, 0xe1, 0x6c, 0x57, 0xd0, 0xec, 0xc3, 0x6e, 0x70, 0xcf, 0xee, 0x66, 0xed, 0x44, 0xe2, 0xcc, 0x27, 0xbd, 0x5e, 0xac, 0xf7, 0x28, 0xdf, 0x13, 0x94, 0xcf, 0xb2, 0x55, 0xe6, 0xfc, 0x51, 0xef, 0x11, 0xfb, 0xfd, 0x59, 0x36, 0x7b, 0x4e, 0xe0, 0xcd, 0xb1, 0x17, 0xd7, 0xbf, 0xc5, 0xfd, 0x15, 0xe6, 0x07, 0x14, 0x11, 0xbe, 0xb6, 0xcf, 0xe8, 0x3e, 0xa2, 0x0c, 0xfb, 0xe3, 0x7d, 0x86, 0x7f, 0x57, 0x12, 0xf7, 0x07, 0x44, 0x8e, 0x3d, 0x4a, 0x3d, 0x4f, 0xe0, 0xcd, 0xb1, 0x77, 0x9f, 0x30, 0xce, 0x2f, 0xd7, 0xbd, 0xc4, 0xfc, 0x60, 0xa8, 0xdf, 0x22, 0x84, 0x61, 0x2f, 0xa8, 0xe5, 0x12, 0x2a, 0xfc, 0x20, 0x3e, 0xd2, 0x17, 0x78, 0x73, 0xec, 0x9f, 0x3e, 0x7d, 0xda, 0xef, 0xf5, 0xfb, 0xfc, 0xbe, 0xc8, 0xfc, 0x60, 0xa8, 0xdf, 0x27, 0x84, 0x61, 0x4f, 0x9e, 0x32, 0xea, 0xf7, 0x08, 0x15, 0x7e, 0x90, 0x1d, 0xe9, 0x0b, 0xac, 0x39, 0xf6, 0x03, 0xce, 0xbf, 0x16, 0xf7, 0x1b, 0xcc, 0x0f, 0x86, 0xfa, 0x47, 0x88, 0x32, 0xec, 0x8f, 0x8f, 0x18, 0xfe, 0x03, 0x49, 0xdc, 0x1f, 0x02, 0x7d, 0xc4, 0x8a, 0xc9, 0x07, 0x78, 0xbb, 0x2a, 0xd7, 0x7d, 0x20, 0x2c, 0x8f, 0xfa, 0x40, 0x48, 0x0e, 0xf8, 0x40, 0x20, 0x37, 0xf9, 0x00, 0x6f, 0xe7, 0x72, 0x93, 0x0f, 0xf0, 0x76, 0x2e, 0x37, 0xf9, 0x00, 0x6f, 0xe7, 0x72, 0x93, 0x0f, 0xf0, 0x76, 0x30, 0x7e, 0x45, 0x71, 0x5b, 0x2d, 0xfa, 0x44, 0x8f, 0x5f, 0xca, 0xf1, 0x6c, 0x71, 0x4c, 0x19, 0x3d, 0x61, 0x84, 0xd0, 0x4c, 0x9c, 0xfd, 0xc5, 0x11, 0xd3, 0x9d, 0x91, 0x14, 0x2a, 0xac, 0x7f, 0xfe, 0xc3, 0x5c, 0x95, 0x3f, 0x12, 0xd0, 0x54, 0x40, 0x6f, 0x57, 0x3d, 0xef, 0xf0, 0xeb, 0xaf, 0xbc, 0xc3, 0x81, 0x4f, 0xbc, 0xae, 0x16, 0x34, 0x29, 0xdf, 0x6a, 0x19, 0xc5, 0x2f, 0xe7, 0x4f, 0x68, 0x34, 0x7e, 0x11, 0x8f, 0xd9, 0x63, 0x16, 0xbb, 0xc2, 0x07, 0xf4, 0xf8, 0x0d, 0x60, 0x0e, 0xb0, 0x17, 0x00, 0x73, 0x7f, 0xe0, 0x7e, 0x21, 0xb0, 0x1f, 0x62, 0x2d, 0xb1, 0x9f, 0xf2, 0xfd, 0x41, 0xf6, 0xff, 0x46, 0xca, 0xf3, 0x3a, 0xf7, 0xff, 0x35, 0x24, 0x5e, 0x57, 0xcb, 0x99, 0xcf, 0x2e, 0x4d, 0x40, 0x9a, 0x94, 0x49, 0x99, 0x14, 0x73, 0xa1, 0x0a, 0x21, 0x85, 0xcb, 0xc2, 0x4f, 0x29, 0x4e, 0xa6, 0xc2, 0x65, 0x94, 0xe2, 0x10, 0x0f, 0xc9, 0x59, 0x1b, 0xc6, 0x9c, 0xb3, 0x0a, 0xbb, 0xa1, 0x9a, 0x7d, 0x26, 0x65, 0x42, 0x71, 0x23, 0x19, 0x0e, 0xeb, 0xfb, 0x6a, 0x88, 0xb0, 0x1f, 0x4c, 0x7c, 0xae, 0x19, 0x40, 0x64, 0xdc, 0xfc, 0xa4, 0x3c, 0x20, 0xcd, 0xfc, 0xa8, 0x0d, 0x1b, 0x6c, 0x61, 0xde, 0x3f, 0x16, 0xe3, 0xe7, 0x5c, 0xd7, 0x1f, 0xf6, 0x41, 0x11, 0x2c, 0x53, 0xfb, 0xc2, 0xe6, 0xf1, 0x12, 0x7a, 0x32, 0x54, 0x04, 0x4b, 0x1b, 0xd0, 0x04, 0x47, 0x2c, 0x62, 0x97, 0xb2, 0xd6, 0x80, 0x22, 0xfd, 0x50, 0xd9, 0x37, 0x0d, 0xee, 0xc3, 0x16, 0x04, 0x5e, 0x04, 0x4b, 0x3b, 0x3e, 0xc6, 0x61, 0xb9, 0x1c, 0x14, 0x5f, 0x1f, 0x62, 0xb6, 0x4f, 0x49, 0xf0, 0x2c, 0x8a, 0xe8, 0x53, 0xa5, 0x1f, 0xdd, 0x3f, 0x46, 0xfd, 0x22, 0x70, 0xfc, 0x6a, 0xff, 0x92, 0x81, 0xf3, 0x27, 0x06, 0xfd, 0x51, 0xbb, 0x0f, 0x4e, 0x44, 0xae, 0xac, 0x39, 0xb4, 0xfe, 0xba, 0x3c, 0x82, 0xaf, 0x82, 0x8d, 0x00, 0x87, 0x98, 0xb1, 0x87, 0x7c, 0x20, 0xa4, 0x07, 0xf8, 0x0e, 0x51, 0xe6, 0x0f, 0xc6, 0xaf, 0xf4, 0x5b, 0x4c, 0xfd, 0xc8, 0x32, 0xcd, 0x5f, 0x10, 0xf5, 0xb9, 0x8e, 0xbf, 0x2f, 0x1b, 0x71, 0x58, 0xdf, 0x84, 0x4f, 0xd8, 0xff, 0x28, 0x35, 0xe3, 0x6f, 0xf2, 0xaf, 0x90, 0x1c, 0x98, 0xbf, 0x68, 0x27, 0x58, 0xc1, 0x51, 0x75, 0xbf, 0xf0, 0xdc, 0xf4, 0xf9, 0x89, 0xe7, 0xc7, 0xfa, 0x3f, 0x1e, 0x82, 0x4c, 0x01, 0xff, 0x16, 0x36, 0xb9, 0x6f, 0x63, 0xe9, 0xe3, 0xfa, 0xfa, 0xe9, 0xa4, 0xdb, 0x27, 0x72, 0x6c, 0x62, 0x9f, 0xc4, 0x91, 0xfd, 0x4f, 0xd8, 0xc7, 0xf2, 0x19, 0x02, 0x8d, 0x7f, 0x7c, 0x7c, 0x87, 0xd6, 0x9f, 0x9a, 0xe3, 0x23, 0xac, 0x8f, 0xc7, 0xe8, 0x47, 0xd7, 0x8f, 0x06, 0xfb, 0x1f, 0x85, 0xfc, 0x03, 0x47, 0x17, 0x01, 0xc2, 0xc7, 0x34, 0x7e, 0x5d, 0x86, 0xa3, 0xe7, 0x07, 0xc6, 0xa3, 0x35, 0xa4, 0x04, 0xc6, 0x5f, 0x9d, 0x67, 0x38, 0x7e, 0xb1, 0x4f, 0xea, 0x38, 0x75, 0xfc, 0x95, 0xbd, 0x45, 0xc7, 0x8f, 0x68, 0xe7, 0x0b, 0x89, 0x1e, 0x4f, 0x5a, 0xec, 0x63, 0xf0, 0x4c, 0x18, 0x9e, 0x3f, 0x18, 0xd8, 0xde, 0x49, 0xf4, 0x5c, 0x34, 0x9e, 0x11, 0x14, 0xc3, 0xfb, 0xc7, 0x09, 0x3a, 0x7c, 0xef, 0xf6, 0xf7, 0x6f, 0xc0, 0x7f, 0x35, 0x1f, 0x80, 0xf4, 0xc5, 0x32, 0xe1, 0x68, 0xff, 0x48, 0xda, 0x34, 0xd9, 0x1f, 0xfa, 0x20, 0x51, 0xfc, 0x28, 0x34, 0x00, 0xec, 0xaf, 0xbd, 0xe4, 0x04, 0xc3, 0xfb, 0x27, 0x96, 0x71, 0x84, 0xb4, 0x18, 0xa5, 0xc0, 0x1e, 0x14, 0x99, 0x20, 0x1a, 0x9d, 0x81, 0xd0, 0xf8, 0xd5, 0x8d, 0x1e, 0x43, 0xf6, 0xd5, 0xfd, 0x11, 0xc0, 0x57, 0x25, 0x04, 0xcc, 0x3f, 0x38, 0x1b, 0x45, 0xfc, 0x63, 0x40, 0x3e, 0x6e, 0xfc, 0x5a, 0x0c, 0x43, 0x67, 0xc8, 0xc9, 0x7b, 0x80, 0x86, 0x0f, 0x31, 0x9c, 0x01, 0xc0, 0xfe, 0xab, 0xe2, 0x0f, 0xc6, 0xbf, 0x8e, 0x1d, 0x30, 0xff, 0xa0, 0x6f, 0x93, 0x7f, 0x0c, 0xc7, 0x4e, 0x40, 0xf5, 0xf0, 0x1e, 0x40, 0xa0, 0xf5, 0xf5, 0xd7, 0x25, 0xf0, 0x33, 0x53, 0xff, 0x04, 0xf0, 0x9f, 0xc8, 0x1e, 0x40, 0x01, 0xff, 0xc1, 0x4a, 0x1c, 0xd3, 0x68, 0xfc, 0x46, 0x08, 0x8a, 0x7f, 0x6a, 0x88, 0x7f, 0xe4, 0xbf, 0x00, 0x13, 0x32, 0x49, 0x55, 0x26, 0x65, 0x52, 0x26, 0xe5, 0x1b, 0x2e, 0xfa, 0xbe, 0x84, 0xff, 0xcf, 0xf2, 0x7f, 0xa2, 0xcd, 0x91, 0x7c, 0xc3, 0xf9, 0xbf, 0xd4, 0x13, 0xe7, 0x02, 0x3e, 0xe1, 0x5d, 0x6b, 0xcc, 0x58, 0x29, 0xc5, 0xa7, 0xc7, 0xeb, 0xbf, 0xcc, 0xff, 0xc5, 0xf9, 0x86, 0x0d, 0xef, 0x07, 0x38, 0xfc, 0x0e, 0x0a, 0xe5, 0x0f, 0x41, 0x5e, 0x8c, 0x4d, 0xf9, 0x3f, 0x92, 0xf9, 0x3f, 0x64, 0x9f, 0xc8, 0xf7, 0xaa, 0x31, 0xf9, 0x3f, 0x56, 0xfa, 0x81, 0xf2, 0xcb, 0x40, 0x8e, 0x4d, 0xf9, 0xbf, 0xb6, 0x06, 0x51, 0x7d, 0x1c, 0xe2, 0xb0, 0x1c, 0xce, 0xff, 0x43, 0x6b, 0x8e, 0x4f, 0xc0, 0x04, 0xc2, 0xf7, 0x14, 0xf9, 0x7f, 0xb0, 0xa6, 0x90, 0x0f, 0x9c, 0x9c, 0xff, 0xa3, 0xe1, 0xfa, 0x83, 0xf1, 0x7b, 0x8a, 0xfc, 0x1f, 0xcb, 0xcb, 0xc7, 0x22, 0xfa, 0xee, 0x87, 0x25, 0x2e, 0x18, 0xc1, 0xf9, 0x5d, 0x28, 0xbc, 0x28, 0xac, 0x3f, 0xea, 0xc3, 0x8c, 0xbf, 0xc9, 0xbf, 0x54, 0x39, 0x46, 0x86, 0xfe, 0x09, 0x56, 0x70, 0xd4, 0xde, 0x0d, 0x95, 0xb9, 0x45, 0xe7, 0x87, 0x43, 0xf1, 0x6f, 0xf4, 0x6f, 0x49, 0xd0, 0xfe, 0x85, 0xe5, 0x7b, 0x29, 0x06, 0xf2, 0x34, 0xfd, 0xd5, 0x8f, 0x02, 0xe3, 0xa3, 0x64, 0x94, 0xfb, 0x47, 0xf5, 0xfd, 0xb8, 0x15, 0x72, 0x12, 0x95, 0x13, 0x6d, 0x7d, 0xa1, 0xf8, 0x55, 0xd7, 0x1e, 0x23, 0x33, 0xfe, 0x60, 0xfe, 0x17, 0xd1, 0xc7, 0xe0, 0xfa, 0x13, 0x43, 0xfc, 0xea, 0xeb, 0x0b, 0xe6, 0xef, 0x63, 0xc6, 0x1f, 0x92, 0x91, 0x31, 0xfa, 0x32, 0x77, 0xd2, 0xcf, 0x1f, 0x55, 0x8f, 0x80, 0xf8, 0x68, 0xb6, 0x31, 0xf4, 0x7d, 0x71, 0x14, 0x7b, 0xa6, 0xf7, 0x7f, 0x64, 0x78, 0xff, 0xff, 0xae, 0xf3, 0xff, 0xc8, 0xf8, 0x0c, 0x7b, 0x4e, 0x24, 0xc7, 0x46, 0x3e, 0x21, 0xe0, 0xfb, 0x81, 0xc8, 0x9d, 0xa4, 0x1c, 0xdc, 0x1f, 0x85, 0xbe, 0xec, 0x86, 0x02, 0x13, 0x18, 0x63, 0x7f, 0xf4, 0x8d, 0x18, 0x4b, 0x7d, 0xe0, 0xa3, 0x77, 0xf0, 0x5d, 0xc1, 0x74, 0xbe, 0xca, 0xf1, 0x21, 0xe5, 0x2c, 0x32, 0x8e, 0x1f, 0xfc, 0x07, 0x80, 0xec, 0x97, 0x00, 0x6b, 0x45, 0x54, 0x43, 0x3e, 0xa9, 0x18, 0xf9, 0x4d, 0x38, 0xd4, 0xc7, 0xd8, 0x0d, 0x80, 0xc0, 0xf9, 0x7f, 0xe0, 0xbf, 0x50, 0xfe, 0x3f, 0x76, 0xfc, 0xca, 0xfc, 0x09, 0xc2, 0x60, 0x82, 0xae, 0xe3, 0x47, 0x4e, 0xc4, 0x1f, 0x1b, 0xf4, 0x0d, 0xae, 0x24, 0xf3, 0x7b, 0x28, 0x77, 0x8e, 0x60, 0x47, 0xa0, 0x33, 0x6e, 0xbc, 0x7f, 0x0c, 0xe5, 0x04, 0xc6, 0x5f, 0xdd, 0x03, 0xa0, 0x77, 0xd5, 0xe1, 0xba, 0x04, 0x7e, 0x62, 0xb0, 0x0f, 0xf9, 0xcf, 0xe8, 0x1b, 0xbb, 0x32, 0x97, 0xff, 0x49, 0xfe, 0x7f, 0x6e, 0x06, 0xa1, 0x17, 0x62, 0xd6, 0x85, 0xe9, 0xef, 0x5d, 0xc4, 0x2f, 0xfd, 0xe0, 0xe5, 0x1f, 0xbe, 0xf2, 0xa3, 0x1f, 0x5f, 0x3a, 0xff, 0xbb, 0x33, 0xa8, 0x92, 0x73, 0xd6, 0x9c, 0xb4, 0xf5, 0x2b, 0x2b, 0x96, 0xa9, 0x96, 0xca, 0xc5, 0x52, 0xda, 0x8a, 0xb1, 0xfb, 0x58, 0x79, 0xbd, 0x94, 0xaf, 0x38, 0xe9, 0xf9, 0xab, 0x73, 0xac, 0xb2, 0x9e, 0xff, 0x85, 0xb3, 0xba, 0xb1, 0xee, 0x94, 0xae, 0x3b, 0x99, 0x4a, 0x7a, 0xa7, 0xbd, 0x5b, 0x67, 0xad, 0x7b, 0x73, 0x16, 0xd3, 0x29, 0x66, 0x1d, 0x5b, 0xaa, 0xbc, 0xb9, 0x62, 0xf3, 0x92, 0x16, 0x2a, 0xe5, 0x4a, 0x29, 0x5f, 0x58, 0x61, 0x95, 0x45, 0x5e, 0x2b, 0x54, 0xd7, 0xde, 0x74, 0x4a, 0xac, 0x96, 0xe2, 0xb5, 0xb7, 0x9c, 0x5b, 0x37, 0x8b, 0xa5, 0x6c, 0xfa, 0x1a, 0xaf, 0x2c, 0xaf, 0xe7, 0x7d, 0x2d, 0xa1, 0x96, 0x29, 0xae, 0xad, 0x39, 0x85, 0x4a, 0xfa, 0xa7, 0xc2, 0x46, 0x7e, 0xa5, 0x20, 0x44, 0x49, 0x5e, 0xbb, 0xb1, 0x5c, 0xf2, 0x1f, 0x7c, 0x8d, 0xd7, 0x8a, 0x6c, 0xdc, 0xac, 0x9e, 0x16, 0xa2, 0xb2, 0xb3, 0xca, 0x06, 0x66, 0xa7, 0x85, 0x75, 0x7f, 0x1a, 0xb6, 0x6f, 0xbd, 0x9c, 0x5b, 0xce, 0x16, 0x6f, 0xda, 0xa1, 0x31, 0xaf, 0x2c, 0xaf, 0x39, 0xeb, 0xcb, 0x59, 0x39, 0xea, 0x4a, 0xb1, 0x9a, 0xc9, 0xb1, 0x7b, 0x51, 0x89, 0x2d, 0xaf, 0xae, 0xe7, 0x96, 0xd3, 0x57, 0x5f, 0x17, 0x66, 0xf7, 0x7c, 0x8d, 0x3d, 0xcb, 0xca, 0xe4, 0x9c, 0xcc, 0x5b, 0x1b, 0x05, 0xe7, 0xe6, 0xc6, 0x0d, 0xa7, 0x54, 0xce, 0x17, 0x0b, 0x69, 0xb7, 0xb6, 0xd5, 0xa9, 0x5b, 0x85, 0xe2, 0x46, 0xb9, 0x58, 0x2d, 0x64, 0x65, 0x75, 0x25, 0x7f, 0x7d, 0x63, 0xd5, 0x29, 0xac, 0x54, 0x72, 0xe9, 0x85, 0xa4, 0x3d, 0x3f, 0x6f, 0x37, 0x9a, 0x76, 0xa7, 0xbe, 0xd9, 0x6a, 0xde, 0xe9, 0x08, 0x59, 0x39, 0xb3, 0xbc, 0xea, 0xa4, 0x17, 0x2c, 0x8b, 0x89, 0x76, 0x3b, 0x75, 0xfb, 0x46, 0xbd, 0xbd, 0xd3, 0xd8, 0xac, 0x6d, 0xd9, 0xe5, 0x0f, 0x9a, 0x9b, 0xf7, 0xda, 0xad, 0x66, 0xe3, 0x41, 0x6d, 0xa7, 0xd1, 0x6a, 0x72, 0x79, 0xc3, 0xb5, 0x6b, 0xef, 0xd7, 0x1a, 0xb5, 0x77, 0xb6, 0xea, 0x56, 0xb5, 0xec, 0x6c, 0xdc, 0x28, 0xdf, 0x2a, 0x64, 0x64, 0x3f, 0x5c, 0xde, 0xb9, 0xd7, 0xba, 0x6f, 0xf3, 0x36, 0x7b, 0xab, 0xf6, 0x4e, 0x7d, 0xcb, 0xe6, 0x6d, 0xf7, 0xef, 0xd5, 0x9b, 0x76, 0x25, 0x9f, 0xb1, 0xef, 0xb4, 0x5b, 0xef, 0x76, 0xec, 0x6b, 0xc9, 0xdc, 0x03, 0xdb, 0x6d, 0xd7, 0xb6, 0xeb, 0x1d, 0xab, 0x9c, 0x2b, 0xde, 0xdc, 0x08, 0x9b, 0x30, 0x16, 0xcb, 0xdd, 0x6d, 0x6e, 0xf2, 0x71, 0x70, 0x5b, 0xb3, 0x97, 0xad, 0xd8, 0xe6, 0x56, 0x87, 0xb3, 0xad, 0x16, 0x1f, 0xab, 0xe8, 0x2e, 0x9d, 0xa8, 0xdc, 0x6b, 0x74, 0x6c, 0xf6, 0xd7, 0xf9, 0xa0, 0xb3, 0x53, 0xdf, 0xb6, 0xd9, 0x24, 0xdd, 0xc6, 0xdd, 0xdd, 0xb6, 0x18, 0xbf, 0xbd, 0x59, 0x6b, 0xef, 0xb4, 0x1b, 0x77, 0xee, 0xd6, 0x13, 0x81, 0x56, 0xa7, 0xf1, 0xa0, 0x9e, 0x7e, 0xb7, 0xdd, 0x68, 0xee, 0xcc, 0x0a, 0x03, 0x73, 0xc9, 0xb9, 0xf9, 0x6b, 0xcc, 0xa6, 0xda, 0x34, 0xbb, 0xb0, 0x98, 0x9c, 0xe7, 0x0f, 0x5e, 0xbe, 0x72, 0x65, 0x61, 0x6e, 0xf6, 0x6a, 0xea, 0x1a, 0x7b, 0x84, 0xdd, 0x5e, 0xb6, 0xea, 0xcd, 0x3b, 0xb1, 0x3f, 0x21, 0x74, 0x5e, 0x5c, 0x38, 0xc6, 0xaf, 0x0b, 0xe2, 0x12, 0xf7, 0xe8, 0x34, 0xd7, 0x19, 0x11, 0x0a, 0x67, 0xf9, 0x75, 0x8e, 0x5d, 0xcf, 0xb3, 0x6b, 0xfa, 0xec, 0x74, 0x0c, 0x85, 0xaf, 0x69, 0xed, 0x52, 0x2d, 0x9c, 0x65, 0x26, 0x3e, 0x44, 0x17, 0xd1, 0xc5, 0xa9, 0x8b, 0x53, 0xa7, 0xeb, 0x53, 0xbf, 0xce, 0x59, 0xc9, 0xe0, 0x98, 0xf5, 0x5f, 0x74, 0x38, 0x9f, 0x59, 0xa8, 0xbc, 0xff, 0x9b, 0x3f, 0x7e, 0xf9, 0xec, 0xf8, 0x2f, 0xbf, 0xff, 0xf8, 0xae, 0xf3, 0x93, 0xa9, 0xa0, 0x1e, 0xf0, 0x69, 0xa6, 0xf3, 0xfd, 0xe9, 0x57, 0xb2, 0xaf, 0x2e, 0x26, 0x17, 0xb7, 0x0b, 0x3f, 0x2f, 0x7c, 0xb4, 0x9a, 0x5c, 0xac, 0xbf, 0xfa, 0xb7, 0xeb, 0xb9, 0xdd, 0xf7, 0x6a, 0xb7, 0xf6, 0xfe, 0xfa, 0xf9, 0xde, 0xdc, 0x47, 0xbf, 0xfe, 0xed, 0xf6, 0xc1, 0xdc, 0xe7, 0x07, 0xbd, 0xed, 0x3f, 0x7f, 0xf6, 0xc5, 0xdf, 0xdf, 0xfe, 0xa7, 0xf7, 0x8f, 0xff, 0x00, 0x2b, 0x8b, 0x25, 0x6c, \ No newline at end of file diff --git a/config.tic b/config.tic index e5f4504..5d7a779 100644 Binary files a/config.tic and b/config.tic differ diff --git a/src/console.c b/src/console.c index c81e722..e1a9161 100644 --- a/src/console.c +++ b/src/console.c @@ -3042,6 +3042,9 @@ void initConsole(Console* console, tic_mem* tic, FileSystem* fs, Config* config, else if(strcmp(arg, "-skip") == 0) console->skipStart = true; + else if(strcmp(arg, "-save") == 0) + saveCart(console); + else continue; argp |= 0b1 << i; diff --git a/src/main.c b/src/main.c index 83b2f50..d5dcfcc 100644 --- a/src/main.c +++ b/src/main.c @@ -839,6 +839,7 @@ s32 main(s32 argc, char **argv) #elif defined(__EMSCRIPTEN__) SDL_RENDERER_ACCELERATED #else + // TODO: uncomment this later SDL_RENDERER_ACCELERATED// | (getConfig()->useVsync ? SDL_RENDERER_PRESENTVSYNC : 0) #endif ); @@ -850,7 +851,9 @@ s32 main(s32 argc, char **argv) initTouchGamepad(); #if defined(__EMSCRIPTEN__) - emscripten_set_main_loop(emstick, TIC_FRAMERATE, 1); + + // call this after FS is initialized + emscripten_set_main_loop(getConfig()->useVsync ? tick : emstick, TIC_FRAMERATE, 1); #else { u64 nextTick = SDL_GetPerformanceCounter(); @@ -872,12 +875,7 @@ s32 main(s32 argc, char **argv) nextTick -= delay; platform.missedFrame = true; } - else - { - u32 time = (u32)(delay * 1000 / SDL_GetPerformanceFrequency()); - if(time >= 10) - SDL_Delay(time); - } + else SDL_Delay((u32)(delay * 1000 / SDL_GetPerformanceFrequency())); } } } diff --git a/src/studio.c b/src/studio.c index 2cb65e4..35967bb 100644 --- a/src/studio.c +++ b/src/studio.c @@ -2941,7 +2941,7 @@ Studio* studioInit(s32 argc, char **argv, s32 samplerate) } else createFileSystem(NULL, onFSInitialized); - emscripten_set_main_loop(emstick, TIC_FRAMERATE, 1); + // emscripten_set_main_loop(emstick, TIC_FRAMERATE, 1); #else