From fdb3d5bbb6f37d9c9301ae0fb9935e1425c00da9 Mon Sep 17 00:00:00 2001 From: Daan Vanden Bosch Date: Thu, 29 Oct 2020 19:09:23 +0100 Subject: [PATCH] Fixed various bugs. --- .../assembly/opcodes.schema.json | 4 +- lib/assetsGeneration/assembly/opcodes.yml | 928 +++++++++--------- lib/build.gradle.kts | 4 +- .../world/phantasmal/lib/assembly/Assembly.kt | 12 +- .../phantasmal/lib/assembly/Instructions.kt | 4 +- .../world/phantasmal/lib/assembly/Opcode.kt | 21 +- .../dataFlowAnalysis/GetRegisterValue.kt | 2 +- .../dataFlowAnalysis/GetStackValue.kt | 7 +- .../lib/cursor/AbstractWritableCursor.kt | 11 + .../phantasmal/lib/cursor/BufferCursor.kt | 18 + .../world/phantasmal/lib/cursor/Cursor.kt | 5 + .../phantasmal/lib/cursor/WritableCursor.kt | 5 + .../lib/fileFormats/quest/ByteCode.kt | 18 +- .../phantasmal/lib/fileFormats/quest/Dat.kt | 54 +- .../phantasmal/lib/cursor/CursorTests.kt | 32 +- .../lib/cursor/WritableCursorTests.kt | 14 + .../quest/{ByteCode.kt => ByteCodeTests.kt} | 2 +- .../lib/fileFormats/quest/DatTests.kt | 16 + .../lib/fileFormats/quest/QuestTests.kt | 31 +- .../resources/quest118_e_decompressed.dat | Bin 0 -> 36780 bytes .../lib/cursor/ArrayBufferCursor.kt | 13 + 21 files changed, 652 insertions(+), 549 deletions(-) rename lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/{ByteCode.kt => ByteCodeTests.kt} (98%) create mode 100644 lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/DatTests.kt create mode 100644 lib/src/commonTest/resources/quest118_e_decompressed.dat diff --git a/lib/assetsGeneration/assembly/opcodes.schema.json b/lib/assetsGeneration/assembly/opcodes.schema.json index eb9378fa..7732dc9a 100644 --- a/lib/assetsGeneration/assembly/opcodes.schema.json +++ b/lib/assetsGeneration/assembly/opcodes.schema.json @@ -96,8 +96,8 @@ "enum": [ "any", "byte", - "word", - "dword", + "short", + "int", "float", "label", "instruction_label", diff --git a/lib/assetsGeneration/assembly/opcodes.yml b/lib/assetsGeneration/assembly/opcodes.yml index f305b57d..25b53c4b 100644 --- a/lib/assetsGeneration/assembly/opcodes.yml +++ b/lib/assetsGeneration/assembly/opcodes.yml @@ -17,7 +17,7 @@ opcodes: - code: 0x03 mnemonic: exit params: - - type: dword + - type: int stack: pop - code: 0x04 @@ -56,11 +56,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x09 @@ -69,9 +69,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x0a mnemonic: letb @@ -89,9 +89,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: word + - type: short access: write - - type: word + - type: short - code: 0x0c mnemonic: leta @@ -122,7 +122,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0x11 @@ -131,7 +131,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0x12 @@ -140,37 +140,37 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read_write - code: 0x13 mnemonic: gset params: - - type: word + - type: short - code: 0x14 mnemonic: gclear params: - - type: word + - type: short - code: 0x15 mnemonic: grev params: - - type: word + - type: short - code: 0x16 mnemonic: glet params: - - type: word + - type: short - code: 0x17 mnemonic: gget doc: Sets a register to value of the given flag. params: - - type: word + - type: short - type: reg_tup_ref reg_tup: - - type: word + - type: short access: write - code: 0x18 @@ -178,11 +178,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x19 @@ -190,20 +190,20 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x1a mnemonic: sub params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x1b @@ -211,20 +211,20 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x1c mnemonic: mul params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x1d @@ -232,20 +232,20 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x1e mnemonic: div params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x1f @@ -253,20 +253,20 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x20 mnemonic: and params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x21 @@ -274,20 +274,20 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x22 mnemonic: or params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x23 @@ -295,20 +295,20 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x24 mnemonic: xor params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x25 @@ -316,20 +316,20 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x26 mnemonic: mod params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0x27 @@ -337,9 +337,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0x28 mnemonic: jmp @@ -383,9 +383,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x2e @@ -406,9 +406,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x30 @@ -416,11 +416,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label @@ -429,9 +429,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x32 @@ -439,11 +439,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label @@ -452,9 +452,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x34 @@ -462,11 +462,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label @@ -475,9 +475,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x36 @@ -485,11 +485,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label @@ -498,9 +498,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x38 @@ -508,11 +508,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label @@ -521,9 +521,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x3a @@ -531,11 +531,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label @@ -544,9 +544,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x3c @@ -554,11 +554,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label @@ -567,9 +567,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x3e @@ -577,11 +577,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label @@ -590,9 +590,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int - type: instruction_label - code: 0x40 @@ -600,7 +600,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label_var @@ -609,7 +609,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: instruction_label_var @@ -635,7 +635,7 @@ opcodes: params: - type: reg_ref access: read - - type: dword + - type: int - code: 0x45 mnemonic: stack_popm @@ -643,7 +643,7 @@ opcodes: params: - type: reg_ref access: write - - type: dword + - type: int - code: 0x48 mnemonic: arg_pushr @@ -659,7 +659,7 @@ opcodes: mnemonic: arg_pushl doc: Pushes the given value onto the stack. params: - - type: dword + - type: int stack: push - code: 0x4a @@ -673,7 +673,7 @@ opcodes: mnemonic: arg_pushw doc: Pushes the given value onto the stack. params: - - type: word + - type: short stack: push - code: 0x4c @@ -714,7 +714,7 @@ opcodes: - code: 0x50 mnemonic: message params: - - type: dword + - type: int - type: string stack: pop @@ -742,25 +742,25 @@ opcodes: - code: 0x54 mnemonic: se params: - - type: dword + - type: int stack: pop - code: 0x55 mnemonic: bgm params: - - type: dword + - type: int stack: pop - code: 0x58 mnemonic: enable params: - - type: dword + - type: int stack: pop - code: 0x59 mnemonic: disable params: - - type: dword + - type: int stack: pop - code: 0x5a @@ -784,7 +784,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0x5e @@ -802,19 +802,19 @@ opcodes: - code: 0x61 mnemonic: npc_stop params: - - type: dword + - type: int stack: pop - code: 0x62 mnemonic: npc_play params: - - type: dword + - type: int stack: pop - code: 0x63 mnemonic: npc_kill params: - - type: dword + - type: int stack: pop - code: 0x64 @@ -846,7 +846,7 @@ opcodes: - code: 0x68 mnemonic: create_pipe params: - - type: dword + - type: int stack: pop - code: 0x69 @@ -856,7 +856,7 @@ opcodes: reg_tup: # TODO: determine type and access - type: any access: read - - type: dword + - type: int stack: pop - code: 0x6a @@ -864,9 +864,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int doc: Player slot. stack: pop @@ -889,7 +889,7 @@ opcodes: - code: 0x6e mnemonic: p_look params: - - type: dword + - type: int stack: pop - code: 0x70 @@ -903,13 +903,13 @@ opcodes: - code: 0x72 mnemonic: disable_movement1 params: - - type: dword + - type: int stack: pop - code: 0x73 mnemonic: enable_movement1 params: - - type: dword + - type: int stack: pop - code: 0x74 @@ -924,20 +924,20 @@ opcodes: mnemonic: p_setpos doc: Sets a player's position. params: - - type: dword + - type: int doc: Player slot. - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: X coordinate. access: read - - type: dword + - type: int doc: Y coordinate. access: read - - type: dword + - type: int doc: Z coordinate. access: read - - type: dword + - type: int doc: Y-axis rotation. access: read stack: pop @@ -949,7 +949,7 @@ opcodes: - code: 0x78 mnemonic: p_talk_guild params: - - type: dword + - type: int stack: pop - code: 0x79 @@ -963,7 +963,7 @@ opcodes: - code: 0x7a mnemonic: npc_talk_kill params: - - type: dword + - type: int stack: pop - code: 0x7b @@ -993,8 +993,8 @@ opcodes: - code: 0x7e mnemonic: p_look_at_v1 params: - - type: dword - - type: dword + - type: int + - type: int stack: pop - code: 0x7f @@ -1026,15 +1026,15 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - code: 0x85 @@ -1051,16 +1051,16 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: X coordinate. access: read - - type: dword + - type: int doc: Y coordinate. access: read - - type: dword + - type: int doc: Z coordinate. access: read - - type: dword + - type: int doc: Player slot. access: read @@ -1069,13 +1069,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - code: 0x89 @@ -1084,7 +1084,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0x8a @@ -1092,11 +1092,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - code: 0x8b @@ -1104,13 +1104,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - code: 0x8c @@ -1118,13 +1118,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - type: instruction_label access: read @@ -1134,13 +1134,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - type: instruction_label access: read @@ -1150,13 +1150,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - type: instruction_label access: read @@ -1172,25 +1172,25 @@ opcodes: - code: 0x90 mnemonic: switch_on params: - - type: dword + - type: int stack: pop - code: 0x91 mnemonic: switch_off params: - - type: dword + - type: int stack: pop - code: 0x92 mnemonic: playbgm_epi params: - - type: dword + - type: int stack: pop - code: 0x93 mnemonic: set_mainwarp params: - - type: dword + - type: int stack: pop - code: 0x94 @@ -1199,22 +1199,22 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: X coordinate. access: read - - type: dword + - type: int doc: Y coordinate. access: read - - type: dword + - type: int doc: Z coordinate. access: read - - type: dword + - type: int doc: Collision radius. access: read - type: instruction_label doc: Function label. access: read - - type: dword + - type: int doc: Vertical position of the cursor. access: read - type: reg_tup_ref @@ -1226,7 +1226,7 @@ opcodes: - code: 0x95 mnemonic: set_floor_handler params: - - type: dword + - type: int doc: Floor number. - type: instruction_label doc: Handler function label. @@ -1235,7 +1235,7 @@ opcodes: - code: 0x96 mnemonic: clr_floor_handler params: - - type: dword + - type: int doc: Floor number. stack: pop @@ -1301,8 +1301,8 @@ opcodes: - code: 0xb0 mnemonic: pl_add_meseta params: - - type: dword - - type: dword + - type: int + - type: int stack: pop - code: 0xb1 @@ -1361,11 +1361,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: # TODO: determine type and access @@ -1387,7 +1387,7 @@ opcodes: - code: 0xb8 mnemonic: setevt params: - - type: dword + - type: int stack: pop - code: 0xb9 @@ -1398,7 +1398,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0xba @@ -1421,7 +1421,7 @@ opcodes: - code: 0xc1 mnemonic: npc_text params: - - type: dword + - type: int - type: string stack: pop @@ -1462,7 +1462,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0xca @@ -1476,7 +1476,7 @@ opcodes: - code: 0xcb mnemonic: set_quest_board_handler params: - - type: dword + - type: int - type: instruction_label - type: string stack: pop @@ -1484,7 +1484,7 @@ opcodes: - code: 0xcc mnemonic: clear_quest_board_handler params: - - type: dword + - type: int stack: pop - code: 0xcd @@ -1492,13 +1492,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - code: 0xce @@ -1558,8 +1558,8 @@ opcodes: - code: 0xd8 mnemonic: set_eventflag_v3 params: - - type: dword - - type: dword + - type: int + - type: int stack: pop - code: 0xd9 @@ -1567,9 +1567,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int - code: 0xda mnemonic: set_returnhunter @@ -1606,7 +1606,7 @@ opcodes: reg_tup: # TODO: determine type and access - type: any access: read - - type: dword + - type: int stack: pop - code: 0xe0 @@ -1616,7 +1616,7 @@ opcodes: - code: 0xe1 mnemonic: clear_mainwarp params: - - type: dword + - type: int stack: pop - code: 0xe2 @@ -1634,7 +1634,7 @@ opcodes: reg_tup: # TODO: determine type and access - type: any access: read - - type: dword + - type: int stack: pop - code: 0xe4 @@ -1650,7 +1650,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0xe7 @@ -1658,13 +1658,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write # TODO: determine reg_tup - code: 0xe8 mnemonic: set_eventflag2 params: - - type: dword + - type: int - type: reg_tup_ref reg_tup: # TODO: determine type and access - type: any @@ -1689,12 +1689,12 @@ opcodes: reg_tup: # TODO: determine type and access - type: any access: read - - type: dword + - type: int - code: 0xeb mnemonic: enable_bgmctrl params: - - type: dword + - type: int stack: pop - code: 0xec @@ -1712,7 +1712,7 @@ opcodes: - code: 0xee mnemonic: pl_add_meseta2 params: - - type: dword + - type: int stack: pop - code: 0xef @@ -1720,9 +1720,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int stack: pop - code: 0xf0 @@ -1734,17 +1734,17 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - code: 0xf2 @@ -1761,7 +1761,7 @@ opcodes: - code: 0xfb params: - - type: word + - type: short - code: 0xf801 mnemonic: set_chat_callback @@ -1779,7 +1779,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0xf809 @@ -1788,7 +1788,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0xf80a @@ -1797,18 +1797,18 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: X coordinate. access: write - - type: dword + - type: int doc: Y coordinate. access: write - - type: dword + - type: int doc: Z coordinate. access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -1825,31 +1825,31 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - code: 0xf80e params: - - type: dword + - type: int stack: pop - code: 0xf80f params: - - type: dword + - type: int stack: pop - code: 0xf810 mnemonic: ba_initial_floor params: - - type: dword + - type: int stack: pop - code: 0xf811 @@ -1858,52 +1858,52 @@ opcodes: - code: 0xf812 params: - - type: dword + - type: int stack: pop - code: 0xf813 params: - - type: dword + - type: int stack: pop - code: 0xf814 params: - - type: dword + - type: int stack: pop - code: 0xf815 params: - - type: dword + - type: int stack: pop - code: 0xf816 params: - - type: dword + - type: int stack: pop - code: 0xf817 params: - - type: dword + - type: int stack: pop - code: 0xf818 params: - - type: dword + - type: int stack: pop - code: 0xf819 params: - - type: dword + - type: int stack: pop - code: 0xf81a params: - - type: dword + - type: int stack: pop - code: 0xf81b params: - - type: dword + - type: int stack: pop - code: 0xf81c @@ -1915,29 +1915,29 @@ opcodes: - code: 0xf81d mnemonic: death_lvl_up params: - - type: dword + - type: int stack: pop - code: 0xf81e mnemonic: death_tech_lvl_up params: - - type: dword + - type: int stack: pop - code: 0xf820 mnemonic: cmode_stage params: - - type: dword + - type: int stack: pop - code: 0xf823 params: - - type: dword + - type: int stack: pop - code: 0xf824 params: - - type: dword + - type: int stack: pop - code: 0xf825 @@ -1970,23 +1970,23 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Floor ID. access: read - code: 0xf82b mnemonic: unlock_door2 - params: [{ type: dword }, { type: dword }] + params: [{ type: int }, { type: int }] stack: pop - code: 0xf82c mnemonic: lock_door2 - params: [{ type: dword }, { type: dword }] + params: [{ type: int }, { type: int }] stack: pop - code: 0xf82d @@ -1994,9 +1994,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: read - - type: dword + - type: int access: write - code: 0xf82e @@ -2004,18 +2004,18 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Floor ID. access: read - - type: dword + - type: int doc: Switch ID. access: read - - type: dword + - type: int doc: Will be set to 1 if the switch is pressed, 0 otherwise. access: write - code: 0xf82f - params: [{ type: dword }, { type: dword }] + params: [{ type: int }, { type: int }] stack: pop - code: 0xf830 @@ -2023,7 +2023,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: read - code: 0xf831 @@ -2035,7 +2035,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2044,7 +2044,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2053,18 +2053,18 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: read - code: 0xf83d params: - - type: dword + - type: int stack: pop - code: 0xf83e mnemonic: delete_area_title params: - - type: dword + - type: int stack: pop - code: 0xf840 @@ -2081,7 +2081,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf849 @@ -2089,7 +2089,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf84a @@ -2097,7 +2097,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf84b @@ -2105,7 +2105,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf84c @@ -2113,7 +2113,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf84d @@ -2121,7 +2121,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf84e @@ -2129,7 +2129,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf84f @@ -2137,7 +2137,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf850 @@ -2145,19 +2145,19 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf851 params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf852 params: - - type: dword + - type: int stack: pop - code: 0xf853 @@ -2187,24 +2187,24 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: read - code: 0xf85b mnemonic: unequip_item params: - - type: dword - - type: dword + - type: int + - type: int stack: pop - code: 0xf85e params: - - type: dword + - type: int stack: pop - code: 0xf85f params: - - type: dword + - type: int stack: pop - code: 0xf860 @@ -2212,13 +2212,13 @@ opcodes: - code: 0xf861 params: - - type: dword + - type: int stack: pop - code: 0xf864 mnemonic: cmode_rank params: - - type: dword + - type: int - type: string stack: pop @@ -2235,7 +2235,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: read - code: 0xf868 @@ -2290,25 +2290,25 @@ opcodes: - code: 0xf86f mnemonic: ba_set_lives params: - - type: dword + - type: int stack: pop - code: 0xf870 mnemonic: ba_set_tech_lvl params: - - type: dword + - type: int stack: pop - code: 0xf871 mnemonic: ba_set_lvl params: - - type: dword + - type: int stack: pop - code: 0xf872 mnemonic: ba_set_time_limit params: - - type: dword + - type: int stack: pop - code: 0xf873 @@ -2325,7 +2325,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2335,7 +2335,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2345,12 +2345,12 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player gender. access: write @@ -2360,15 +2360,15 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player race. 0 If human, 1 if newman, 2 if cast. access: write - - type: dword + - type: int doc: Player class. 0 If hunter, 1 if ranger, 2 if force. access: write @@ -2378,15 +2378,15 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - - type: dword + - type: int doc: Amount of meseta to take. access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Will be set to 1 if the meseta was taken, 0 otherwise. access: write @@ -2415,7 +2415,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - code: 0xf882 @@ -2424,7 +2424,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - code: 0xf883 @@ -2494,39 +2494,39 @@ opcodes: - code: 0xf891 mnemonic: load_enemy_data params: - - type: dword + - type: int stack: pop - code: 0xf892 mnemonic: get_physical_data params: - - type: word + - type: short - code: 0xf893 mnemonic: get_attack_data params: - - type: word + - type: short - code: 0xf894 mnemonic: get_resist_data params: - - type: word + - type: short - code: 0xf895 mnemonic: get_movement_data params: - - type: word + - type: short - code: 0xf898 mnemonic: shift_left params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0xf899 @@ -2534,11 +2534,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0xf89a @@ -2546,13 +2546,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write # TODO: Do you have to change areas after calling this opcode? @@ -2575,7 +2575,7 @@ opcodes: - code: 0xf89e params: - - type: dword + - type: int stack: pop - code: 0xf89f @@ -2587,7 +2587,7 @@ opcodes: - code: 0xf8a8 params: - - type: dword + - type: int stack: pop - code: 0xf8a9 @@ -2614,7 +2614,7 @@ opcodes: reg_tup: - type: byte access: write - - type: dword + - type: int doc: Address to read from. - code: 0xf8b1 @@ -2624,9 +2624,9 @@ opcodes: - type: reg_tup_ref doc: Register to store the result to. reg_tup: - - type: word + - type: short access: write - - type: dword + - type: int doc: Address to read from. - code: 0xf8b2 @@ -2636,16 +2636,16 @@ opcodes: - type: reg_tup_ref doc: Register to store the result to. reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int doc: Address to read from. - code: 0xf8b3 mnemonic: write1 doc: Writes a 1-byte value to an arbitrary location. params: - - type: dword + - type: int doc: Address to write to. - type: byte doc: Value to be written. @@ -2655,9 +2655,9 @@ opcodes: mnemonic: write2 doc: Writes a 2-byte value to an arbitrary location. params: - - type: dword + - type: int doc: Address to write to. - - type: word + - type: short doc: Value to be written. stack: pop @@ -2665,9 +2665,9 @@ opcodes: mnemonic: write4 doc: Writes a 4-byte value to an arbitrary location. params: - - type: dword + - type: int doc: Address to write to. - - type: dword + - type: int doc: Value to be written. stack: pop @@ -2678,12 +2678,12 @@ opcodes: - code: 0xf8bc mnemonic: set_episode params: - - type: dword + - type: int - code: 0xf8c0 mnemonic: file_dl_req params: - - type: dword + - type: int - type: string stack: pop @@ -2730,15 +2730,15 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Animation ID. access: read - - type: dword + - type: int doc: Animation duration in number of frames. access: read @@ -2747,7 +2747,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2768,12 +2768,12 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0xf8cb @@ -2788,7 +2788,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2797,7 +2797,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2806,7 +2806,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2815,7 +2815,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2824,7 +2824,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2833,7 +2833,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2842,7 +2842,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2851,7 +2851,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2860,7 +2860,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2869,7 +2869,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read @@ -2885,7 +2885,7 @@ opcodes: - code: 0xf8d7 mnemonic: fleti_locked_camera params: - - type: dword + - type: int - type: reg_tup_ref reg_tup: # TODO: determine type and access - type: any @@ -2906,15 +2906,15 @@ opcodes: - code: 0xf8db params: - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int - type: reg_tup_ref reg_tup: # TODO: determine type and access - type: any access: read - - type: word + - type: short stack: pop - code: 0xf8dc @@ -2922,11 +2922,11 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - type: string_label @@ -3088,8 +3088,8 @@ opcodes: - code: 0xf8ee mnemonic: call_image_data params: - - type: dword - - type: word + - type: int + - type: short stack: pop - code: 0xf8f0 @@ -3103,10 +3103,10 @@ opcodes: - code: 0xf8f2 mnemonic: load_unk_data params: - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int - type: reg_tup_ref reg_tup: # TODO: determine type and access - type: any @@ -3121,7 +3121,7 @@ opcodes: reg_tup: # TODO: determine type and access - type: any access: read - - type: dword + - type: int - type: float stack: pop @@ -3134,7 +3134,7 @@ opcodes: access: write - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: read - code: 0xf902 @@ -3142,7 +3142,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: @@ -3257,10 +3257,10 @@ opcodes: - code: 0xf910 mnemonic: get_unknown_count params: - - type: dword + - type: int - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop @@ -3269,18 +3269,18 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Player slot. access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - - type: dword + - type: int access: read - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0xf912 @@ -3294,7 +3294,7 @@ opcodes: - code: 0xf914 mnemonic: set_palettex_callback params: - - type: dword + - type: int doc: Player slot. - type: instruction_label stack: pop @@ -3302,63 +3302,63 @@ opcodes: - code: 0xf915 mnemonic: activate_palettex params: - - type: dword + - type: int doc: Player slot. stack: pop - code: 0xf916 mnemonic: enable_palettex params: - - type: dword + - type: int doc: Player slot. stack: pop - code: 0xf917 mnemonic: restore_palettex params: - - type: dword + - type: int doc: Player slot. stack: pop - code: 0xf918 mnemonic: disable_palettex params: - - type: dword + - type: int doc: Player slot. stack: pop - code: 0xf919 mnemonic: get_palettex_activated params: - - type: dword + - type: int doc: Player slot. - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop - code: 0xf91a mnemonic: get_unknown_palettex_status params: - - type: dword + - type: int - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop - code: 0xf91b mnemonic: disable_movement2 params: - - type: dword + - type: int doc: Player slot. stack: pop - code: 0xf91c mnemonic: enable_movement2 params: - - type: dword + - type: int doc: Player slot. stack: pop @@ -3367,7 +3367,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf91e @@ -3375,7 +3375,7 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf91f @@ -3383,48 +3383,48 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0xf920 mnemonic: get_player_level params: - - type: dword + - type: int doc: Player slot. - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop - code: 0xf921 mnemonic: get_section_id params: - - type: dword + - type: int doc: Player slot. - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop - code: 0xf922 mnemonic: get_player_hp params: - - type: dword + - type: int doc: Player slot. - type: reg_tup_ref reg_tup: - - type: dword + - type: int doc: Maximum HP. access: write - - type: dword + - type: int doc: Current HP. access: write - - type: dword + - type: int doc: Maximum TP. access: write - - type: dword + - type: int doc: Current TP. access: write stack: pop @@ -3432,11 +3432,11 @@ opcodes: - code: 0xf923 mnemonic: get_floor_number params: - - type: dword + - type: int doc: Player slot. - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop @@ -3456,18 +3456,18 @@ opcodes: - code: 0xf925 mnemonic: read_global_flag params: - - type: dword + - type: int - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop - code: 0xf926 mnemonic: write_global_flag params: - - type: dword - - type: dword + - type: int + - type: int stack: pop - code: 0xf927 @@ -3486,13 +3486,13 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int access: write - - type: dword + - type: int access: write - - type: dword + - type: int access: write - code: 0xf929 @@ -3524,47 +3524,47 @@ opcodes: - code: 0xf92d mnemonic: color_change params: - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int + - type: int stack: pop - code: 0xf92e mnemonic: send_statistic params: - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int + - type: int + - type: int + - type: int + - type: int stack: pop - code: 0xf92f params: - - type: dword - - type: dword + - type: int + - type: int stack: pop - code: 0xf930 mnemonic: chat_box params: - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int + - type: int - type: string stack: pop - code: 0xf931 mnemonic: chat_bubble params: - - type: dword + - type: int - type: string stack: pop @@ -3578,15 +3578,15 @@ opcodes: - code: 0xf934 mnemonic: scroll_text params: - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int + - type: int - type: float - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - type: string stack: pop @@ -3606,20 +3606,20 @@ opcodes: - code: 0xf938 mnemonic: add_damage_to params: - - type: dword - - type: dword + - type: int + - type: int stack: pop - code: 0xf939 mnemonic: item_delete3 params: - - type: dword + - type: int stack: pop - code: 0xf93a mnemonic: get_item_info params: - - type: dword + - type: int - type: reg_tup_ref reg_tup: # TODO: determine type and access - type: any @@ -3629,14 +3629,14 @@ opcodes: - code: 0xf93b mnemonic: item_packing1 params: - - type: dword + - type: int stack: pop - code: 0xf93c mnemonic: item_packing2 params: - - type: dword - - type: dword + - type: int + - type: int stack: pop - code: 0xf93d @@ -3651,7 +3651,7 @@ opcodes: - code: 0xf93e mnemonic: prepare_statistic params: - - type: dword + - type: int - type: instruction_label - type: instruction_label stack: pop @@ -3665,9 +3665,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - - type: dword + - type: int doc: Player slot. - type: string stack: pop @@ -3675,29 +3675,29 @@ opcodes: - code: 0xf941 mnemonic: get_guildcard_num params: - - type: dword + - type: int doc: Player slot. - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop - code: 0xf944 mnemonic: get_wrap_status params: - - type: dword + - type: int doc: Player slot. - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write stack: pop - code: 0xf945 mnemonic: initial_floor params: - - type: dword + - type: int stack: pop - code: 0xf946 @@ -3705,9 +3705,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - - type: dword + - type: int stack: pop - code: 0xf947 @@ -3715,9 +3715,9 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - - type: dword + - type: int stack: pop - code: 0xf94a @@ -3725,21 +3725,21 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf94b params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf94c params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf94d @@ -3747,20 +3747,20 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - code: 0xf950 mnemonic: bb_p2_menu params: - - type: dword + - type: int stack: pop - code: 0xf951 mnemonic: bb_map_designate params: - type: byte - - type: word + - type: short - type: byte - type: byte @@ -3769,18 +3769,18 @@ opcodes: params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write - code: 0xf953 mnemonic: bb_swap_item params: - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int + - type: int + - type: int - type: instruction_label - type: instruction_label stack: pop @@ -3788,19 +3788,19 @@ opcodes: - code: 0xf954 mnemonic: bb_check_wrap params: - - type: dword + - type: int - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write stack: pop - code: 0xf955 mnemonic: bb_exchange_pd_item params: # TODO: determine types - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int - type: instruction_label - type: instruction_label stack: pop @@ -3808,11 +3808,11 @@ opcodes: - code: 0xf956 mnemonic: bb_exchange_pd_srank params: # TODO: determine types - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int + - type: int - type: instruction_label - type: instruction_label stack: pop @@ -3820,12 +3820,12 @@ opcodes: - code: 0xf957 mnemonic: bb_exchange_pd_special params: # TODO: determine types - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int + - type: int + - type: int - type: instruction_label - type: instruction_label stack: pop @@ -3833,28 +3833,28 @@ opcodes: - code: 0xf958 mnemonic: bb_exchange_pd_percent params: # TODO: determine types - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword - - type: dword + - type: int + - type: int + - type: int + - type: int + - type: int + - type: int - type: instruction_label - type: instruction_label stack: pop - code: 0xf959 params: - - type: dword + - type: int stack: pop - code: 0xf95c mnemonic: bb_exchange_slt params: - - type: dword + - type: int - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - type: instruction_label - type: instruction_label @@ -3867,7 +3867,7 @@ opcodes: - code: 0xf95e mnemonic: bb_box_create_bp params: - - type: dword + - type: int - type: float - type: float stack: pop @@ -3877,25 +3877,25 @@ opcodes: params: - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - type: reg_tup_ref reg_tup: # TODO: determine type and access - - type: dword + - type: int access: write - - type: dword + - type: int - type: instruction_label - type: instruction_label stack: pop - code: 0xf960 params: - - type: dword + - type: int stack: pop - code: 0xf961 params: - type: reg_tup_ref reg_tup: - - type: dword + - type: int access: write diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 184c15c6..92789a5f 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -151,8 +151,8 @@ fun paramsToCode(params: List>, indent: Int): String { val type = when (param["type"]) { "any" -> "AnyType()" "byte" -> "ByteType" - "word" -> "WordType" - "dword" -> "DWordType" + "short" -> "ShortType" + "int" -> "IntType" "float" -> "FloatType" "label" -> "LabelType()" "instruction_label" -> "ILabelType" diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Assembly.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Assembly.kt index 2592ca32..1e0513b5 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Assembly.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Assembly.kt @@ -435,7 +435,7 @@ private class Assembler(private val assembly: List, private val manualSt ) } - is WordType, + is ShortType, is LabelType, is ILabelType, is DLabelType, @@ -451,7 +451,7 @@ private class Assembler(private val assembly: List, private val manualSt ) } - is DWordType -> { + is IntType -> { addInstruction( OP_ARG_PUSHL, listOf(arg), @@ -554,7 +554,7 @@ private class Assembler(private val assembly: List, private val manualSt match = true parseInt(1, token, argAndTokens) } - is WordType, + is ShortType, is LabelType, is ILabelType, is DLabelType, @@ -564,7 +564,7 @@ private class Assembler(private val assembly: List, private val manualSt match = true parseInt(2, token, argAndTokens) } - is DWordType -> { + is IntType -> { match = true parseInt(4, token, argAndTokens) } @@ -613,8 +613,8 @@ private class Assembler(private val assembly: List, private val manualSt val typeStr: String? = when (param.type) { is ByteType -> "an 8-bit integer" - is WordType -> "a 16-bit integer" - is DWordType -> "a 32-bit integer" + is ShortType -> "a 16-bit integer" + is IntType -> "a 32-bit integer" is FloatType -> "a float" is LabelType -> "a label" diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Instructions.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Instructions.kt index d8c84353..d2aee7bd 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Instructions.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Instructions.kt @@ -58,14 +58,14 @@ fun instructionSize(instruction: Instruction, dcGcFormat: Boolean): Int { is RegTupRefType, -> 1 - is WordType, + is ShortType, is LabelType, is ILabelType, is DLabelType, is SLabelType, -> 2 - is DWordType, + is IntType, is FloatType, -> 4 diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Opcode.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Opcode.kt index de58e464..9b5235f8 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Opcode.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/Opcode.kt @@ -29,12 +29,12 @@ object ByteType : ValueType() /** * 16-Bit integer. */ -object WordType : ValueType() +object ShortType : ValueType() /** * 32-Bit integer. */ -object DWordType : ValueType() +object IntType : ValueType() /** * 32-Bit floating point number. @@ -61,16 +61,16 @@ object DLabelType : LabelType() */ object SLabelType : LabelType() -/** - * String of arbitrary size. - */ -object StringType : LabelType() - /** * Arbitrary amount of instruction labels. */ object ILabelVarType : LabelType() +/** + * String of arbitrary size. + */ +object StringType : ValueType() + /** * Purely abstract super type of all reference types. */ @@ -97,13 +97,6 @@ object RegRefVarType : RefType() */ object PointerType : AnyType() -const val MIN_SIGNED_DWORD_VALUE = Int.MIN_VALUE -const val MAX_SIGNED_DWORD_VALUE = Int.MAX_VALUE -const val MIN_UNSIGNED_DWORD_VALUE = UInt.MIN_VALUE -const val MAX_UNSIGNED_DWORD_VALUE = UInt.MAX_VALUE -const val MIN_DWORD_VALUE = MIN_SIGNED_DWORD_VALUE -const val MAX_DWORD_VALUE = MAX_UNSIGNED_DWORD_VALUE - enum class ParamAccess { Read, Write, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/dataFlowAnalysis/GetRegisterValue.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/dataFlowAnalysis/GetRegisterValue.kt index d284c2c1..fc7eae02 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/dataFlowAnalysis/GetRegisterValue.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/dataFlowAnalysis/GetRegisterValue.kt @@ -26,7 +26,7 @@ fun getRegisterValue(cfg: ControlFlowGraph, instruction: Instruction, register: } private class RegisterValueFinder { - var iterations = 0 + private var iterations = 0 fun find( path: MutableSet, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/dataFlowAnalysis/GetStackValue.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/dataFlowAnalysis/GetStackValue.kt index 0b71ee8d..7db791d7 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/dataFlowAnalysis/GetStackValue.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/assembly/dataFlowAnalysis/GetStackValue.kt @@ -22,7 +22,7 @@ fun getStackValue(cfg: ControlFlowGraph, instruction: Instruction, position: Int } private class StackValueFinder { - var iterations = 0 + private var iterations = 0 fun find( path: MutableSet, @@ -54,7 +54,6 @@ private class StackValueFinder { return getRegisterValue(cfg, instruction, args[0].value as Int) } else { pos-- - break } } @@ -66,7 +65,6 @@ private class StackValueFinder { return ValueSet.of(args[0].value as Int) } else { pos-- - break } } @@ -78,11 +76,8 @@ private class StackValueFinder { return ValueSet.all() } else { pos-- - break } } - - else -> break } } diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/AbstractWritableCursor.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/AbstractWritableCursor.kt index cd33ca13..2373a555 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/AbstractWritableCursor.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/AbstractWritableCursor.kt @@ -112,6 +112,17 @@ protected constructor(protected val offset: Int) : WritableCursor { return this } + override fun writeByteArray(array: ByteArray): WritableCursor { + val len = array.size + requireSize(len) + + for (i in 0 until len) { + writeByte(array[i]) + } + + return this + } + override fun writeIntArray(array: IntArray): WritableCursor { val len = array.size requireSize(4 * len) diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/BufferCursor.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/BufferCursor.kt index 42c2d890..71a97bc6 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/BufferCursor.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/BufferCursor.kt @@ -125,6 +125,19 @@ class BufferCursor( return array } + override fun byteArray(n: Int): ByteArray { + requireSize(n) + + val array = ByteArray(n) + + for (i in 0 until n) { + array[i] = buffer.getByte(absolutePosition) + position++ + } + + return array + } + override fun intArray(n: Int): IntArray { requireSize(4 * n) @@ -214,6 +227,11 @@ class BufferCursor( return super.writeUIntArray(array) } + override fun writeByteArray(array: ByteArray): WritableCursor { + ensureSpace(array.size) + return super.writeByteArray(array) + } + override fun writeIntArray(array: IntArray): WritableCursor { ensureSpace(4 * array.size) return super.writeIntArray(array) diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/Cursor.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/Cursor.kt index 3df6282c..5af75994 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/Cursor.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/Cursor.kt @@ -95,6 +95,11 @@ interface Cursor { */ fun uIntArray(n: Int): UIntArray + /** + * Reads [n] signed 8-bit integers and increments position by [n]. + */ + fun byteArray(n: Int): ByteArray + /** * Reads [n] signed 32-bit integers and increments position by 4[n]. */ diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/WritableCursor.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/WritableCursor.kt index 32846d1d..324b9726 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/WritableCursor.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/WritableCursor.kt @@ -64,6 +64,11 @@ interface WritableCursor : Cursor { */ fun writeUIntArray(array: UIntArray): WritableCursor + /** + * Writes an array of signed 8-bit integers and increments position by the array's length. + */ + fun writeByteArray(array: ByteArray): WritableCursor + /** * Writes an array of signed 32-bit integers and increments position by four times the array's * length. diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCode.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCode.kt index 806a4d15..e2931b14 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCode.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCode.kt @@ -490,15 +490,23 @@ private fun parseInstructionArguments( is ByteType -> args.add(Arg(cursor.uByte().toInt())) - is WordType -> + is ShortType -> args.add(Arg(cursor.uShort().toInt())) - is DWordType -> + is IntType -> args.add(Arg(cursor.int())) is FloatType -> args.add(Arg(cursor.float())) + // Ensure this case is before the LabelType case because ILabelVarType extends + // LabelType. + is ILabelVarType -> { + varargCount++ + val argSize = cursor.uByte() + args.addAll(cursor.uShortArray(argSize.toInt()).map { Arg(it.toInt()) }) + } + is LabelType, is ILabelType, is DLabelType, @@ -526,12 +534,6 @@ private fun parseInstructionArguments( )) } - is ILabelVarType -> { - varargCount++ - val argSize = cursor.uByte() - args.addAll(cursor.uShortArray(argSize.toInt()).map { Arg(it.toInt()) }) - } - is RegRefType, is RegTupRefType, -> { diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Dat.kt b/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Dat.kt index eb4953d6..31a97e21 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Dat.kt +++ b/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Dat.kt @@ -27,31 +27,31 @@ class DatEntity( ) class DatEvent( - var id: UInt, - var sectionId: UShort, - var wave: UShort, - var delay: UShort, + var id: Int, + var sectionId: Short, + var wave: Short, + var delay: Short, val actions: MutableList, val areaId: Int, - val unknown: UShort, + val unknown: Short, ) sealed class DatEventAction { class SpawnNpcs( - val sectionId: UShort, - val appearFlag: UShort, + val sectionId: Short, + val appearFlag: Short, ) : DatEventAction() class Unlock( - val doorId: UShort, + val doorId: Short, ) : DatEventAction() class Lock( - val doorId: UShort, + val doorId: Short, ) : DatEventAction() class TriggerEvent( - val eventId: UInt, + val eventId: Int, ) : DatEventAction() } @@ -60,7 +60,7 @@ class DatUnknown( val totalSize: Int, val areaId: Int, val entitiesSize: Int, - val data: UByteArray, + val data: ByteArray, ) fun parseDat(cursor: Cursor): DatFile { @@ -95,7 +95,7 @@ fun parseDat(cursor: Cursor): DatFile { totalSize, areaId, entitiesSize, - data = cursor.uByteArray(entitiesSize), + data = cursor.byteArray(entitiesSize), )) } } @@ -139,7 +139,7 @@ private fun parseEvents(cursor: Cursor, areaId: Int, events: MutableList = @@ -182,17 +182,17 @@ private fun parseEvents(cursor: Cursor, areaId: Int, events: MutableList { EVENT_ACTION_SPAWN_NPCS -> actions.add(DatEventAction.SpawnNpcs( - sectionId = cursor.uShort(), - appearFlag = cursor.uShort(), + sectionId = cursor.short(), + appearFlag = cursor.short(), )) EVENT_ACTION_UNLOCK -> actions.add(DatEventAction.Unlock( - doorId = cursor.uShort(), + doorId = cursor.short(), )) EVENT_ACTION_LOCK -> actions.add(DatEventAction.Lock( - doorId = cursor.uShort(), + doorId = cursor.short(), )) EVENT_ACTION_TRIGGER_EVENT -> actions.add(DatEventAction.TriggerEvent( - eventId = cursor.uInt(), + eventId = cursor.int(), )) else -> { diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/CursorTests.kt b/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/CursorTests.kt index a3cc80f2..73bb0864 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/CursorTests.kt +++ b/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/CursorTests.kt @@ -178,6 +178,17 @@ abstract class CursorTests { testIntegerArrayRead(4, read, Endianness.Big) } + @Test + fun byteArray() { + val read: Cursor.(Int) -> IntArray = { n -> + val arr = byteArray(n) + IntArray(n) { arr[it].toInt() } + } + + testIntegerArrayRead(1, read, Endianness.Little) + testIntegerArrayRead(1, read, Endianness.Big) + } + @Test fun intArray() { val read: Cursor.(Int) -> IntArray = { n -> @@ -194,38 +205,29 @@ abstract class CursorTests { read: Cursor.(Int) -> IntArray, endianness: Endianness, ) { - // Generate array of the form 1, 2, 0xFF, 4, 5, 6, 7, 8. + // Generate array of the form 1, 2, 3, 4, 5, 6, 7, 8. val bytes = ByteArray(8 * byteCount) for (i in 0 until 8) { - if (i == 2) { - for (j in 0 until byteCount) { - bytes[i * byteCount + j] = (0xff).toByte() - } + if (endianness == Endianness.Little) { + bytes[i * byteCount] = (i + 1).toByte() } else { - if (endianness == Endianness.Little) { - bytes[i * byteCount] = (i + 1).toByte() - } else { - bytes[i * byteCount + byteCount - 1] = (i + 1).toByte() - } + bytes[i * byteCount + byteCount - 1] = (i + 1).toByte() } } - var allOnes = 0 - repeat(byteCount) { allOnes = ((allOnes shl 8) or 0xff) } - // Test cursor. val cursor = createCursor(bytes, endianness) val array1 = cursor.read(3) assertEquals(1, array1[0]) assertEquals(2, array1[1]) - assertEquals(allOnes, array1[2]) + assertEquals(3, array1[2]) assertEquals(3 * byteCount, cursor.position) cursor.seekStart(2 * byteCount) val array2 = cursor.read(4) - assertEquals(allOnes, array2[0]) + assertEquals(3, array2[0]) assertEquals(4, array2[1]) assertEquals(5, array2[2]) assertEquals(6, array2[3]) diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/WritableCursorTests.kt b/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/WritableCursorTests.kt index 674c9ee7..a50bfe63 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/WritableCursorTests.kt +++ b/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/WritableCursorTests.kt @@ -161,6 +161,20 @@ abstract class WritableCursorTests : CursorTests() { testIntegerArrayWrite(4, read, write, Endianness.Big) } + @Test + fun writeByteArray() { + val read: Cursor.(Int) -> IntArray = { n -> + val arr = byteArray(n) + IntArray(n) { arr[it].toInt() } + } + val write: WritableCursor.(IntArray) -> Unit = { a -> + writeByteArray(ByteArray(a.size) { a[it].toByte() }) + } + + testIntegerArrayWrite(1, read, write, Endianness.Little) + testIntegerArrayWrite(1, read, write, Endianness.Big) + } + @Test fun writeIntArray() { val read: Cursor.(Int) -> IntArray = { n -> diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCode.kt b/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCodeTests.kt similarity index 98% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCode.kt rename to lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCodeTests.kt index d1bd4de3..74c37159 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCode.kt +++ b/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/ByteCodeTests.kt @@ -9,7 +9,7 @@ import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue -class ByteCode { +class ByteCodeTests { @Test fun minimal() { val buffer = Buffer.fromByteArray(ubyteArrayOf( diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/DatTests.kt b/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/DatTests.kt new file mode 100644 index 00000000..7a24aae4 --- /dev/null +++ b/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/DatTests.kt @@ -0,0 +1,16 @@ +package world.phantasmal.lib.fileFormats.quest + +import world.phantasmal.lib.test.asyncTest +import world.phantasmal.lib.test.readFile +import kotlin.test.Test +import kotlin.test.assertEquals + +class DatTests { + @Test + fun parse_quest_towards_the_future() = asyncTest { + val dat = parseDat(readFile("/quest118_e_decompressed.dat")) + + assertEquals(277, dat.objs.size) + assertEquals(216, dat.npcs.size) + } +} diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QuestTests.kt b/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QuestTests.kt index 031a9938..f27a95fc 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QuestTests.kt +++ b/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QuestTests.kt @@ -1,6 +1,7 @@ package world.phantasmal.lib.fileFormats.quest import world.phantasmal.core.Success +import world.phantasmal.lib.assembly.* import world.phantasmal.lib.test.asyncTest import world.phantasmal.lib.test.readFile import kotlin.test.Test @@ -12,7 +13,7 @@ class QuestTests { fun parseBinDatToQuest_with_towards_the_future() = asyncTest { val result = parseBinDatToQuest(readFile("/quest118_e.bin"), readFile("/quest118_e.dat")) - assertTrue (result is Success) + assertTrue(result is Success) assertTrue(result.problems.isEmpty()) val quest = result.value @@ -40,5 +41,33 @@ class QuestTests { assertEquals(4, quest.mapDesignations[8]) assertEquals(4, quest.mapDesignations[10]) assertEquals(0, quest.mapDesignations[14]) + + val seg1 = quest.byteCodeIr[0] + assertTrue(seg1 is InstructionSegment) + assertTrue(0 in seg1.labels) + assertEquals(OP_SET_EPISODE, seg1.instructions[0].opcode) + assertEquals(0, seg1.instructions[0].args[0].value) + assertEquals(OP_ARG_PUSHL, seg1.instructions[1].opcode) + assertEquals(0, seg1.instructions[1].args[0].value) + assertEquals(OP_ARG_PUSHW, seg1.instructions[2].opcode) + assertEquals(150, seg1.instructions[2].args[0].value) + assertEquals(OP_SET_FLOOR_HANDLER, seg1.instructions[3].opcode) + + val seg2 = quest.byteCodeIr[1] + assertTrue(seg2 is InstructionSegment) + assertTrue(1 in seg2.labels) + + val seg3 = quest.byteCodeIr[2] + assertTrue(seg3 is InstructionSegment) + assertTrue(10 in seg3.labels) + + val seg4 = quest.byteCodeIr[3] + assertTrue(seg4 is InstructionSegment) + assertTrue(150 in seg4.labels) + assertEquals(1, seg4.instructions.size) + assertEquals(OP_SWITCH_JMP, seg4.instructions[0].opcode) + assertEquals(0, seg4.instructions[0].args[0].value) + assertEquals(200, seg4.instructions[0].args[1].value) + assertEquals(201, seg4.instructions[0].args[2].value) } } diff --git a/lib/src/commonTest/resources/quest118_e_decompressed.dat b/lib/src/commonTest/resources/quest118_e_decompressed.dat new file mode 100644 index 0000000000000000000000000000000000000000..1860fd5e71d6e5eb06205775d970dd67ede9869a GIT binary patch literal 36780 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