From 5118247ac49ca8ff2e4430c614d462eb61385b04 Mon Sep 17 00:00:00 2001 From: Callie LeFave Date: Thu, 5 Apr 2018 20:35:52 -0400 Subject: [PATCH 01/10] Python: Add runtime library search path --- src/platform/python/_builder.py | 2 ++ src/platform/python/setup.py.in | 1 + 2 files changed, 3 insertions(+) diff --git a/src/platform/python/_builder.py b/src/platform/python/_builder.py index ad380e10f..8d3ba8825 100644 --- a/src/platform/python/_builder.py +++ b/src/platform/python/_builder.py @@ -9,6 +9,7 @@ pydir = os.path.dirname(os.path.abspath(__file__)) srcdir = os.path.join(pydir, "..", "..") incdir = os.path.join(pydir, "..", "..", "..", "include") bindir = os.environ.get("BINDIR", os.path.join(os.getcwd(), "..")) +libdir = os.environ.get("LIBDIR") cpp = shlex.split(os.environ.get("CPP", "cc -E")) cppflags = shlex.split(os.environ.get("CPPFLAGS", "")) @@ -52,6 +53,7 @@ ffi.set_source("mgba._pylib", """ extra_compile_args=cppflags, libraries=["mgba"], library_dirs=[bindir], + runtime_library_dirs=[libdir], sources=[os.path.join(pydir, path) for path in ["vfs-py.c", "core.c", "log.c", "sio.c"]]) preprocessed = subprocess.check_output(cpp + ["-fno-inline", "-P"] + cppflags + [os.path.join(pydir, "_builder.h")], universal_newlines=True) diff --git a/src/platform/python/setup.py.in b/src/platform/python/setup.py.in index a66e70e3c..3546cb876 100644 --- a/src/platform/python/setup.py.in +++ b/src/platform/python/setup.py.in @@ -4,6 +4,7 @@ import os import sys os.environ["BINDIR"] = "${CMAKE_BINARY_DIR}" +os.environ["LIBDIR"] = "${CMAKE_INSTALL_PREFIX}/${LIBDIR}" os.environ["CPPFLAGS"] = " ".join([d for d in "${INCLUDE_FLAGS}".split(";") if d]) classifiers = [ From 21d808d0e2235f1f183d4aa38e2494bf69f9125f Mon Sep 17 00:00:00 2001 From: Callie LeFave Date: Thu, 5 Apr 2018 21:07:17 -0400 Subject: [PATCH 02/10] CMake: Make RPATH absolute --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4aa15f2d4..a2a3e7e60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,7 +113,7 @@ if (BUILD_OPENEMU) endif() -set(CMAKE_INSTALL_RPATH "${LIBDIR}") +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}") if (NOT DEFINED MANDIR) set(MANDIR ${CMAKE_INSTALL_MANDIR}) From 045417b5096f12301657f5c5d24ccd5769b36551 Mon Sep 17 00:00:00 2001 From: "Dimitri (_)" Date: Wed, 4 Apr 2018 18:30:02 +0200 Subject: [PATCH 03/10] Correct debug lib --- opt/libgba/mgba.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opt/libgba/mgba.c b/opt/libgba/mgba.c index 22a4f0851..51787661d 100644 --- a/opt/libgba/mgba.c +++ b/opt/libgba/mgba.c @@ -32,7 +32,7 @@ #define REG_DEBUG_FLAGS (vu16*) 0x4FFF700 #define REG_DEBUG_STRING (char*) 0x4FFF600 -ssize_t mgba_stdout_write(struct _reent* r __attribute__((unused)), int fd __attribute__((unused)), const char* ptr, size_t len) { +ssize_t mgba_stdout_write(struct _reent* r __attribute__((unused)), void* fd __attribute__((unused)), const char* ptr, size_t len) { if (len > 0x100) { len = 0x100; } @@ -41,7 +41,7 @@ ssize_t mgba_stdout_write(struct _reent* r __attribute__((unused)), int fd __att return len; } -ssize_t mgba_stderr_write(struct _reent* r __attribute__((unused)), int fd __attribute__((unused)), const char* ptr, size_t len) { +ssize_t mgba_stderr_write(struct _reent* r __attribute__((unused)), void* fd __attribute__((unused)), const char* ptr, size_t len) { if (len > 0x100) { len = 0x100; } From 45fc0d2e8b730972587c9110ef3183d97c836dab Mon Sep 17 00:00:00 2001 From: Lothar Serra Mari Date: Sun, 8 Apr 2018 16:21:47 +0200 Subject: [PATCH 04/10] Qt: Add dummy translation file for French --- src/platform/qt/ts/mgba-fr.ts | 4801 +++++++++++++++++++++++++++++++++ 1 file changed, 4801 insertions(+) create mode 100644 src/platform/qt/ts/mgba-fr.ts diff --git a/src/platform/qt/ts/mgba-fr.ts b/src/platform/qt/ts/mgba-fr.ts new file mode 100644 index 000000000..9de74b47e --- /dev/null +++ b/src/platform/qt/ts/mgba-fr.ts @@ -0,0 +1,4801 @@ + + + + + AboutScreen + + + About + + + + + <a href="http://mgba.io/">Website</a> • <a href="https://forums.mgba.io/">Forums / Support</a> • <a href="https://patreon.com/mgba">Donate</a> • <a href="https://github.com/mgba-emu/mgba/tree/{gitBranch}">Source</a> + + + + + Branch: <tt>{gitBranch}</tt><br/>Revision: <tt>{gitCommit}</tt> + + + + + {projectName} + + + + + {projectName} would like to thank the following patrons from Patreon: + + + + + © 2013 – 2018 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0 +Game Boy Advance is a registered trademark of Nintendo Co., Ltd. + + + + + {projectVersion} + + + + + {logo} + + + + + {projectName} is an open-source Game Boy Advance emulator + + + + + {patrons} + + + + + ArchiveInspector + + + Open in archive... + + + + + Loading... + + + + + AssetTile + + + AssetTile + + + + + Tile # + + + + + + 0 + + + + + Palette # + + + + + Address + + + + + 0x06000000 + + + + + Red + + + + + Green + + + + + Blue + + + + + + + 0x00 (00) + + + + + CheatsView + + + Cheats + + + + + Remove + + + + + Save + + + + + Load + + + + + Add New Set + + + + + Add + + + + + DebuggerConsole + + + Debugger + + + + + Enter command (try `help` for more info) + + + + + Break + + + + + GIFView + + + Record GIF + + + + + Start + + + + + Stop + + + + + Select File + + + + + Frameskip + + + + + Frame delay (ms) + + + + + Automatic + + + + + IOViewer + + + I/O Viewer + + + + + 0x0000 + + + + + 2 + + + + + 5 + + + + + 4 + + + + + 7 + + + + + 0 + + + + + 9 + + + + + 1 + + + + + 3 + + + + + 8 + + + + + C + + + + + E + + + + + 6 + + + + + D + + + + + F + + + + + A + + + + + B + + + + + LibraryTree + + + Name + + + + + Location + + + + + Platform + + + + + Size + + + + + CRC32 + + + + + LoadSaveState + + + + %1 State + + + + + + + + + + + + + No Save + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + LogView + + + Logs + + + + + Enabled Levels + + + + + Debug + + + + + Stub + + + + + Info + + + + + Warning + + + + + Error + + + + + Fatal + + + + + Game Error + + + + + Clear + + + + + Max Lines + + + + + MapView + + + Maps + + + + + × + + + + + Magnification + + + + + Export + + + + + MemorySearch + + + Memory Search + + + + + Address + + + + + Current Value + + + + + + Type + + + + + Value + + + + + Numeric + + + + + Text + + + + + Width + + + + + + Guess + + + + + 1 Byte (8-bit) + + + + + 2 Bytes (16-bit) + + + + + 4 Bytes (32-bit) + + + + + Number type + + + + + Decimal + + + + + Hexadecimal + + + + + Compare + + + + + Equal + + + + + Greater + + + + + Less + + + + + Delta + + + + + Search + + + + + Search Within + + + + + Open in Memory Viewer + + + + + Refresh + + + + + MemoryView + + + Memory + + + + + Inspect Address: + + + + + 0x + + + + + Set Alignment: + + + + + 1 Byte + + + + + 2 Bytes + + + + + 4 Bytes + + + + + Unsigned Integer: + + + + + Signed Integer: + + + + + String: + + + + + Load TBL + + + + + Copy Selection + + + + + Paste + + + + + Save Selection + + + + + Load + + + + + ObjView + + + Sprites + + + + + + × + + + + + Magnification + + + + + Export + + + + + Attributes + + + + + Transform + + + + + Off + + + + + Palette + + + + + + + + 0 + + + + + Double Size + + + + + + + + Return, Ctrl+R + + + + + Flipped + + + + + H + + + + + V + + + + + Mode + + + + + Normal + + + + + Mosaic + + + + + Enabled + + + + + Priority + + + + + Tile + + + + + Geometry + + + + + Position + + + + + , + + + + + Dimensions + + + + + + 8 + + + + + Address + + + + + 0x07000000 + + + + + OverrideView + + + Game Overrides + + + + + Game Boy Advance + + + + + + + + Autodetect + + + + + Realtime clock + + + + + Gyroscope + + + + + Tilt + + + + + Light sensor + + + + + Rumble + + + + + Save type + + + + + + None + + + + + SRAM + + + + + Flash 512kb + + + + + Flash 1Mb + + + + + EEPROM + + + + + Idle loop + + + + + Game Boy Player features + + + + + Game Boy + + + + + Game Boy model + + + + + Game Boy (DMG) + + + + + Super Game Boy (SGB) + + + + + Game Boy Color (CGB) + + + + + Game Boy Advance (AGB) + + + + + Memory bank controller + + + + + MBC1 + + + + + MBC2 + + + + + MBC3 + + + + + MBC3 + RTC + + + + + MBC5 + + + + + MBC5 + Rumble + + + + + MBC7 + + + + + Pocket Cam + + + + + TAMA5 + + + + + HuC-3 + + + + + Background Colors + + + + + Sprite Colors 1 + + + + + Sprite Colors 2 + + + + + PaletteView + + + Palette + + + + + Background + + + + + Objects + + + + + Selection + + + + + Red + + + + + Green + + + + + Blue + + + + + + + 0x00 (00) + + + + + 16-bit value + + + + + Hex code + + + + + Palette index + + + + + 0x0000 + + + + + #000000 + + + + + 000 + + + + + Export BG + + + + + Export OBJ + + + + + PrinterView + + + Game Boy Printer + + + + + Hurry up! + + + + + Tear off + + + + + QGBA::AssetTile + + + %0%1%2 + + + + + + + 0x%0 (%1) + + + + + QGBA::CheatsModel + + + (untitled) + + + + + Failed to open cheats file: %1 + + + + + QGBA::CheatsView + + + + Add GameShark + + + + + Add Pro Action Replay + + + + + Add CodeBreaker + + + + + Add GameGenie + + + + + + Select cheats file + + + + + QGBA::CoreController + + + Failed to open save file: %1 + + + + + Failed to open game file: %1 + + + + + Failed to open snapshot file for reading: %1 + + + + + Failed to open snapshot file for writing: %1 + + + + + QGBA::CoreManager + + + Failed to open game file: %1 + + + + + QGBA::GBAKeyEditor + + + Clear Button + + + + + Clear Analog + + + + + Refresh + + + + + Set all + + + + + QGBA::GDBWindow + + + Server settings + + + + + Local port + + + + + Bind address + + + + + Break + + + + + Stop + + + + + Start + + + + + Crash + + + + + Could not start GDB server + + + + + QGBA::GIFView + + + Failed to open output GIF file: %1 + + + + + Select output file + + + + + Graphics Interchange Format (*.gif) + + + + + QGBA::IOViewer + + + Background mode + + + + + Mode 0: 4 tile layers + + + + + Mode 1: 2 tile layers + 1 rotated/scaled tile layer + + + + + Mode 2: 2 rotated/scaled tile layers + + + + + Mode 3: Full 15-bit bitmap + + + + + Mode 4: Full 8-bit bitmap + + + + + Mode 5: Small 15-bit bitmap + + + + + CGB Mode + + + + + Frame select + + + + + Unlocked HBlank + + + + + Linear OBJ tile mapping + + + + + Force blank screen + + + + + Enable background 0 + + + + + Enable background 1 + + + + + Enable background 2 + + + + + Enable background 3 + + + + + Enable OBJ + + + + + Enable Window 0 + + + + + Enable Window 1 + + + + + Enable OBJ Window + + + + + Currently in VBlank + + + + + Currently in HBlank + + + + + Currently in VCounter + + + + + Enable VBlank IRQ generation + + + + + Enable HBlank IRQ generation + + + + + Enable VCounter IRQ generation + + + + + VCounter scanline + + + + + Current scanline + + + + + + + + Priority + + + + + + + + Tile data base (* 16kB) + + + + + + + + Enable mosaic + + + + + + + + Enable 256-color + + + + + + + + Tile map base (* 2kB) + + + + + + + + Background dimensions + + + + + + Overflow wraps + + + + + + + + Horizontal offset + + + + + + + + Vertical offset + + + + + + + + + + + + + + + + Fractional part + + + + + + + + + + + + Integer part + + + + + + + + Integer part (bottom) + + + + + + + + Integer part (top) + + + + + + End x + + + + + + Start x + + + + + + End y + + + + + + Start y + + + + + Window 0 enable BG 0 + + + + + Window 0 enable BG 1 + + + + + Window 0 enable BG 2 + + + + + Window 0 enable BG 3 + + + + + Window 0 enable OBJ + + + + + Window 0 enable blend + + + + + Window 1 enable BG 0 + + + + + Window 1 enable BG 1 + + + + + Window 1 enable BG 2 + + + + + Window 1 enable BG 3 + + + + + Window 1 enable OBJ + + + + + Window 1 enable blend + + + + + Outside window enable BG 0 + + + + + Outside window enable BG 1 + + + + + Outside window enable BG 2 + + + + + Outside window enable BG 3 + + + + + Outside window enable OBJ + + + + + Outside window enable blend + + + + + OBJ window enable BG 0 + + + + + OBJ window enable BG 1 + + + + + OBJ window enable BG 2 + + + + + OBJ window enable BG 3 + + + + + OBJ window enable OBJ + + + + + OBJ window enable blend + + + + + Background mosaic size vertical + + + + + Background mosaic size horizontal + + + + + Object mosaic size vertical + + + + + Object mosaic size horizontal + + + + + BG 0 target 1 + + + + + BG 1 target 1 + + + + + BG 2 target 1 + + + + + BG 3 target 1 + + + + + OBJ target 1 + + + + + Backdrop target 1 + + + + + Blend mode + + + + + Disabled + + + + + Additive blending + + + + + Brighten + + + + + Darken + + + + + BG 0 target 2 + + + + + BG 1 target 2 + + + + + BG 2 target 2 + + + + + BG 3 target 2 + + + + + OBJ target 2 + + + + + Backdrop target 2 + + + + + Blend A (target 1) + + + + + Blend B (target 2) + + + + + Blend Y + + + + + Sweep shifts + + + + + Sweep subtract + + + + + Sweep time (in 1/128s) + + + + + + + + Sound length + + + + + + Duty cycle + + + + + + + Envelope step time + + + + + + + Envelope increase + + + + + + + Initial volume + + + + + + + Sound frequency + + + + + + + + Timed + + + + + + + + Reset + + + + + Double-size wave table + + + + + Active wave table + + + + + Enable channel 3 + + + + + Volume + + + + + 0% + + + + + + 100% + + + + + + 50% + + + + + + 25% + + + + + + + + 75% + + + + + Clock divider + + + + + Register stages + + + + + 15 + + + + + 7 + + + + + Shifter frequency + + + + + PSG volume right + + + + + PSG volume left + + + + + Enable channel 1 right + + + + + Enable channel 2 right + + + + + Enable channel 3 right + + + + + Enable channel 4 right + + + + + Enable channel 1 left + + + + + Enable channel 2 left + + + + + Enable channel 3 left + + + + + Enable channel 4 left + + + + + PSG master volume + + + + + Loud channel A + + + + + Loud channel B + + + + + Enable channel A right + + + + + Enable channel A left + + + + + Channel A timer + + + + + + 0 + + + + + + + + + + + + + 1 + + + + + Channel A reset + + + + + Enable channel B right + + + + + Enable channel B left + + + + + Channel B timer + + + + + Channel B reset + + + + + Active channel 1 + + + + + Active channel 2 + + + + + Active channel 3 + + + + + Active channel 4 + + + + + Enable audio + + + + + Bias + + + + + Resolution + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sample + + + + + + + + + + + + Address (bottom) + + + + + + + + + + + + Address (top) + + + + + + + + Word count + + + + + + + + Destination offset + + + + + + + + + + + + Increment + + + + + + + + + + + + Decrement + + + + + + + + + + + + Fixed + + + + + + + + Increment and reload + + + + + + + + Source offset + + + + + + + + Repeat + + + + + + + + 32-bit + + + + + + + + Start timing + + + + + + + + Immediate + + + + + + + + + + VBlank + + + + + + + + + + HBlank + + + + + + + + + + + + + IRQ + + + + + + + + + + + + Enable + + + + + + + Audio FIFO + + + + + Video Capture + + + + + DRQ + + + + + + + + Value + + + + + + + + Scale + + + + + + + + 1/64 + + + + + + + + 1/256 + + + + + + + + 1/1024 + + + + + + + Cascade + + + + + + A + + + + + + B + + + + + + Select + + + + + + Start + + + + + + Right + + + + + + Left + + + + + + Up + + + + + + Down + + + + + + R + + + + + + L + + + + + Condition + + + + + SC + + + + + SD + + + + + SI + + + + + SO + + + + + + VCounter + + + + + + Timer 0 + + + + + + Timer 1 + + + + + + Timer 2 + + + + + + Timer 3 + + + + + + SIO + + + + + + DMA 0 + + + + + + DMA 1 + + + + + + DMA 2 + + + + + + DMA 3 + + + + + + Keypad + + + + + + Gamepak + + + + + SRAM wait + + + + + + + + + 4 + + + + + + + + 3 + + + + + + + + + 2 + + + + + + + + + 8 + + + + + Cart 0 non-sequential + + + + + Cart 0 sequential + + + + + Cart 1 non-sequential + + + + + Cart 1 sequential + + + + + Cart 2 non-sequential + + + + + Cart 2 sequential + + + + + PHI terminal + + + + + Disable + + + + + 4.19MHz + + + + + 8.38MHz + + + + + 16.78MHz + + + + + Gamepak prefetch + + + + + Enable IRQs + + + + + QGBA::KeyEditor + + + + --- + + + + + QGBA::LoadSaveState + + + Load State + + + + + Save State + + + + + Empty + + + + + Corrupted + + + + + Slot %1 + + + + + QGBA::LogController + + + DEBUG + + + + + STUB + + + + + INFO + + + + + WARN + + + + + ERROR + + + + + FATAL + + + + + GAME ERROR + + + + + QGBA::MapView + + + Map Addr. + + + + + Mirror + + + + + None + + + + + Both + + + + + Horizontal + + + + + Vertical + + + + + Export map + + + + + Portable Network Graphics (*.png) + + + + + Failed to open output PNG file: %1 + + + + + QGBA::MemoryModel + + + Copy selection + + + + + Save selection + + + + + Paste + + + + + Load + + + + + + All + + + + + Load TBL + + + + + Save selected memory + + + + + Failed to open output file: %1 + + + + + Load memory + + + + + Failed to open input file: %1 + + + + + TBL + + + + + ISO-8859-1 + + + + + QGBA::MemorySearch + + + (%0/%1×) + + + + + (⅟%0×) + + + + + (%0×) + + + + + %1 byte%2 + + + + + QGBA::ObjView + + + + 0x%0 + + + + + Off + + + + + Normal + + + + + Trans + + + + + OBJWIN + + + + + Invalid + + + + + + N/A + + + + + Export sprite + + + + + Portable Network Graphics (*.png) + + + + + Failed to open output PNG file: %1 + + + + + QGBA::PaletteView + + + #%0 + + + + + 0x%0 + + + + + %0 + + + + + + + 0x%0 (%1) + + + + + Export palette + + + + + Windows PAL (*.pal);;Adobe Color Table (*.act) + + + + + Failed to open output palette file: %1 + + + + + QGBA::PrinterView + + + Save Printout + + + + + Portable Network Graphics (*.png) + + + + + QGBA::ROMInfo + + + + + + + (unknown) + + + + + + bytes + + + + + (no database present) + + + + + QGBA::SettingsView + + + + Qt Multimedia + + + + + SDL + + + + + Software (Qt) + + + + + OpenGL + + + + + OpenGL (force version 1.x) + + + + + None (Still Image) + + + + + Keyboard + + + + + Controllers + + + + + Shortcuts + + + + + + Shaders + + + + + Select BIOS + + + + + QGBA::ShaderSelector + + + No shader active + + + + + Load shader + + + + + No shader loaded + + + + + by %1 + + + + + Preprocessing + + + + + Pass %1 + + + + + QGBA::ShortcutController + + + Action + + + + + Keyboard + + + + + Gamepad + + + + + QGBA::VideoView + + + Failed to open output video file: %1 + + + + + Native (%0x%1) + + + + + Select output file + + + + + QGBA::Window + + + Game Boy Advance ROMs (%1) + + + + + Game Boy ROMs (%1) + + + + + All ROMs (%1) + + + + + %1 Video Logs (*.mvl) + + + + + Archives (%1) + + + + + + + Select ROM + + + + + Select folder + + + + + Game Boy Advance save files (%1) + + + + + + + Select save + + + + + Select patch + + + + + Patches (*.ips *.ups *.bps) + + + + + Select image + + + + + Image file (*.png *.gif *.jpg *.jpeg);;All files (*) + + + + + + GameShark saves (*.sps *.xps) + + + + + Select video log + + + + + Video logs (*.mvl) + + + + + Crash + + + + + The game has crashed with the following error: + +%1 + + + + + Couldn't Load + + + + + Could not load game. Are you sure it's in the correct format? + + + + + Unimplemented BIOS call + + + + + This game uses a BIOS call that is not implemented. Please use the official BIOS for best experience. + + + + + Really make portable? + + + + + This will make the emulator load its configuration from the same directory as the executable. Do you want to continue? + + + + + Restart needed + + + + + Some changes will not take effect until the emulator is restarted. + + + + + - Player %1 of %2 + + + + + %1 - %2 + + + + + %1 - %2 - %3 + + + + + %1 - %2 (%3 fps) - %4 + + + + + &File + + + + + Load &ROM... + + + + + Load ROM in archive... + + + + + Add folder to library... + + + + + Load temporary save... + + + + + Load &patch... + + + + + Boot BIOS + + + + + Replace ROM... + + + + + ROM &info... + + + + + Recent + + + + + Make portable + + + + + &Load state + + + + + F10 + + + + + &Save state + + + + + Shift+F10 + + + + + Quick load + + + + + Quick save + + + + + Load recent + + + + + Save recent + + + + + Undo load state + + + + + F11 + + + + + Undo save state + + + + + Shift+F11 + + + + + + State &%1 + + + + + F%1 + + + + + Shift+F%1 + + + + + Load camera image... + + + + + Import GameShark Save + + + + + Export GameShark Save + + + + + New multiplayer window + + + + + About + + + + + E&xit + + + + + &Emulation + + + + + &Reset + + + + + Ctrl+R + + + + + Sh&utdown + + + + + Yank game pak + + + + + &Pause + + + + + Ctrl+P + + + + + &Next frame + + + + + Ctrl+N + + + + + Fast forward (held) + + + + + &Fast forward + + + + + Shift+Tab + + + + + Fast forward speed + + + + + Unbounded + + + + + %0x + + + + + Rewind (held) + + + + + Re&wind + + + + + ~ + + + + + Step backwards + + + + + Ctrl+B + + + + + Sync to &video + + + + + Sync to &audio + + + + + Solar sensor + + + + + Increase solar level + + + + + Decrease solar level + + + + + Brightest solar level + + + + + Darkest solar level + + + + + Brightness %1 + + + + + Audio/&Video + + + + + Frame size + + + + + %1x + + + + + Toggle fullscreen + + + + + Lock aspect ratio + + + + + Force integer scaling + + + + + Bilinear filtering + + + + + Frame&skip + + + + + Mute + + + + + FPS target + + + + + 15 + + + + + 30 + + + + + 45 + + + + + Native (59.7) + + + + + 60 + + + + + 90 + + + + + 120 + + + + + 240 + + + + + Take &screenshot + + + + + F12 + + + + + Record output... + + + + + Record GIF... + + + + + Record video log... + + + + + Stop video log + + + + + Game Boy Printer... + + + + + Video layers + + + + + Audio channels + + + + + &Tools + + + + + View &logs... + + + + + Game &overrides... + + + + + Game &Pak sensors... + + + + + &Cheats... + + + + + Settings... + + + + + Open debugger console... + + + + + Start &GDB server... + + + + + View &palette... + + + + + View &sprites... + + + + + View &tiles... + + + + + View &map... + + + + + View memory... + + + + + Search memory... + + + + + View &I/O registers... + + + + + Exit fullscreen + + + + + GameShark Button (held) + + + + + Autofire + + + + + Autofire A + + + + + Autofire B + + + + + Autofire L + + + + + Autofire R + + + + + Autofire Start + + + + + Autofire Select + + + + + Autofire Up + + + + + Autofire Right + + + + + Autofire Down + + + + + Autofire Left + + + + + QObject + + + GBA + + + + + GB + + + + + ? + + + + + ROMInfo + + + ROM Info + + + + + Game name: + + + + + {NAME} + + + + + Internal name: + + + + + {TITLE} + + + + + Game ID: + + + + + {ID} + + + + + File size: + + + + + {SIZE} + + + + + CRC32: + + + + + {CRC} + + + + + SensorView + + + Sensors + + + + + Realtime clock + + + + + Fixed time + + + + + System time + + + + + Start time at + + + + + Now + + + + + MM/dd/yy hh:mm:ss AP + + + + + Light sensor + + + + + Brightness + + + + + Tilt sensor + + + + + + Set Y + + + + + + Set X + + + + + Gyroscope + + + + + Sensitivity + + + + + SettingsView + + + Settings + + + + + Audio/Video + + + + + Interface + + + + + Emulation + + + + + BIOS + + + + + Paths + + + + + Game Boy + + + + + Audio driver: + + + + + Audio buffer: + + + + + + 1536 + + + + + 512 + + + + + 768 + + + + + 1024 + + + + + 2048 + + + + + 3072 + + + + + 4096 + + + + + samples + + + + + Sample rate: + + + + + + 44100 + + + + + 22050 + + + + + 32000 + + + + + 48000 + + + + + Hz + + + + + Volume: + + + + + Mute + + + + + Display driver: + + + + + Frameskip: + + + + + Skip every + + + + + + frames + + + + + FPS target: + + + + + frames per second + + + + + Sync: + + + + + Video + + + + + Audio + + + + + Lock aspect ratio + + + + + Bilinear filtering + + + + + Force integer scaling + + + + + Language + + + + + English + + + + + Library: + + + + + List view + + + + + Tree view + + + + + Show when no game open + + + + + Clear cache + + + + + Allow opposing input directions + + + + + Suspend screensaver + + + + + Pause when inactive + + + + + Show FPS in title bar + + + + + Automatically save cheats + + + + + Automatically load cheats + + + + + Automatically save state + + + + + Automatically load state + + + + + Fast forward speed: + + + + + × + + + + + Unbounded + + + + + Enable rewind + + + + + Rewind history: + + + + + Idle loops: + + + + + Run all + + + + + Remove known + + + + + Detect and remove + + + + + Savestate extra data: + + + + + + Screenshot + + + + + + Save data + + + + + + Cheat codes + + + + + Load extra data: + + + + + Rewind affects save data + + + + + Preload entire ROM into memory + + + + + Autofire interval: + + + + + GB BIOS file: + + + + + + + + + + + + + Browse + + + + + Use BIOS file if found + + + + + Skip BIOS intro + + + + + GBA BIOS file: + + + + + GBC BIOS file: + + + + + SGB BIOS file: + + + + + Save games + + + + + + + + + Same directory as the ROM + + + + + Save states + + + + + Screenshots + + + + + Patches + + + + + Cheats + + + + + Game Boy model + + + + + + + Autodetect + + + + + + + Game Boy (DMG) + + + + + + + Super Game Boy (SGB) + + + + + + + Game Boy Color (CGB) + + + + + + + Game Boy Advance (AGB) + + + + + Super Game Boy model + + + + + Game Boy Color model + + + + + Default BG colors: + + + + + Super Game Boy borders + + + + + Camera driver: + + + + + Default sprite colors 1: + + + + + Default sprite colors 2: + + + + + ShaderSelector + + + Shaders + + + + + Active Shader: + + + + + Name + + + + + Author + + + + + Description + + + + + Unload Shader + + + + + Load New Shader + + + + + ShortcutView + + + Edit Shortcuts + + + + + Keyboard + + + + + Gamepad + + + + + Clear + + + + + TileView + + + Tiles + + + + + 256 colors + + + + + × + + + + + Magnification + + + + + VideoView + + + Record Video + + + + + Start + + + + + Stop + + + + + Select File + + + + + Presets + + + + + High Quality + + + + + YouTube + + + + + + WebM + + + + + Lossless + + + + + 1080p + + + + + 720p + + + + + 480p + + + + + Native + + + + + Format + + + + + MKV + + + + + AVI + + + + + MP4 + + + + + PNG + + + + + h.264 + + + + + h.264 (NVENC) + + + + + HEVC + + + + + VP8 + + + + + FFV1 + + + + + FLAC + + + + + Opus + + + + + Vorbis + + + + + MP3 + + + + + AAC + + + + + Uncompressed + + + + + Bitrate (kbps) + + + + + VBR + + + + + ABR + + + + + Dimensions + + + + + : + + + + + × + + + + + Lock aspect ratio + + + + + Show advanced + + + + From 2936865ca898453ec2207b09b6acc42ef3472c47 Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 8 Apr 2018 13:44:34 -0700 Subject: [PATCH 05/10] man: Silence mgba.6 mandoc warning. man -Tlint mgba man: mgba.6.gz:247:5: WARNING: cross reference to self: Xr mgba 6 cross reference to self (mdoc) An Xr macro refers to a name and section matching the section of the present manual page and a name mentioned in an Nm macro in the NAME or SYNOPSIS section, or in an Fn or Fo macro in the SYNOPSIS. Consider using Nm or Fn instead of Xr. https://man.openbsd.org/mandoc.1 --- doc/mgba.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mgba.6 b/doc/mgba.6 index c5101f34d..f045d1a9c 100644 --- a/doc/mgba.6 +++ b/doc/mgba.6 @@ -244,7 +244,7 @@ is used. .Bl -tag -width Ds -compact .It Pa $XDG_CONFIG_HOME/mgba/config.ini Default -.Xr mgba 6 +.Nm mgba configuration file. .It Pa portable.ini If this file exists in the current directory, From 40703d9734792e21096c120ddab2613465f71e7a Mon Sep 17 00:00:00 2001 From: Lothar Serra Mari Date: Sun, 8 Apr 2018 16:28:10 +0200 Subject: [PATCH 06/10] Doc: Add git and base-devel to MSYS2 dependencies "git" is obviously needed for pulling the latest source code. "base-devel" is needed to actually make the compiler toolchain work. Both packages are not installed in current MSYS2 base installations. --- README.md | 4 ++-- README_DE.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a32acc878..cbddaa0c0 100644 --- a/README.md +++ b/README.md @@ -136,11 +136,11 @@ To build on Windows for development, using MSYS2 is recommended. Follow the inst For x86 (32 bit) builds: - pacman -Sy mingw-w64-i686-{cmake,ffmpeg,gcc,gdb,imagemagick,libelf,libepoxy,libzip,pkg-config,qt5,SDL2,ntldd-git} + pacman -Sy base-devel git mingw-w64-i686-{cmake,ffmpeg,gcc,gdb,imagemagick,libelf,libepoxy,libzip,pkg-config,qt5,SDL2,ntldd-git} For x86_64 (64 bit) builds: - pacman -Sy mingw-w64-x86_64-{cmake,ffmpeg,gcc,gdb,imagemagick,libelf,libepoxy,libzip,pkg-config,qt5,SDL2,ntldd-git} + pacman -Sy base-devel git mingw-w64-x86_64-{cmake,ffmpeg,gcc,gdb,imagemagick,libelf,libepoxy,libzip,pkg-config,qt5,SDL2,ntldd-git} Check out the source code by running this command: diff --git a/README_DE.md b/README_DE.md index b366af757..878e9cb69 100644 --- a/README_DE.md +++ b/README_DE.md @@ -136,11 +136,11 @@ Um mGBA auf Windows zu kompilieren, wird MSYS2 empfohlen. Befolge die Installati Für x86 (32 Bit): - pacman -Sy mingw-w64-i686-{cmake,ffmpeg,gcc,gdb,imagemagick,libelf,libepoxy,libzip,pkg-config,qt5,SDL2,ntldd-git} + pacman -Sy base-devel git mingw-w64-i686-{cmake,ffmpeg,gcc,gdb,imagemagick,libelf,libepoxy,libzip,pkg-config,qt5,SDL2,ntldd-git} Für x86_64 (64 Bit): - pacman -Sy mingw-w64-x86_64-{cmake,ffmpeg,gcc,gdb,imagemagick,libelf,libepoxy,libzip,pkg-config,qt5,SDL2,ntldd-git} + pacman -Sy base-devel git mingw-w64-x86_64-{cmake,ffmpeg,gcc,gdb,imagemagick,libelf,libepoxy,libzip,pkg-config,qt5,SDL2,ntldd-git} Lade den aktuellen mGBA-Quellcode mithilfe des folgenden Kommandos herunter: From 179abfcc25abf80065c6ba6b379f8607bd55ac5b Mon Sep 17 00:00:00 2001 From: BenjaminSiskoo Date: Tue, 10 Apr 2018 14:41:19 +0200 Subject: [PATCH 07/10] French translation... French translation by Benjamin Siskoo --- src/platform/qt/ts/mgba-fr.ts | 1095 +++++++++++++++++---------------- 1 file changed, 549 insertions(+), 546 deletions(-) diff --git a/src/platform/qt/ts/mgba-fr.ts b/src/platform/qt/ts/mgba-fr.ts index 9de74b47e..33580b6b6 100644 --- a/src/platform/qt/ts/mgba-fr.ts +++ b/src/platform/qt/ts/mgba-fr.ts @@ -6,7 +6,7 @@ About - + A Propos De @@ -26,13 +26,14 @@ {projectName} would like to thank the following patrons from Patreon: - + {projectName} aimerait remercier les donateurs suivant venant de Patreon : © 2013 – 2018 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0 Game Boy Advance is a registered trademark of Nintendo Co., Ltd. - + © 2013 – 2018 Jeffrey Pfau, est autorisé sous la license Publique de Mozilla, version 2.0 +Game Boy Advance est une marque de fabrique enregistré par Nintendo Co., Ltd. @@ -47,7 +48,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. {projectName} is an open-source Game Boy Advance emulator - + {projectName} est un émulateur open-source Game Boy Advance @@ -60,12 +61,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Open in archive... - + Ouvrir dans l'archive... Loading... - + Chargement... @@ -94,7 +95,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Address - + Adresse @@ -104,17 +105,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Red - + Rouge Green - + Vert Blue - + Bleu @@ -129,32 +130,32 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Cheats - + Triches Remove - + Enlever Save - + Sauvegarder Load - + Charger Add New Set - + Ajouter un Nouveau Set Add - + Ajouter @@ -162,17 +163,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Debugger - + Débugeur Enter command (try `help` for more info) - + Entrer une commande (essayer `help` pour plus d'information) Break - + Arrêter @@ -180,37 +181,37 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Record GIF - + Enregistrer un GIF Start - + Démarrer Stop - + Arrêter Select File - + Chsoiir un fichier Frameskip - + Saut d'image Frame delay (ms) - + Retard Image Automatic - + Automatique @@ -218,7 +219,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. I/O Viewer - + Visualiseur E/S @@ -311,22 +312,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Name - + Nom Location - + Localisation Platform - + Plateforme Size - + Taille @@ -340,7 +341,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. %1 State - + %1 Etat @@ -353,7 +354,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. No Save - + Pas de Sauve @@ -406,17 +407,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Logs - + Enregistrements Enabled Levels - + Niveaux Activés Debug - + Débug @@ -431,12 +432,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Warning - + Avertissement Error - + Erreur @@ -446,17 +447,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Game Error - + Erreur de Jeu Clear - + Vider Max Lines - + Lignes Max @@ -464,7 +465,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Maps - + Définitions @@ -479,7 +480,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Export - + Exporter @@ -487,17 +488,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Memory Search - + Fouiller dans la Mémoire Address - + Adresse Current Value - + Valeur en cours @@ -508,28 +509,28 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Value - + Valeur Numeric - + Numérique Text - + Texte Width - + Longueur Guess - + Défaut @@ -549,37 +550,37 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Number type - + Nombre Type Decimal - + Décimal Hexadecimal - + Héxadécimal Compare - + Comparer Equal - + Egal Greater - + Plus grand que Less - + Moins @@ -589,22 +590,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Search - + Rechercher Search Within - + Rechercher dans Open in Memory Viewer - + Ouvrir dans le Visualiseur Refresh - + Rafraîchir @@ -612,12 +613,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Memory - + Mémoire Inspect Address: - + Examiner l'adresse : @@ -627,7 +628,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Set Alignment: - + Choisir les alignements : @@ -647,42 +648,42 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Unsigned Integer: - + Entier non signé : Signed Integer: - + Entier signé : String: - + Chaîne : Load TBL - + Charger TBL Copy Selection - + Copier la Sélection Paste - + Coller Save Selection - + Sauvegarder la sélection Load - + Charger @@ -706,17 +707,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Export - + Exporter Attributes - + Attributs Transform - + Transformer @@ -739,7 +740,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Double Size - + Taille Double @@ -752,7 +753,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Flipped - + Inversé @@ -777,17 +778,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Mosaic - + Mosaïque Enabled - + Activé Priority - + Priorité @@ -797,7 +798,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Geometry - + Géomètrie @@ -823,7 +824,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Address - + Adresse @@ -836,7 +837,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Game Overrides - + Passer outre le jeu @@ -849,12 +850,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Autodetect - + Détection Auto Realtime clock - + Horloge en temps réel @@ -869,23 +870,23 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Light sensor - + Détection de lumière Rumble - + Vibration Save type - + Type de Sauv None - + Aucune @@ -915,7 +916,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Game Boy Player features - + Fonction Joueur Game Boy @@ -925,7 +926,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Game Boy model - + Modèle de Game Boy @@ -950,7 +951,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Memory bank controller - + Contrôleur Banque Mémoire @@ -980,7 +981,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. MBC5 + Rumble - + MBC5 + Vibration @@ -1005,17 +1006,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Background Colors - + Couleurs en arrière plan Sprite Colors 1 - + Couleurs du Sprite 1 Sprite Colors 2 - + Couleurs du Sprite 2 @@ -1028,32 +1029,32 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Background - + Arrière plan Objects - + Objets Selection - + Sélection Red - + Rouge Green - + Vert Blue - + Bleu @@ -1065,17 +1066,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. 16-bit value - + Valeur 16-bit Hex code - + Code Héxa Palette index - + Index Palette @@ -1095,12 +1096,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Export BG - + Exporter le BG Export OBJ - + Exporter l'OBJ @@ -1108,12 +1109,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Game Boy Printer - + Imprimante Game Boy Hurry up! - + Vite ! @@ -1141,12 +1142,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. (untitled) - + (sans titre) Failed to open cheats file: %1 - + Echec de l'ouverture du fichier de triche : %1 @@ -1155,28 +1156,28 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Add GameShark - + Ajouter GameShark Add Pro Action Replay - + Ajouter Pro Action Replay Add CodeBreaker - + Ajouter CodeBreaker Add GameGenie - + Ajouter Game Génie Select cheats file - + Choisir un fichier de triches @@ -1184,22 +1185,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Failed to open save file: %1 - + Echec de l'ouverture du fichier de sauvegarde : %1 Failed to open game file: %1 - + Echec de l'ouverture du fichier jeu : %1 Failed to open snapshot file for reading: %1 - + Echec de l'ouverture fichier de capture d'écran à lire : %1 Failed to open snapshot file for writing: %1 - + Echec de l'ouverture du fichier de capture d'écran à écrire : %1 @@ -1207,7 +1208,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Failed to open game file: %1 - + Echec de l'ouverture du fichier de capture d'écran à lire : %1 @@ -1215,22 +1216,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Clear Button - + Bouton Vider Clear Analog - + Vider Analog Refresh - + Rafraîchir Set all - + Tout sélectionner @@ -1281,12 +1282,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Failed to open output GIF file: %1 - + Echec de l'ouverture du fichier de sortie GIF : %1 Select output file - + Choisir le fichier de sortie @@ -1299,142 +1300,142 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Background mode - + Mode en arrière plan Mode 0: 4 tile layers - + Mode 0: 4 couches tile Mode 1: 2 tile layers + 1 rotated/scaled tile layer - + Mode 1 : 2 couches tile + 1 couche tile en rotation/à l'échelle Mode 2: 2 rotated/scaled tile layers - + Mode 2 : 2 couches tile en roation/à l'échelle Mode 3: Full 15-bit bitmap - + Mode 3 : Bitmap complet 15-bit Mode 4: Full 8-bit bitmap - + Mode 4 : Bitmap complet 8 bit Mode 5: Small 15-bit bitmap - + Mode 5 : Bitmap réduit 15-bit CGB Mode - + Mode CGB Frame select - + Choisir l'image Unlocked HBlank - + HBlank Débloqué Linear OBJ tile mapping - + Définir le tile OBJ linèaire Force blank screen - + Forcer l'écran vide Enable background 0 - + Activer l'arrière plan 0 Enable background 1 - + Activer l'arrière plan 1 Enable background 2 - + Activer l'arrière plan 2 Enable background 3 - + Activer l'arrière plan 3 Enable OBJ - + Activer l'OBJ Enable Window 0 - + Activer la fenêtre 0 Enable Window 1 - + Actvier la fenêtre 1 Enable OBJ Window - + Activer la fenêtre OBJ Currently in VBlank - + Actuellement en VBlank Currently in HBlank - + Actuellement en HBlank Currently in VCounter - + Actuellement en VCounter Enable VBlank IRQ generation - + Activer la génération de l'IRQ du VBlank Enable HBlank IRQ generation - + Activer la génération de l'IRQ du HBlank Enable VCounter IRQ generation - + Activer la génération de l'IRQ du VCounter VCounter scanline - + Scanline du VCounter Current scanline - + Scanline en cours @@ -1442,7 +1443,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Priority - + Priorité @@ -1450,7 +1451,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Tile data base (* 16kB) - + Base de donnée Tile (* 16kB) @@ -1458,7 +1459,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Enable mosaic - + Activer la mosaïque @@ -1466,7 +1467,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Enable 256-color - + Activer les 256 couleurs @@ -1474,7 +1475,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Tile map base (* 2kB) - + Base définie Tile (*x2kB) @@ -1482,7 +1483,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Background dimensions - + Dimensions de l'arrière plan @@ -1554,260 +1555,260 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. End x - + Fin x Start x - + Début x End y - + Fin y Start y - + Début y Window 0 enable BG 0 - + La fenêtre 0 active BG 0 Window 0 enable BG 1 - + La fenêtre 0 active BG 1 Window 0 enable BG 2 - + La fenêtre 0 active BG 2 Window 0 enable BG 3 - + La fenêtre 0 active BG 3 Window 0 enable OBJ - + La fenêtre 0 active OBJ Window 0 enable blend - + La fenêtre 0 active le blend Window 1 enable BG 0 - + La fenêtre 1 active BG 0 Window 1 enable BG 1 - + Fenêtre 1 active BG 1 Window 1 enable BG 2 - + La fenêtre 1 active BG 2 Window 1 enable BG 3 - + La fenêtre 1 active BG 3 Window 1 enable OBJ - + La fenêtre 1 active OBJ Window 1 enable blend - + La fenêtre 1 active le blend Outside window enable BG 0 - + La fenêtre de sortie active le BG 0 Outside window enable BG 1 - + La fenêtre de sortie active le BG 1 Outside window enable BG 2 - + La fenêtre de sortie active le BG 2 Outside window enable BG 3 - + La fenêtre de sortie active le BG 3 Outside window enable OBJ - + La fenêtre de sortie active l'OBJ Outside window enable blend - + La fenêtre de sortie active le blend OBJ window enable BG 0 - + La fenêtre OBJ active le BG 0 OBJ window enable BG 1 - + La fenêtre OBJ active le BG 1 OBJ window enable BG 2 - + La fenêtre OBJ active le BG 2 OBJ window enable BG 3 - + La fenêtre OBJ active le BG 3 OBJ window enable OBJ - + La fenêtre OBJ active l'OBJ OBJ window enable blend - + La fenêtre OBJ active le blend Background mosaic size vertical - + Taille vertical de la mosaïque en arrière plan Background mosaic size horizontal - + Taille horizontal de la mosaïque en arrière plan Object mosaic size vertical - + Taille vertical de la mosaïque de l'objet Object mosaic size horizontal - + Taille horizontal de la mosaïque de l'objet BG 0 target 1 - + Cible 1 du BG 0 BG 1 target 1 - + Cible 1 du BG 1 BG 2 target 1 - + Cible 1 du BG 2 BG 3 target 1 - + Cible 1 du BG 3 OBJ target 1 - + Cible 1 de l'OBJ Backdrop target 1 - + Cible 1 du backdrop Blend mode - + Mode blend (mélange) Disabled - + Désactivé Additive blending - + Mélange additif Brighten - + Eclairé Darken - + Assombrie BG 0 target 2 - + Cible 2 du BG 0 BG 1 target 2 - + Cible 2 du BG 1 BG 2 target 2 - + Cible 2 du BG 2 BG 3 target 2 - + Cible 2 du BG 3 OBJ target 2 - + Cible 2 de l'OBJ Backdrop target 2 - + Cible 2 du Backdrop Blend A (target 1) - + Blend A (cible 1) Blend B (target 2) - + Blend A (cible 2) @@ -1835,13 +1836,13 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Sound length - + Longueur du son Duty cycle - + Cycle de la tâche @@ -1855,21 +1856,21 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Envelope increase - + Augmenter l'enveloppe Initial volume - + Volume initiale Sound frequency - + Fréquence du son @@ -1877,7 +1878,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Timed - + Compté @@ -1885,22 +1886,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Reset - + Redémarrer Double-size wave table - + Taille double de la table wave Active wave table - + Activer la table wave Enable channel 3 - + Activer le canal 3 @@ -1941,7 +1942,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Clock divider - + Divison de l'horloge @@ -1966,82 +1967,82 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. PSG volume right - + Volume droit PSG PSG volume left - + Volume gauche PSG Enable channel 1 right - + Activer le canal 1 à droite Enable channel 2 right - + Activer le canal 2 à droite Enable channel 3 right - + Activer le canal 3 à droite Enable channel 4 right - + Activer le canal 4 à droite Enable channel 1 left - + Activer le canal 1 à gauche Enable channel 2 left - + Activer le canal 2 à gauche Enable channel 3 left - + Activer le canal 3 à gauche Enable channel 4 left - + Activer le canal 4 à gauche PSG master volume - + Volume maître PSG Loud channel A - + Canal fort A Loud channel B - + Canal fort B Enable channel A right - + Activer le canal A de droite Enable channel A left - + Activer le canal A de gauche Channel A timer - + Compteur du canal A @@ -2065,52 +2066,52 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Channel A reset - + Redémarrer la canal A Enable channel B right - + Activer le canal B de droite Enable channel B left - + Activer le canal B de gauche Channel B timer - + Compteur du canal B Channel B reset - + Redémarrer la canal B Active channel 1 - + Activer le canal 1 Active channel 2 - + Activer le canal 2 Active channel 3 - + Activer le canal 3 Active channel 4 - + Activer le canal 4 Enable audio - + Activer l'audio @@ -2120,7 +2121,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Resolution - + Résolution @@ -2164,7 +2165,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Sample - + Echantillon @@ -2176,7 +2177,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Address (bottom) - + Adresse (en bas) @@ -2188,7 +2189,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Address (top) - + Adresse (en haut) @@ -2196,7 +2197,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Word count - + Compteur de Word @@ -2216,7 +2217,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Increment - + Incrémenter @@ -2228,7 +2229,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Decrement - + Decrémenter @@ -2240,7 +2241,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Fixed - + Corrigé @@ -2248,7 +2249,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Increment and reload - + Incrémenter et recharger @@ -2264,7 +2265,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Repeat - + Répèter @@ -2280,7 +2281,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Start timing - + Commencer le timing @@ -2288,7 +2289,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Immediate - + Immédiat @@ -2333,7 +2334,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Enable - + Activer @@ -2345,7 +2346,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Video Capture - + Capture Vidéo @@ -2358,7 +2359,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Value - + Valeur @@ -2366,7 +2367,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Scale - + Echelle @@ -2427,25 +2428,25 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Right - + Droite Left - + Gauche Up - + Haut Down - + Bas @@ -2599,32 +2600,32 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Cart 0 non-sequential - + Cart 0 non-séquentiel Cart 0 sequential - + Cart 0 séquentiel Cart 1 non-sequential - + Cart 1 non-séquentiel Cart 1 sequential - + Cart 1 séquentiel Cart 2 non-sequential - + Cart 2 non-séquentiel Cart 2 sequential - + Cart 2 séquentiel @@ -2634,7 +2635,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Disable - + Désactiver @@ -2659,7 +2660,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Enable IRQs - + Activer les IRQs @@ -2676,27 +2677,27 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Load State - + Charger un Etat Save State - + Sauvegarder un Etat Empty - + Vide Corrupted - + Corrompue Slot %1 - + Emplacement %1 @@ -2719,12 +2720,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. WARN - + AVERT ERROR - + ERREUR @@ -2734,7 +2735,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. GAME ERROR - + ERREUR JEU @@ -2742,22 +2743,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Map Addr. - + Définir l'Adre. Mirror - + Symétrie None - + Aucune Both - + Les deux @@ -2772,7 +2773,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Export map - + Définir l'export @@ -2782,7 +2783,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Failed to open output PNG file: %1 - + Echec de l'ouverture du fichier de sortie PNG : %1 @@ -2790,53 +2791,53 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Copy selection - + Copier la sélection Save selection - + Sauvegarder la sélection Paste - + Coller Load - + Charger All - + Tout Load TBL - + Charger le TBL Save selected memory - + Sauvegarder la mémoire sélectionné Failed to open output file: %1 - + Echec de l'ouverture du fichier de sortie : %1 Load memory - + Charger la mémoire Failed to open input file: %1 - + Echec de l'ouverture du fichier d'entrée : %1 @@ -2903,7 +2904,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Invalid - + Invalide @@ -2914,7 +2915,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Export sprite - + Exporter le Sprite @@ -2924,7 +2925,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Failed to open output PNG file: %1 - + Echec de l'ouverture du fichier d'entrée : %1 @@ -2954,7 +2955,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Export palette - + Exporter la palette @@ -2964,7 +2965,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Failed to open output palette file: %1 - + Echec de l'ouberture du fichier de sortie de la palette : %1 @@ -2972,7 +2973,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Save Printout - + Sauvegarder l'impression @@ -2989,7 +2990,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. (unknown) - + (inconnu) @@ -3000,7 +3001,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. (no database present) - + (aucune base de donnée présente) @@ -3034,22 +3035,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. None (Still Image) - + Aucune (encore l'image) Keyboard - + Clavier Controllers - + Contrôleurs Shortcuts - + Raccourcis @@ -3060,7 +3061,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Select BIOS - + Choisir le BIOS @@ -3068,32 +3069,32 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. No shader active - + Aucun shader actif Load shader - + Charger un shader No shader loaded - + Aucun shader chargé by %1 - + de %1 Preprocessing - + Pré-traitement Pass %1 - + Passe %1 @@ -3106,12 +3107,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Keyboard - + Clavier Gamepad - + Manette de jeu @@ -3119,7 +3120,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Failed to open output video file: %1 - + Echec de l'ouverture du fichier de sortie vidéo : %1 @@ -3129,7 +3130,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Select output file - + Choisir le fichier de sortie @@ -3137,22 +3138,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Game Boy Advance ROMs (%1) - + ROMs Game Boy Advance (%1) Game Boy ROMs (%1) - + ROMs Game Boy (%1) All ROMs (%1) - + Toutes les ROMs (%1) %1 Video Logs (*.mvl) - + %1 enregistrements vidéo (*.mvl) @@ -3164,29 +3165,29 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Select ROM - + Choisir une ROM Select folder - + Choisir un dossier Game Boy Advance save files (%1) - + Fichiers de sauvegarde Game Boy Advance (%1) Select save - + Choisir une sauvegarde Select patch - + Choisir un patch @@ -3196,85 +3197,87 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Select image - + Choisir une image Image file (*.png *.gif *.jpg *.jpeg);;All files (*) - + fichier Image (*.png *.gif *.jpg *.jpeg);;Tous les fichiers (*) GameShark saves (*.sps *.xps) - + Sauvegardes GameShark (*.sps *.xps) Select video log - + Choisir l'enregistrement vidéo Video logs (*.mvl) - + Enregistrements Vidéo (*.mvl) Crash - + Plantage The game has crashed with the following error: %1 - + Le jeu a planté avec l'erreur suivante : + +%1 Couldn't Load - + Ne peut pas charger Could not load game. Are you sure it's in the correct format? - + Ne peut pas charger le jeu. Etes vous sûr que le format est correcte ? Unimplemented BIOS call - + L'appel du bios n'est pas implémenté This game uses a BIOS call that is not implemented. Please use the official BIOS for best experience. - + Ce jeu utilises un appel du BIOS qui n'est pas implémenté. Veuillez utiliser un BIOS officeil pour une meilleure expèrience. Really make portable? - + Le rendre vraiment portable ? This will make the emulator load its configuration from the same directory as the executable. Do you want to continue? - + Ceci permettra à l'émulateur de charger la configuration depuis le même repértoire que le fichier exécutable. Souhaitez vous continuer ? Restart needed - + Un redémarrage est nécessaire Some changes will not take effect until the emulator is restarted. - + Certains changements ne prendront effet qu'après le redémarrage de l'émulateur. - Player %1 of %2 - + - Joueur %1 of %2 @@ -3294,62 +3297,62 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. &File - + &Fichier Load &ROM... - + Charger une &ROM... Load ROM in archive... - + Charger la ROM dans l'archive... Add folder to library... - + Ajouter un dossier à la bibliothèque... Load temporary save... - + Charger une sauvegarde temporaire... Load &patch... - + Charger un &patch... Boot BIOS - + Démarrer le BIOS Replace ROM... - + Remplacer la ROM... ROM &info... - + &Info sur la ROM... Recent - + Récent Make portable - + Rendre portable &Load state - + &Charger un Etat @@ -3359,7 +3362,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. &Save state - + &Sauvegarder un Etat @@ -3369,27 +3372,27 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Quick load - + Chargement rapide Quick save - + Sauvegarde rapide Load recent - + Charger un fichier récent Save recent - + Sauvegarder un fichier récent Undo load state - + Undo le chargement d'état @@ -3399,7 +3402,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Undo save state - + Undo la sauvegarde d'état @@ -3410,7 +3413,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. State &%1 - + Etat &%1 @@ -3425,32 +3428,32 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Load camera image... - + Charger l'image de la caméra... Import GameShark Save - + Importer une sauvegarde GameShark Export GameShark Save - + Exporter une sauvegarde GameShark New multiplayer window - + Nouvelle fenêtre multi joueur About - + A propos de E&xit - + Quitter @@ -3460,7 +3463,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. &Reset - + &Redémarrer @@ -3470,7 +3473,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Sh&utdown - + Extin&ction @@ -3490,7 +3493,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. &Next frame - + &Image suivante @@ -3500,12 +3503,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Fast forward (held) - + Avancée Rapide (maintenir) &Fast forward - + A&vancée rapide @@ -3515,12 +3518,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Fast forward speed - + Vitesse de l'avancée rapide Unbounded - + Non lié @@ -3530,12 +3533,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Rewind (held) - + Rembobiner (maintenir) Re&wind - + Rem&bobiner @@ -3555,52 +3558,52 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Sync to &video - + Synchro &vidéo Sync to &audio - + Synchro &audio Solar sensor - + Détection solaire Increase solar level - + Augmenter le niveau solaire Decrease solar level - + Diminuer le niveau solaire Brightest solar level - + Eclaircier le niveau solaire Darkest solar level - + Assombrir le niveau solaire Brightness %1 - + Luminosité %1 Audio/&Video - + Audio/&Vidéo Frame size - + Taille de l'image @@ -3610,37 +3613,37 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Toggle fullscreen - + Basculer en plein écran Lock aspect ratio - + Bloquer les proportions Force integer scaling - + Forcer la mise à l'échelle entier Bilinear filtering - + Filtrage bilinèaire Frame&skip - + &Saut d'image Mute - + Muet FPS target - + FPS cible @@ -3685,7 +3688,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Take &screenshot - + Prendre une ca&pture d'écran @@ -3695,177 +3698,177 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Record output... - + Enregistrer la sortie... Record GIF... - + Enregistrer le GIF... Record video log... - + Enregistrer l'enregsitrement vidéo... Stop video log - + Arrêter l'enregistrement vidéo Game Boy Printer... - + Imprimante GameBoy... Video layers - + Couches vidéo Audio channels - + Canaux audio &Tools - + Ou&tils View &logs... - + Voir les en&registrements... Game &overrides... - + Passer &outre le jeu... Game &Pak sensors... - + Détecteur Game &Pak... &Cheats... - + Tri&ches... Settings... - + Paramètres... Open debugger console... - + Ouvrir la console de débug... Start &GDB server... - + Démarrer le serveur &GDB... View &palette... - + Voir la &palette... View &sprites... - + Voir les &sprites... View &tiles... - + Voir les &tiles... View &map... - + Voir la &map... View memory... - + Voir la mémoire... Search memory... - + Fouiller la mémoire... View &I/O registers... - + Voir les registres &E/S... Exit fullscreen - + Quitter le plein écran GameShark Button (held) - + Bouton GameShark (maintenir) Autofire - + Tir Auto Autofire A - + Tir Auto A Autofire B - + Tir Auto B Autofire L - + Autofire LL Autofire R - + Tir Auto R Autofire Start - + Tir Auto Start Autofire Select - + Tir Auto Select Autofire Up - + Tir Auto Haut Autofire Right - + Tir Auto Droite Autofire Down - + Tir Auto Bas Autofire Left - + Tir Auto Gauche @@ -3891,12 +3894,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. ROM Info - + Info ROM Game name: - + Nom du Jeu : @@ -3906,7 +3909,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Internal name: - + Nom Interne : @@ -3916,7 +3919,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Game ID: - + ID du jeu : @@ -3926,7 +3929,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. File size: - + Taille du Fichier : @@ -3936,7 +3939,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. CRC32: - + CRC32 : @@ -3949,32 +3952,32 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Sensors - + Détecteurs Realtime clock - + Horloge en Temps Réel Fixed time - + Correction de l'heure System time - + Heure Système Start time at - + Démarrer l'heure à Now - + Maintenant @@ -3984,29 +3987,29 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Light sensor - + Détecteur de lumière Brightness - + Luminosité Tilt sensor - + Détecteur de Tilt Set Y - + Sélection Y Set X - + Sélection X @@ -4016,7 +4019,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Sensitivity - + Sensibilité @@ -4024,12 +4027,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Settings - + Paramètres Audio/Video - + Audio/Vidéo @@ -4049,7 +4052,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Paths - + Chemins @@ -4059,12 +4062,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Audio driver: - + Pilote Audio : Audio buffer: - + Tampon Audio @@ -4105,12 +4108,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. samples - + Echantillons Sample rate: - + Taux d'échantillonages @@ -4141,53 +4144,53 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Volume: - + Volume : Mute - + Muet Display driver: - + Pilote d'affichage : Frameskip: - + Saut d'image : Skip every - + Passer toutes les frames - + images FPS target: - + FPS cible : frames per second - + imaes par secondes Sync: - + Synchro : Video - + Vidéo @@ -4197,97 +4200,97 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Lock aspect ratio - + Bloquer les proportions Bilinear filtering - + Filtrage bilinèaire Force integer scaling - + Forcer la mise à l'échelle en entier Language - + Langue English - + Anglais Library: - + Bibliothèque : List view - + Voir la liste Tree view - + Voir l'arbre Show when no game open - + Afficher quand aucun jeu est ouvert Clear cache - + Vider le cache Allow opposing input directions - + Autoriser les directions opposées Suspend screensaver - + Suspendre l'écran de veille Pause when inactive - + Mettre en pause si inactif Show FPS in title bar - + Afficher les FPS dans la barre de titre Automatically save cheats - + Sauvegarder automatiquement les triches Automatically load cheats - + Charger automatiquement les triches Automatically save state - + Sauvegarder automatiquement l'état Automatically load state - + Charger automatiquement l'état Fast forward speed: - + Vitesse de l'Avance rapide : @@ -4297,85 +4300,85 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Unbounded - + Non lié Enable rewind - + Activer le rembobinage Rewind history: - + Historique du rembobinage : Idle loops: - + Boucles en veille : Run all - + Tout lancer Remove known - + Enlever le connu Detect and remove - + Détecter et enlever Savestate extra data: - + Donnée supplèm. Sauve. Etat : Screenshot - + Capture d'écran Save data - + Sauvegarder les données Cheat codes - + Codes de triches Load extra data: - + Charger les données supplèm. : Rewind affects save data - + Rembobiner données sauveg. Preload entire ROM into memory - + Précharger la mémoire complète dans la ROM Autofire interval: - + Intervalle du Tir Auto : GB BIOS file: - + Fichier BIOS GB : @@ -4388,37 +4391,37 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Browse - + Parcourir Use BIOS file if found - + Utiliser le fichier BIOS si trouvé Skip BIOS intro - + Passer l'intro du BIOS GBA BIOS file: - + Fichier BIOS GBA : GBC BIOS file: - + Fichier BIOS GBC : SGB BIOS file: - + Fichier BIOS SGB : Save games - + Jeu Sauvega. @@ -4427,17 +4430,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Same directory as the ROM - + Même répertoire que la ROM Save states - + Sauve. Etat Screenshots - + Capture Ecran @@ -4447,19 +4450,19 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Cheats - + Triches Game Boy model - + Modèle de GameBoy Autodetect - + Détection Automatique @@ -4502,27 +4505,27 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Default BG colors: - + Couleurs BG par défaut : Super Game Boy borders - + Bordures Super Game Boy Camera driver: - + Pilote de la Camèra : Default sprite colors 1: - + Couleurs Sprites 1 : Default sprite colors 2: - + Couleurs Sprites 2 : @@ -4535,17 +4538,17 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Active Shader: - + Sahder actif : Name - + Nom Author - + Auteur @@ -4555,12 +4558,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Unload Shader - + Décharger le Shader Load New Shader - + Charger nouveau shader @@ -4568,22 +4571,22 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Edit Shortcuts - + Editer le raccourci Keyboard - + Clavier Gamepad - + Manette de jeu Clear - + Vider @@ -4596,7 +4599,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. 256 colors - + 256 couleurs @@ -4614,32 +4617,32 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Record Video - + Enregistrer la vidéo Start - + Démarrer Stop - + Arrêter Select File - + Choix Fichier Presets - + Préréglages High Quality - + Haute qualité @@ -4675,7 +4678,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Native - + Natif @@ -4755,7 +4758,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Uncompressed - + Non compressé @@ -4790,12 +4793,12 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd. Lock aspect ratio - + Bloquer les proportions Show advanced - + Affichage avancées From 84b79b1ba8edfbdd6fe294c75e14fe9f1b4fd82c Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 14 Apr 2018 11:43:31 -0700 Subject: [PATCH 08/10] GBA Video: Fix OBJ blending regression (fix #1037) --- src/gba/renderers/video-software.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c index a4609c01b..0b3df681a 100644 --- a/src/gba/renderers/video-software.c +++ b/src/gba/renderers/video-software.c @@ -627,7 +627,7 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render } if (softwareRenderer->target1Obj && (softwareRenderer->blendEffect == BLEND_DARKEN || softwareRenderer->blendEffect == BLEND_BRIGHTEN)) { x = 0; - uint32_t mask = 0xFF000000 & ~FLAG_OBJWIN; + uint32_t mask = FLAG_REBLEND | FLAG_TARGET_1 | FLAG_IS_BACKGROUND; uint32_t match = FLAG_REBLEND; if (GBARegisterDISPCNTIsObjwinEnable(softwareRenderer->dispcnt)) { mask |= FLAG_OBJWIN; From f23f221d49b82007aeb030babadec6071da40f8b Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Tue, 17 Apr 2018 22:44:37 -0700 Subject: [PATCH 09/10] GB MBC: Fix MBC6 bank switching --- src/gb/mbc.c | 4 +++- src/gb/memory.c | 21 ++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/gb/mbc.c b/src/gb/mbc.c index 16d3e01f8..1097bf781 100644 --- a/src/gb/mbc.c +++ b/src/gb/mbc.c @@ -531,7 +531,7 @@ void _GBMBC5(struct GB* gb, uint16_t address, uint8_t value) { void _GBMBC6(struct GB* gb, uint16_t address, uint8_t value) { struct GBMemory* memory = &gb->memory; - int bank = value & 0x7F; + int bank = value; switch (address >> 10) { case 0: switch (value) { @@ -548,9 +548,11 @@ void _GBMBC6(struct GB* gb, uint16_t address, uint8_t value) { break; } break; + case 0x8: case 0x9: GBMBCSwitchHalfBank(gb, 0, bank); break; + case 0xC: case 0xD: GBMBCSwitchHalfBank(gb, 1, bank); break; diff --git a/src/gb/memory.c b/src/gb/memory.c index 089558011..d69f7329d 100644 --- a/src/gb/memory.c +++ b/src/gb/memory.c @@ -73,9 +73,20 @@ static void GBSetActiveRegion(struct LR35902Core* cpu, uint16_t address) { case GB_REGION_CART_BANK1 + 2: case GB_REGION_CART_BANK1 + 3: cpu->memory.cpuLoad8 = GBFastLoad8; - cpu->memory.activeRegion = memory->romBank; - cpu->memory.activeRegionEnd = GB_BASE_VRAM; - cpu->memory.activeMask = GB_SIZE_CART_BANK0 - 1; + if (gb->memory.mbcType != GB_MBC6) { + cpu->memory.activeRegion = memory->romBank; + cpu->memory.activeRegionEnd = GB_BASE_VRAM; + cpu->memory.activeMask = GB_SIZE_CART_BANK0 - 1; + } else { + cpu->memory.activeMask = GB_SIZE_CART_HALFBANK - 1; + if (address & 0x2000) { + cpu->memory.activeRegion = memory->mbcState.mbc6.romBank1; + cpu->memory.activeRegionEnd = GB_BASE_VRAM; + } else { + cpu->memory.activeRegion = memory->romBank; + cpu->memory.activeRegionEnd = GB_BASE_CART_BANK1 + 0x2000; + } + } break; default: cpu->memory.cpuLoad8 = GBLoad8; @@ -169,6 +180,10 @@ void GBMemoryReset(struct GB* gb) { case GB_MBC1: gb->memory.mbcState.mbc1.mode = 0; break; + case GB_MBC6: + GBMBCSwitchHalfBank(gb, 0, 2); + GBMBCSwitchHalfBank(gb, 1, 3); + break; default: memset(&gb->memory.mbcState, 0, sizeof(gb->memory.mbcState)); } From 4a10ea2f699d0d2bade8df17d513ba5f90bef949 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Wed, 18 Apr 2018 18:26:50 -0700 Subject: [PATCH 10/10] GB MBC: Add MBC6 SRAM support --- include/mgba/internal/gb/mbc.h | 1 + include/mgba/internal/gb/memory.h | 6 ++++ src/gb/mbc.c | 58 +++++++++++++++++++++++++++++-- src/gb/memory.c | 3 ++ 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/include/mgba/internal/gb/mbc.h b/include/mgba/internal/gb/mbc.h index 2269e5af7..72f4e1a47 100644 --- a/include/mgba/internal/gb/mbc.h +++ b/include/mgba/internal/gb/mbc.h @@ -21,6 +21,7 @@ void GBMBCSwitchBank(struct GB* gb, int bank); void GBMBCSwitchBank0(struct GB* gb, int bank); void GBMBCSwitchHalfBank(struct GB* gb, int half, int bank); void GBMBCSwitchSramBank(struct GB* gb, int bank); +void GBMBCSwitchSramHalfBank(struct GB* gb, int half, int bank); enum GBCam { GBCAM_WIDTH = 128, diff --git a/include/mgba/internal/gb/memory.h b/include/mgba/internal/gb/memory.h index ba4a155db..4c4020df8 100644 --- a/include/mgba/internal/gb/memory.h +++ b/include/mgba/internal/gb/memory.h @@ -26,6 +26,8 @@ enum { GB_BASE_CART_HALFBANK2 = 0x6000, GB_BASE_VRAM = 0x8000, GB_BASE_EXTERNAL_RAM = 0xA000, + GB_BASE_EXTERNAL_RAM_HALFBANK0 = 0xA000, + GB_BASE_EXTERNAL_RAM_HALFBANK1 = 0xB000, GB_BASE_WORKING_RAM_BANK0 = 0xC000, GB_BASE_WORKING_RAM_BANK1 = 0xD000, GB_BASE_OAM = 0xFE00, @@ -53,6 +55,7 @@ enum { GB_SIZE_VRAM = 0x4000, GB_SIZE_VRAM_BANK0 = 0x2000, GB_SIZE_EXTERNAL_RAM = 0x2000, + GB_SIZE_EXTERNAL_RAM_HALFBANK = 0x1000, GB_SIZE_WORKING_RAM = 0x8000, GB_SIZE_WORKING_RAM_BANK0 = 0x1000, GB_SIZE_OAM = 0xA0, @@ -110,6 +113,9 @@ struct GBMBC1State { struct GBMBC6State { int currentBank1; uint8_t* romBank1; + bool sramAccess; + int currentSramBank1; + uint8_t* sramBank1; }; struct GBMBC7State { diff --git a/src/gb/mbc.c b/src/gb/mbc.c index 1097bf781..703ec4e3f 100644 --- a/src/gb/mbc.c +++ b/src/gb/mbc.c @@ -32,6 +32,7 @@ static void _GBPocketCam(struct GB* gb, uint16_t address, uint8_t value); static void _GBTAMA5(struct GB* gb, uint16_t address, uint8_t value); static uint8_t _GBMBC2Read(struct GBMemory*, uint16_t address); +static uint8_t _GBMBC6Read(struct GBMemory*, uint16_t address); static uint8_t _GBMBC7Read(struct GBMemory*, uint16_t address); static void _GBMBC7Write(struct GBMemory* memory, uint16_t address, uint8_t value); @@ -114,6 +115,22 @@ void GBMBCSwitchSramBank(struct GB* gb, int bank) { gb->memory.sramCurrentBank = bank; } +void GBMBCSwitchSramHalfBank(struct GB* gb, int half, int bank) { + size_t bankStart = bank * GB_SIZE_EXTERNAL_RAM_HALFBANK; + if (bankStart + GB_SIZE_EXTERNAL_RAM_HALFBANK > gb->sramSize) { + mLOG(GB_MBC, GAME_ERROR, "Attempting to switch to an invalid RAM bank: %0X", bank); + bankStart &= (gb->sramSize - 1); + bank = bankStart / GB_SIZE_EXTERNAL_RAM_HALFBANK; + } + if (!half) { + gb->memory.sramBank = &gb->memory.sram[bankStart]; + gb->memory.sramCurrentBank = bank; + } else { + gb->memory.mbcState.mbc6.sramBank1 = &gb->memory.sram[bankStart]; + gb->memory.mbcState.mbc6.currentSramBank1 = bank; + } +} + void GBMBCInit(struct GB* gb) { const struct GBCartridge* cart = (const struct GBCartridge*) &gb->memory.rom[0x100]; if (gb->memory.rom) { @@ -230,6 +247,7 @@ void GBMBCInit(struct GB* gb) { case GB_MBC6: mLOG(GB_MBC, WARN, "unimplemented MBC: MBC6"); gb->memory.mbcWrite = _GBMBC6; + gb->memory.mbcRead = _GBMBC6Read; break; case GB_MBC7: gb->memory.mbcWrite = _GBMBC7; @@ -536,11 +554,10 @@ void _GBMBC6(struct GB* gb, uint16_t address, uint8_t value) { case 0: switch (value) { case 0: - memory->sramAccess = false; + memory->mbcState.mbc6.sramAccess = false; break; case 0xA: - memory->sramAccess = true; - GBMBCSwitchSramBank(gb, memory->sramCurrentBank); + memory->mbcState.mbc6.sramAccess = true; break; default: // TODO @@ -548,6 +565,12 @@ void _GBMBC6(struct GB* gb, uint16_t address, uint8_t value) { break; } break; + case 0x1: + GBMBCSwitchSramHalfBank(gb, 0, bank); + break; + case 0x2: + GBMBCSwitchSramHalfBank(gb, 1, bank); + break; case 0x8: case 0x9: GBMBCSwitchHalfBank(gb, 0, bank); @@ -556,12 +579,41 @@ void _GBMBC6(struct GB* gb, uint16_t address, uint8_t value) { case 0xD: GBMBCSwitchHalfBank(gb, 1, bank); break; + case 0x28: + case 0x29: + case 0x2A: + case 0x2B: + if (memory->mbcState.mbc6.sramAccess) { + memory->sramBank[address & (GB_SIZE_EXTERNAL_RAM_HALFBANK - 1)] = value; + } + break; + case 0x2C: + case 0x2D: + case 0x2E: + case 0x2F: + if (memory->mbcState.mbc6.sramAccess) { + memory->mbcState.mbc6.sramBank1[address & (GB_SIZE_EXTERNAL_RAM_HALFBANK - 1)] = value; + } + break; default: mLOG(GB_MBC, STUB, "MBC6 unknown address: %04X:%02X", address, value); break; } } +uint8_t _GBMBC6Read(struct GBMemory* memory, uint16_t address) { + if (!memory->mbcState.mbc6.sramAccess) { + return 0xFF; + } + switch (address >> 12) { + case 0xA: + return memory->sramBank[address & (GB_SIZE_EXTERNAL_RAM_HALFBANK - 1)]; + case 0xB: + return memory->mbcState.mbc6.sramBank1[address & (GB_SIZE_EXTERNAL_RAM_HALFBANK - 1)]; + } + return 0xFF; +} + void _GBMBC7(struct GB* gb, uint16_t address, uint8_t value) { int bank = value & 0x7F; switch (address >> 13) { diff --git a/src/gb/memory.c b/src/gb/memory.c index d69f7329d..799234ae4 100644 --- a/src/gb/memory.c +++ b/src/gb/memory.c @@ -183,6 +183,9 @@ void GBMemoryReset(struct GB* gb) { case GB_MBC6: GBMBCSwitchHalfBank(gb, 0, 2); GBMBCSwitchHalfBank(gb, 1, 3); + gb->memory.mbcState.mbc6.sramAccess = false; + GBMBCSwitchSramHalfBank(gb, 0, 0); + GBMBCSwitchSramHalfBank(gb, 0, 1); break; default: memset(&gb->memory.mbcState, 0, sizeof(gb->memory.mbcState));