Skip to content

Replaced emulator-player mode hot patches with updates to menu.py #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replaced emulator-player mode hot patches with updates to menu.py #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions ThumbyGames/menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,21 @@ def saveConfigSetting(key, setting):
xScrollTarget=0

selpos = -1
files = listdir("/Games")
try:
files = listdir("/Games")
except OSError:
# Games folder missing, assume emulation mode.
with open('/__Games__', 'r') as games:
files = games.readlines()
selected = False
scroll = 0

for k in range(len(files)):
if(stat("/Games/"+files[k])[0] != 16384):
files[k] = ""
try:
if(stat("/Games/"+files[k])[0] != 16384):
files[k] = ""
except OSError:
pass # File missing, which is expected in emulation mode
try:
while(True):
files.remove("")
Expand Down Expand Up @@ -191,6 +199,8 @@ def launchGame():
gamePath="/Games/"+files[selpos]+"/"+files[selpos]+".py"
saveConfigSetting("lastgame", gamePath)
mem32[0x4005800C]=1 # WDT scratch register '0'
# In case emulating, inform the emulator to load the game.
print(f"HEYTHUMBY!LOAD:{files[selpos] if selpos >=0 else ""}")
soft_reset()


Expand Down Expand Up @@ -421,4 +431,4 @@ def launchGame():
settings=[audioSettings[audioSetting], brightnessSettings[brightnessSetting]]


thumby.reset()
thumby.reset()
41 changes: 20 additions & 21 deletions js/play.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,19 @@ conta._layoutManager = hidden;
conta._layoutManager.on = (a, b) => {};

// Start warming up the emulator
var EDITORS = [];
var EDITORS = {};
var MAIN_EDITOR = null;
var GAME_EDITOR = null;
var GAME_LOADED = false;
const emu = await new EMULATOR(conta, {}, EDITORS);
const starter = () => {
loading.style.display = "initial"
if (MAIN_EDITOR && GAME_EDITOR) {
GAME_EDITOR.state.mainChecked = false;
GAME_EDITOR.MAIN_EMU_CHECKBOX.checked = false;
if (MAIN_EDITOR && GAME_LOADED) {
// Remove all previous game files
Object.keys(EDITORS).forEach((k)=>{
if (k.startsWith('PlayerEditorGameFile')) {
delete EDITORS[k];
}
});
MAIN_EDITOR.state.mainChecked = true;
MAIN_EDITOR.MAIN_EMU_CHECKBOX.checked = true;
}
Expand Down Expand Up @@ -199,7 +203,7 @@ const openGame = async (gameName) => {
state.path = thumbyPathAndURL;

// Ensure no collisions with normal editors or cached data
state.id = `PlayerEditor${i}`;
state.id = `PlayerEditorGameFile${i}`;
(new EditorWrapper(conta, state, EDITORS)).clearStorage();

// When games are opened, check the boxes so emulation can happen right away
Expand All @@ -208,9 +212,8 @@ const openGame = async (gameName) => {
}else{
state.normalChecked = true;
}

const edi = new EditorWrapper(conta, state, EDITORS);
if (state.mainChecked) {GAME_EDITOR = edi}
new EditorWrapper(conta, state, EDITORS);
GAME_LOADED = true;
});
}
}
Expand All @@ -230,6 +233,13 @@ else {
games.sort();

// Load the menu
(new EditorWrapper(conta, {"id": "PlayerEditorGames"}, EDITORS)).clearStorage();
new EditorWrapper(conta, {
"id": "PlayerEditorGames",
"path": "/__Games__",
"value": Array.from(new TextEncoder("utf-8").encode(games.join("\n"))),
"normalChecked": true
}, EDITORS);
await fetch("ThumbyGames/main.py").then(async (response) => {
(new EditorWrapper(conta, {"id": "PlayerEditorMain"}, EDITORS)).clearStorage();
MAIN_EDITOR = new EditorWrapper(conta, {
Expand All @@ -241,21 +251,10 @@ else {
});
await fetch("ThumbyGames/menu.py").then(async (response) => {
(new EditorWrapper(conta, {"id": "PlayerEditorMenu"}, EDITORS)).clearStorage();
var data = new TextDecoder("utf-8").decode(new Uint8Array(await response.arrayBuffer()));
// Patch the menu to work in the emulator
data = data.replace(
'files = listdir("/Games")',
`files = """${games.join("\n")}""".split("\\n")`)
data = data.replace(
'stat("/Games/"+files[k])[0] != 16384',
'False');
data = data.replace(
'mem32[0x4005800C]=1',
'print(f"HEYTHUMBY!LOAD:{files[selpos] if selpos >=0 else ""}")')
new EditorWrapper(conta, {
"id": "PlayerEditorMenu",
"path": "/menu.py",
"value": Array.from(new TextEncoder("utf-8").encode(data)),
"value": Array.from(new Uint8Array(await response.arrayBuffer())),
"normalChecked": true
}, EDITORS);
});
Expand Down