[Scummvm-cvs-logs] SF.net SVN: scummvm:[51819] tools/branches/gsoc2010-decompiler/decompiler/ kyra/disassembler.cpp
pidgeot at users.sourceforge.net
pidgeot at users.sourceforge.net
Sat Aug 7 02:52:07 CEST 2010
Revision: 51819
http://scummvm.svn.sourceforge.net/scummvm/?rev=51819&view=rev
Author: pidgeot
Date: 2010-08-07 00:52:07 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
DECOMPILER: Add KYRA function metadata
Modified Paths:
--------------
tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp 2010-08-07 00:40:15 UTC (rev 51818)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp 2010-08-07 00:52:07 UTC (rev 51819)
@@ -33,218 +33,218 @@
static FunctionData kyra2FuncDesc[] = {
// 0x00
- { "o2_setCharacterFacingRefresh", "" },
- { "o2_setCharacterPos", "" },
- { "o2_defineObject", "" },
- { "o2_refreshCharacter", "" },
+ { "o2_setCharacterFacingRefresh", "0ppp" },
+ { "o2_setCharacterPos", "0ppp" },
+ { "o2_defineObject", "0pspppp" },
+ { "o2_refreshCharacter", "0pppp" },
// 0x04
{ "o2_getCharacterX", "" },
{ "o2_getCharacterY", "" },
{ "o2_getCharacterFacing", "" },
{ "o2_getCharacterScene", "" },
// 0x08
- { "o2_setSceneComment", "" },
- { "unk09", "" },
- { "unk0A", "" },
- { "o2_setCharacterAnimFrame", "" },
+ { "o2_setSceneComment", "0s" },
+ { "unk09", "0p" },
+ { "unk0A", "0p" },
+ { "o2_setCharacterAnimFrame", "0ppp" },
// 0x0c
- { "o2_setCharacterFacingOverwrite", "" },
- { "o2_trySceneChange", "" },
- { "o2_moveCharacter", "" },
- { "o2_customCharacterChat", "" },
+ { "o2_setCharacterFacingOverwrite", "0p" },
+ { "o2_trySceneChange", "0pppp" },
+ { "o2_moveCharacter", "0ppp" },
+ { "o2_customCharacterChat", "0spppp" },
// 0x10
{ "o2_soundFadeOut", "" },
- { "o2_showChapterMessage", "" },
+ { "o2_showChapterMessage", "0pp" },
{ "o2_restoreTalkTextMessageBkgd", "" },
- { "unk13", "" },
+ { "o2_printString", "0spppp" },
// 0x14
- { "o2_wsaClose", "" },
- { "o2_backUpScreen", "" },
- { "o2_restoreScreen", "" },
- { "o2_displayWsaFrame", "" },
+ { "o2_wsaClose", "0p" },
+ { "o2_backUpScreen", "0p" },
+ { "o2_restoreScreen", "0p" },
+ { "o2_displayWsaFrame", "0ppppppppp" },
// 0x18
- { "o2_displayWsaSequentialFramesLooping", "" },
- { "o2_wsaOpen", "" },
- { "o2_displayWsaSequentialFrames", "" },
- { "o2_displayWsaSequence", "" },
+ { "o2_displayWsaSequentialFramesLooping", "0pppppppp" },
+ { "o2_wsaOpen", "0sp" },
+ { "o2_displayWsaSequentialFrames", "0ppppppp" },
+ { "o2_displayWsaSequence", "0pppppp" },
// 0x1c
- { "o2_addItemToInventory", "" },
- { "o2_drawShape", "" },
- { "o2_addItemToCurScene", "" },
- { "o2_limitMouseRange", "" },
+ { "o2_addItemToInventory", "0ppp" },
+ { "o2_drawShape", "0ppppp" },
+ { "o2_addItemToCurScene", "0ppp" },
+ { "o2_limitMouseRange", "0pppp" },
// 0x20
- { "o2_checkForItem", "" },
- { "o2_loadSoundFile", "" },
- { "o2_removeSlotFromInventory", "" },
- { "o2_defineItem", "" },
+ { "o2_checkForItem", "0pp" },
+ { "o2_loadSoundFile", "0p" },
+ { "o2_removeSlotFromInventory", "0p" },
+ { "o2_defineItem", "0pppp" },
// 0x24
- { "o2_removeItemFromInventory", "" },
- { "o2_countItemInInventory", "" },
- { "o2_countItemsInScene", "" },
- { "o1_queryGameFlag", "" },
+ { "o2_removeItemFromInventory", "0p" },
+ { "o2_countItemInInventory", "0pp" },
+ { "o2_countItemsInScene", "0p" },
+ { "o1_queryGameFlag", "0p" },
// 0x28
- { "o1_resetGameFlag", "" },
- { "o1_setGameFlag", "" },
- { "o1_setHandItem", "" },
+ { "o1_resetGameFlag", "0p" },
+ { "o1_setGameFlag", "0p" },
+ { "o1_setHandItem", "0p" },
{ "o1_removeHandItem", "" },
// 0x2c
{ "o1_getMouseState", "" },
{ "o1_hideMouse", "" },
- { "o2_addSpecialExit", "" },
- { "o1_setMousePos", "" },
+ { "o2_addSpecialExit", "0ppppp" },
+ { "o1_setMousePos", "0pp" },
// 0x30
{ "o1_showMouse", "" },
- { "unk31", "" },
- { "o2_wipeDownMouseItem", "" },
+ { "o2_drawBox", "0ppppp" },
+ { "o2_wipeDownMouseItem", "0ppp" },
{ "o2_getElapsedSecs", "" },
// 0x34
- { "o2_getTimerDelay", "" },
- { "o1_playSoundEffect", "" },
- { "o2_delaySecs", "" },
- { "o2_delay", "" },
+ { "o2_getTimerDelay", "0p" },
+ { "o1_playSoundEffect", "0p" },
+ { "o2_delaySecs", "0p" },
+ { "o2_delay", "0pp" },
// 0x38
{ "o2_dummy38", "" },
- { "o2_setTimerDelay", "" },
- { "o2_setScaleTableItem", "" },
- { "o2_setDrawLayerTableItem", "" },
+ { "o2_setTimerDelay", "0pp" },
+ { "o2_setScaleTableItem", "0pp" },
+ { "o2_setDrawLayerTableItem", "0pp" },
// 0x3c
- { "o2_setCharPalEntry", "" },
- { "o2_loadZShapes", "" },
- { "o2_drawSceneShape", "" },
- { "o2_drawSceneShapeOnPage", "" },
+ { "o2_setCharPalEntry", "0pp" },
+ { "o2_loadZShapes", "0p" },
+ { "o2_drawSceneShape", "0pppp" },
+ { "o2_drawSceneShapeOnPage", "0ppppp" },
// 0x40
- { "o2_disableAnimObject", "" },
- { "o2_enableAnimObject", "" },
+ { "o2_disableAnimObject", "0p" },
+ { "o2_enableAnimObject", "0p" },
{ "o2_dummy42", "" },
- { "o2_loadPalette384", "" },
+ { "o2_loadPalette384", "0s" },
// 0x44
{ "o2_setPalette384", "" },
- { "o2_restoreBackBuffer", "" },
+ { "o2_restoreBackBuffer", "0p" },
{ "o2_backUpInventoryGfx", "" },
- { "o2_disableSceneAnim", "" },
+ { "o2_disableSceneAnim", "0p" },
// 0x48
- { "o2_enableSceneAnim", "" },
+ { "o2_enableSceneAnim", "0p" },
{ "o2_restoreInventoryGfx", "" },
- { "o2_setSceneAnimPos2", "" },
- { "o2_update", "" },
+ { "o2_setSceneAnimPos2", "0ppp" },
+ { "o2_update", "0p" },
// 0x4c
- { "unk4C", "" },
- { "o2_fadeScenePal", "" },
+ { "unk4C_palFade?", "0pp" },
+ { "o2_fadeScenePal", "0pp" },
{ "o2_dummy4E", "" },
{ "o2_dummy4F", "" },
// 0x50
- { "o2_enterNewScene", "" },
- { "o2_switchScene", "" },
- { "o2_getShapeFlag1", "" },
- { "o2_setPathfinderFlag", "" },
+ { "o2_enterNewScene", "0ppppp" },
+ { "o2_switchScene", "0p" },
+ { "o2_getShapeFlag1", "0pp" },
+ { "o2_setPathfinderFlag", "0p" },
// 0x54
- { "o2_getSceneExitToFacing", "" },
- { "o2_setLayerFlag", "" },
- { "o2_setZanthiaPos", "" },
- { "o2_loadMusicTrack", "" },
+ { "o2_getSceneExitToFacing", "0pp" },
+ { "o2_setLayerFlag", "0p" },
+ { "o2_setZanthiaPos", "0pp" },
+ { "o2_loadMusicTrack", "0p" },
// 0x58
- { "o1_playWanderScoreViaMap", "" },
- { "o1_playSoundEffect", "" },
- { "o2_setSceneAnimPos", "" },
- { "o1_blockInWalkableRegion", "" },
+ { "o1_playWanderScoreViaMap", "0pp" },
+ { "o1_playSoundEffect", "0p" },
+ { "o2_setSceneAnimPos", "0ppp" },
+ { "o1_blockInWalkableRegion", "0pppp" },
// 0x5c
- { "o1_blockOutWalkableRegion", "" },
- { "unk5D", "" },
- { "o2_setCauldronState", "" },
- { "o2_showItemString", "" },
+ { "o1_blockOutWalkableRegion", "0pppp" },
+ { "unk5D", "0ppppp" },
+ { "o2_setCauldronState", "0pp" },
+ { "o2_showItemString", "0pp" },
// 0x60
- { "o1_getRand", "" },
+ { "o1_getRand", "0pp" },
{ "o2_isAnySoundPlaying", "" },
- { "o1_setDeathHandler", "" },
- { "o2_setDrawNoShapeFlag", "" },
+ { "o1_setDeathHandler", "0p" },
+ { "o2_setDrawNoShapeFlag", "0p" },
// 0x64
- { "o2_setRunFlag", "" },
- { "o2_showLetter", "" },
- { "unk66", "" },
- { "o1_fillRect", "" },
+ { "o2_setRunFlag", "0p" },
+ { "o2_showLetter", "0p" },
+ { "o1_shakeScreen", "0pp" },
+ { "o1_fillRect", "0pppppp" },
// 0x68
- { "unk68", "" },
- { "unk69", "" },
+ { "o2_getKey", "" },
+ { "unk69", "0pppp" },
{ "o2_playFireflyScore", "" },
- { "o2_waitForConfirmationClick", "" },
+ { "o2_waitForConfirmationClick", "0p" },
// 0x6c
- { "o2_encodeShape", "" },
- { "o2_defineRoomEntrance", "" },
- { "o2_runAnimationScript", "" },
- { "o2_setSpecialSceneScriptRunTime", "" },
+ { "o2_encodeShape", "0ppppp" },
+ { "o2_defineRoomEntrance", "0ppp" },
+ { "o2_runAnimationScript", "0sppp" },
+ { "o2_setSpecialSceneScriptRunTime", "0pp" },
// 0x70
- { "o2_defineSceneAnim", "" },
- { "o2_updateSceneAnim", "" },
- { "o2_updateSceneAnim", "" },
- { "o2_addToSceneAnimPosAndUpdate", "" },
+ { "o2_defineSceneAnim", "0pppppppppppps" },
+ { "o2_updateSceneAnim", "pp" },
+ { "o2_updateSceneAnim", "pp" },
+ { "o2_addToSceneAnimPosAndUpdate", "0ppp" },
// 0x74
{ "o2_useItemOnMainChar", "" },
- { "o2_startDialogue", "" },
+ { "o2_startDialogue", "0p" },
{ "o2_randomSceneChat", "" },
- { "o2_setDlgIndex", "" },
+ { "o2_setDlgIndex", "0p" },
// 0x78
{ "o2_getDlgIndex", "" },
- { "o2_defineScene", "" },
- { "o2_addCauldronStateTableEntry", "" },
- { "o2_setCountDown", "" },
+ { "o2_defineScene", "0pspppppp" },
+ { "o2_addCauldronStateTableEntry", "0pp" },
+ { "o2_setCountDown", "0p" },
// 0x7c
{ "o2_getCountDown", "" },
{ "o2_dummy7D", "" },
{ "o2_dummy7E", "" },
- { "o2_pressColorKey", "" },
+ { "o2_pressColorKey", "0p" },
// 0x80
- { "o2_objectChat", "" },
- { "o2_changeChapter", "" },
+ { "o2_objectChat", "0sp" },
+ { "o2_changeChapter", "0pp" },
{ "o2_getColorCodeFlag1", "" },
- { "o2_setColorCodeFlag1", "" },
+ { "o2_setColorCodeFlag1", "0p" },
// 0x84
{ "o2_getColorCodeFlag2", "" },
- { "o2_setColorCodeFlag2", "" },
- { "o2_getColorCodeValue", "" },
- { "o2_setColorCodeValue", "" },
+ { "o2_setColorCodeFlag2", "0p" },
+ { "o2_getColorCodeValue", "0p" },
+ { "o2_setColorCodeValue", "0pp" },
// 0x88
- { "o2_countItemInstances", "" },
- { "o2_removeItemFromScene", "" },
- { "o2_initObject", "" },
- { "o2_npcChat", "" },
+ { "o2_countItemInstances", "0p" },
+ { "o2_removeItemFromScene", "0pp" },
+ { "o2_initObject", "0p" },
+ { "o2_npcChat", "0spp" }, // FIXME: Non-talkie metadata; talkie opcode is 0spp
// 0x8c
- { "o2_deinitObject", "" },
- { "o2_playTimSequence", "" },
- { "o2_makeBookOrCauldronAppear", "" },
- { "o2_setSpecialSceneScriptState", "" },
+ { "o2_deinitObject", "0p" },
+ { "o2_playTimSequence", "0s" },
+ { "o2_makeBookOrCauldronAppear", "0p" },
+ { "o2_setSpecialSceneScriptState", "0p" },
// 0x90
- { "o2_clearSpecialSceneScriptState", "" },
- { "o2_querySpecialSceneScriptState", "" },
+ { "o2_clearSpecialSceneScriptState", "0p" },
+ { "o2_querySpecialSceneScriptState", "0p" },
{ "o2_resetInputColorCode", "" },
- { "o2_setHiddenItemsEntry", "" },
+ { "o2_setHiddenItemsEntry", "0pp" },
// 0x94
- { "o2_getHiddenItemsEntry", "" },
+ { "o2_getHiddenItemsEntry", "0p" },
{ "o2_mushroomEffect", "" },
- { "o2_wsaClose", "" },
- { "o2_meanWhileScene", "" },
+ { "o2_wsaClose", "0p" },
+ { "o2_meanWhileScene", "0p" },
// 0x98
- { "o2_customChat", "" },
+ { "o2_customChat", "0spp" },
{ "o2_customChatFinish", "" },
- { "o2_setupSceneAnimation", "" },
- { "o2_stopSceneAnimation", "" },
+ { "o2_setupSceneAnimation", "0pppppppppppps" },
+ { "o2_stopSceneAnimation", "0pp" },
// 0x9c
- { "o2_disableTimer", "" },
- { "o2_enableTimer", "" },
- { "o2_setTimerCountdown", "" },
- { "o2_processPaletteIndex", "" },
+ { "o2_disableTimer", "0p" },
+ { "o2_enableTimer", "0p" },
+ { "o2_setTimerCountdown", "0pp" },
+ { "o2_processPaletteIndex", "0pppppp" },
// 0xa0
- { "o2_updateTwoSceneAnims", "" },
- { "o2_getRainbowRoomData", "" },
- { "o2_drawSceneShapeEx", "" },
+ { "o2_updateTwoSceneAnims", "0pppp" },
+ { "o2_getRainbowRoomData", "0p" },
+ { "o2_drawSceneShapeEx", "0pppp" },
{ "o2_midiSoundFadeout", "" },
// 0xa4
{ "o2_getSfxDriver", "" },
{ "o2_getVocSupport", "" },
{ "o2_getMusicDriver", "" },
- { "o2_setVocHigh", "" },
+ { "o2_setVocHigh", "0p" },
// 0xa8
{ "o2_getVocHigh", "" },
- { "o2_zanthiaChat", "" },
+ { "o2_zanthiaChat", "0sp" },
{ "o2_isVoiceEnabled", "" },
{ "o2_isVoicePlaying", "" },
// 0xac
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list