summaryrefslogtreecommitdiff
path: root/resources/js/memory.js
diff options
context:
space:
mode:
Diffstat (limited to 'resources/js/memory.js')
-rw-r--r--resources/js/memory.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/resources/js/memory.js b/resources/js/memory.js
index 35da905..6450136 100644
--- a/resources/js/memory.js
+++ b/resources/js/memory.js
@@ -212,7 +212,12 @@ const Memory = {
Memory.state.opponent.activeMonster = Memory.state.opponent.monsters[loadedState.opponent.activeMonsterIdx];
Memory.state.rivalMonster = loadedState.rivalMonster;
Memory.state.activeTechnique = await loadTechnique(loadedState.activeTechnique);
- Memory.state.activeBall = await loadInventoryItem(loadedState.activeBall);
+
+ if (Memory.state.activeBall instanceof String) { // backwards compat: TODO: remove check later
+ Memory.state.activeBall = loadedState.activeBall;
+ } else {
+ Memory.state.activeBall = loadedState.activeBall && loadedState.activeBall.slug;
+ }
// draw game
if (!Game.isTown(Memory.state.currentArea)) {