From 470bdfd5a922a7288285732ca8edf93e115359e2 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Mon, 30 Jul 2012 14:22:24 +0100 Subject: TEENAGENT: Some more migration of callbacks from cseg usage. --- engines/teenagent/callbacks.cpp | 84 +++++++++++++++++++++++++++++++++++++++++ engines/teenagent/resources.h | 25 +++++++++++- 2 files changed, 107 insertions(+), 2 deletions(-) diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp index aeb1083f99..771c96b373 100644 --- a/engines/teenagent/callbacks.cpp +++ b/engines/teenagent/callbacks.cpp @@ -1282,6 +1282,10 @@ bool TeenAgentEngine::processCallback(uint16 addr) { displayMessage(dsAddr_tooMuchResinToClimbMsg); // "I could climb it if there wasn't so much resin" break; + case 0x50fd: + displayMessage(dsAddr_onlyGreenRectMsg); // "The only green stuff that I like is that rectangular piece of paper with..." + break; + case 0x5104: loadScene(11, 319, 198, 4); if (!CHECK_FLAG(0xdb9c, 1)) { @@ -1750,6 +1754,82 @@ bool TeenAgentEngine::processCallback(uint16 addr) { displayMessage(dsAddr_noSearchWarrantMsg); // "I don't have a search-warrant" break; + case 0x6671: + displayMessage(dsAddr_cantOpenItMsg); // "I can't open it" + break; + + case 0x6678: + rejectMessage(); + break; + + case 0x670f: + displayMessage(dsAddr_dontNeedThemMsg); // "I don't need them" + break; + + case 0x6716: + displayMessage(dsAddr_pullObjMsg2); // "I can't reach it" + break; + + case 0x6772: + loadScene(31, Common::Point(20, 188)); + scene->setOrientation(2); + break; + + case 0x6c1c: + case 0x6c20: + rejectMessage(); + break; + + case 0x6c24: + displayMessage(dsAddr_dontNeedThemMsg); // "I don't need them" + break; + + case 0x6c2b: + loadScene(29, Common::Point(300, 188)); + scene->setOrientation(4); + break; + + case 0x6c7c: + displayMessage(dsAddr_bigPocketsMsg); // "I have big pockets, but there are limits" + break; + + case 0x724e: + displayMessage(dsAddr_soSharpMsg); // "They're so sharp they'd rip my trousers!" + break; + + case 0x72be: + rejectMessage(); + break; + + case 0x7305: + rejectMessage(); + break; + + case 0x7328: + displayMessage(dsAddr_noTimeForPleasuresMsg); // "I don't have time for pleasures" + break; + + case 0x732f: + displayMessage(dsAddr_notSocksWithBareHandsMsg); // "I won't touch these socks with my bare hands!" + break; + + case 0x739c: + displayMessage(dsAddr_notHalloweenMsg); // "It's not Halloween" + break; + + case 0x746f: + displayMessage(dsAddr_nothingToPlayMsg); // "I have nothing to play" + break; + + case 0x74b3: + loadScene(29, Common::Point(256, 171)); + scene->setOrientation(3); + break; + + case 0x74cd: + rejectMessage(); + break; + case 0x7866: if (CHECK_FLAG(0xdbdd, 3)) displayMessage(dsAddr_gotchaMsg); // "Gotcha" @@ -2040,6 +2120,10 @@ bool TeenAgentEngine::processCallback(uint16 addr) { SET_FLAG(0xdbe2, 1); break; + case 0x8398: + displayMessage(dsAddr_trySomewhereElseMsg); // "I'd better try somewhere else - I suppose this side is heavily guarded" + break; + // Shore case 0x5348: diff --git a/engines/teenagent/resources.h b/engines/teenagent/resources.h index 68fde34cc2..5a36fab84a 100644 --- a/engines/teenagent/resources.h +++ b/engines/teenagent/resources.h @@ -276,7 +276,8 @@ const uint16 dsAddr_getRidOfGuardFirstMsg = 0x3ed6; // "If I want to get inside const uint16 dsAddr_wallTooSmoothMsg = 0x3f2a; // "The wall surface is too smooth to climb" // Too Much Resin To Climb Message : 0x3f54 to 0x3f84 const uint16 dsAddr_tooMuchResinToClimbMsg = 0x3f54; // "I could climb it if there wasn't so much resin" - +// Only Green Rect Message : 0x3f85 to 0x3feb +const uint16 dsAddr_onlyGreenRectMsg = 0x3f85; // "The only green stuff that I like is that rectangular piece of paper with..." // Don't Wanna Touch Hedgehog Message : 0x3fec to 0x402d const uint16 dsAddr_dontWannaTouchHedgehogMsg = 0x3fec; // "I don't wanna touch it. Its spines could hurt my delicate hands" // Not Hungry Message : 0x402e to 0x4046 @@ -398,6 +399,9 @@ const uint16 dsAddr_nutRakeMsg = 0x4882; // "It's pointless, the nut will slip b // Paddle Broken Message : 0x48bf to 0x48d5 const uint16 dsAddr_paddleBrokenMsg = 0x48bf; // "The paddle is BROKEN" +// Try Somewhere Else Message : 0x4913 to 0x495b +const uint16 dsAddr_trySomewhereElseMsg = 0x4913; // "I'd better try somewhere else - I suppose this side is heavily guarded" + // Bribe Message : 0x49ae to 0x49d0 const uint16 dsAddr_BribeMsg = 0x49ae; // "Here, let's make your pocket fat." // Bank Note Message : 0x49d1 to 0x4a28 @@ -677,12 +681,29 @@ const uint16 dsAddr_tooManyToSearchMsg = 0x5ac6; // "There are too many of them const uint16 dsAddr_captainWouldNotFitMsg = 0x5aed; // "Captain surely wouldn't fit them. I must look elsewhere" // Chickening Never Message : 0x5b27 to 0x5b3e const uint16 dsAddr_chickenNeverMsg = 0x5b27; // "Chickening? Me? Never!" +// Can't Open It Message : 0x5b3f to 0x5b50 +const uint16 dsAddr_cantOpenItMsg = 0x5b3f; // "I can't open it" +// Don't Need Them Message : 0x5b51 to 0x5b64 +const uint16 dsAddr_dontNeedThemMsg = 0x5b51; // "I don't need them" + +// Big Pockets Message : 0x5b80 to 0x5baa +const uint16 dsAddr_bigPocketsMsg = 0x5b80; // "I have big pockets, but there are limits" // Never Learnt Message : 0x5c60 to 0x5c81 const uint16 dsAddr_neverLearntMsg = 0x5c60; // "I never learnt to how use one" - +// So Sharp Message : 0x5c82 to 0x5cab +const uint16 dsAddr_soSharpMsg = 0x5c82; // "They're so sharp they'd rip my trousers!" // Cognac Message : 0x5cac to 0x5cda const uint16 dsAddr_cognacMsg = 0x5cac; // "Pfui! The cognac really didn't do any good" +// No Time For Pleasures Message : 0x5cdb to 0x5cfc +const uint16 dsAddr_noTimeForPleasuresMsg = 0x5cdb; // "I don't have time for pleasures" +// Not Socks With Bare Hands Message : 0x5cfd to 0x5d2b +const uint16 dsAddr_notSocksWithBareHandsMsg = 0x5cfd; // "I won't touch these socks with my bare hands!" +// Not Halloween Message : 0x5d2c to 0x5d40 +const uint16 dsAddr_notHalloweenMsg = 0x5d2c; // "It's not Halloween" + +// Nothing To Play Message : 0x5d6e to 0x5d86 +const uint16 dsAddr_nothingToPlayMsg = 0x5d6e; // "I have nothing to play" // Hey What's The Matter Message : 0x5da8 to 0x5dc1 const uint16 dsAddr_HeyWtmQMsg = 0x5da8; // "Hey! What's the matter?!" -- cgit v1.2.3