OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

oricsdk: Commit


Commit MetaInfo

Revision1707 (tree)
Time2023-09-27 02:17:42
Authordbug

Log Message

The "Fancy" 12x14 font is now available in French version with the éèêà characters, and instead of being a bunch of .byt in display.s is now included from the file (the font source code is generated by pictconv when the makedata script is called)
The half-way localized of the French version of the newspaper is integrated in the build script as well
All the items text description have been moved out of game_data.c and into game_text.s (there is some redundancy that needs fixing)
The market place description is now also display in French, but I need to revamp the text speech bubble system, hand adjustments is simply inefficient

Change Summary

Incremental Difference

--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/display.s (revision 1706)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/display.s (revision 1707)
@@ -1435,173 +1435,11 @@
14351435
14361436 ; 95 characters (from space to tilde), each is two byte large and 14 lines tall = 2660 bytes
14371437 _gFont12x14
1438- .byt $40,$40,$40,$40,$54,$40,$40,$40,$42,$40,$40,$40,$40,$40,$50,$40
1439- .byt $44,$40,$48,$40,$48,$40,$40,$40,$40,$40,$40,$40,$40,$40,$44,$40
1440- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1441- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1442- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1443- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1444- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1445- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1446- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1447- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1448- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1449- .byt $40,$40,$40,$40,$40,$40,$40,$40,$60,$40,$40,$40,$40,$40,$40,$40
1450- .byt $48,$40,$54,$40,$45,$40,$47,$40,$58,$50,$4e,$40,$50,$40,$48,$40
1451- .byt $48,$40,$68,$40,$40,$40,$40,$40,$40,$40,$40,$40,$44,$40,$4c,$40
1452- .byt $46,$40,$4e,$40,$4c,$40,$42,$40,$4f,$40,$46,$40,$7e,$40,$4c,$40
1453- .byt $46,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$58,$40,$40,$40
1454- .byt $40,$50,$4f,$60,$47,$70,$4f,$70,$4f,$70,$4f,$70,$47,$60,$4e,$4e
1455- .byt $4e,$40,$47,$40,$4e,$58,$4e,$40,$4c,$43,$4c,$4e,$47,$60,$4f,$60
1456- .byt $47,$60,$4f,$60,$4f,$40,$7f,$60,$58,$5c,$78,$78,$79,$47,$5c,$78
1457- .byt $70,$50,$5f,$70,$4c,$40,$60,$40,$5c,$40,$48,$40,$40,$40,$60,$40
1458- .byt $40,$40,$58,$40,$40,$40,$43,$40,$40,$40,$46,$40,$40,$40,$58,$40
1459- .byt $48,$40,$42,$40,$58,$40,$58,$40,$40,$40,$40,$40,$40,$40,$40,$40
1460- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1461- .byt $40,$40,$40,$40,$58,$40,$60,$40,$58,$40,$40,$40,$40,$40,$48,$40
1462- .byt $68,$40,$45,$40,$4b,$40,$64,$60,$52,$40,$60,$40,$50,$40,$44,$40
1463- .byt $5c,$40,$40,$40,$40,$40,$40,$40,$40,$40,$48,$40,$52,$40,$5a,$40
1464- .byt $51,$40,$52,$40,$46,$40,$48,$40,$48,$40,$42,$40,$52,$40,$49,$40
1465- .byt $40,$40,$40,$40,$41,$40,$40,$40,$60,$40,$64,$40,$4f,$40,$40,$70
1466- .byt $44,$60,$48,$50,$44,$48,$44,$50,$44,$50,$48,$50,$44,$44,$44,$40
1467- .byt $42,$40,$44,$60,$44,$40,$44,$46,$46,$44,$48,$50,$44,$50,$48,$50
1468- .byt $44,$50,$51,$40,$64,$60,$48,$48,$50,$50,$51,$42,$48,$50,$48,$60
1469- .byt $50,$50,$48,$40,$50,$40,$44,$40,$48,$40,$40,$40,$50,$40,$40,$40
1470- .byt $48,$40,$40,$40,$41,$40,$40,$40,$48,$40,$40,$40,$48,$40,$40,$40
1471- .byt $40,$40,$48,$40,$48,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1472- .byt $40,$40,$40,$40,$48,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1473- .byt $40,$40,$50,$40,$60,$40,$48,$40,$40,$40,$40,$40,$48,$40,$40,$40
1474- .byt $5f,$60,$54,$40,$64,$60,$50,$50,$40,$40,$60,$40,$44,$40,$68,$40
1475- .byt $48,$40,$40,$40,$40,$40,$40,$40,$48,$40,$52,$40,$44,$40,$41,$40
1476- .byt $42,$40,$4a,$40,$50,$40,$50,$40,$44,$40,$52,$40,$51,$40,$40,$40
1477- .byt $40,$40,$46,$40,$40,$40,$58,$40,$44,$40,$50,$60,$41,$50,$44,$60
1478- .byt $50,$50,$44,$44,$48,$40,$48,$40,$50,$50,$48,$48,$44,$40,$44,$40
1479- .byt $49,$40,$48,$40,$4a,$4a,$46,$44,$50,$48,$48,$50,$50,$48,$44,$50
1480- .byt $50,$40,$44,$40,$50,$50,$50,$60,$51,$42,$44,$60,$49,$40,$40,$60
1481- .byt $50,$40,$50,$40,$48,$40,$54,$40,$40,$40,$40,$40,$40,$40,$48,$40
1482- .byt $40,$40,$42,$40,$40,$40,$48,$40,$40,$40,$48,$40,$40,$40,$40,$40
1483- .byt $48,$40,$48,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1484- .byt $40,$40,$50,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1485- .byt $50,$40,$60,$40,$48,$40,$40,$40,$40,$40,$50,$40,$40,$40,$4a,$40
1486- .byt $54,$40,$59,$40,$48,$50,$40,$40,$60,$40,$44,$40,$40,$40,$48,$40
1487- .byt $40,$40,$40,$40,$40,$40,$48,$40,$62,$40,$44,$40,$41,$40,$44,$40
1488- .byt $4a,$40,$5e,$40,$6c,$40,$44,$40,$54,$40,$51,$40,$50,$40,$50,$40
1489- .byt $58,$40,$40,$40,$46,$40,$44,$40,$67,$50,$42,$50,$49,$40,$60,$40
1490- .byt $48,$44,$48,$40,$48,$40,$60,$40,$48,$48,$48,$40,$44,$40,$4a,$40
1491- .byt $48,$40,$4a,$4a,$49,$44,$60,$48,$48,$50,$60,$48,$48,$60,$50,$40
1492- .byt $48,$40,$50,$50,$50,$60,$52,$64,$45,$40,$4a,$40,$41,$40,$50,$40
1493- .byt $50,$40,$48,$40,$54,$40,$40,$40,$40,$40,$4e,$40,$56,$40,$4c,$40
1494- .byt $4e,$40,$4c,$40,$7c,$40,$4c,$40,$53,$40,$70,$40,$4c,$40,$53,$40
1495- .byt $50,$40,$76,$70,$73,$40,$4e,$40,$5b,$40,$4e,$40,$74,$40,$5c,$40
1496- .byt $7c,$40,$71,$40,$79,$40,$79,$48,$59,$40,$71,$40,$5e,$40,$50,$40
1497- .byt $60,$40,$50,$40,$40,$40,$40,$40,$50,$40,$40,$40,$4a,$40,$4e,$40
1498- .byt $43,$40,$53,$60,$40,$40,$60,$40,$44,$40,$40,$40,$7e,$40,$40,$40
1499- .byt $78,$40,$40,$40,$50,$40,$62,$40,$44,$40,$42,$40,$4c,$40,$52,$40
1500- .byt $41,$40,$72,$40,$48,$40,$58,$40,$53,$40,$40,$40,$40,$40,$60,$40
1501- .byt $7e,$40,$41,$40,$48,$40,$69,$50,$44,$50,$4f,$40,$60,$40,$48,$44
1502- .byt $4f,$40,$4f,$40,$60,$40,$4f,$78,$48,$40,$44,$40,$4c,$40,$48,$40
1503- .byt $4a,$52,$49,$48,$60,$48,$4b,$60,$60,$48,$4b,$40,$4c,$40,$48,$40
1504- .byt $50,$50,$51,$40,$52,$64,$42,$40,$44,$40,$42,$40,$50,$40,$48,$40
1505- .byt $48,$40,$62,$40,$40,$40,$40,$40,$52,$40,$5a,$40,$54,$40,$52,$40
1506- .byt $54,$40,$50,$40,$53,$40,$55,$40,$50,$40,$44,$40,$54,$40,$50,$40
1507- .byt $5b,$50,$55,$40,$52,$40,$4d,$40,$52,$40,$58,$40,$64,$40,$50,$40
1508- .byt $51,$40,$69,$40,$69,$48,$4a,$40,$51,$40,$52,$40,$60,$40,$60,$40
1509- .byt $50,$40,$72,$40,$40,$40,$50,$40,$40,$40,$4a,$40,$45,$40,$42,$58
1510- .byt $65,$40,$40,$40,$60,$40,$44,$40,$40,$40,$48,$40,$40,$40,$40,$40
1511- .byt $40,$40,$50,$40,$62,$40,$44,$40,$44,$40,$42,$40,$64,$40,$41,$40
1512- .byt $62,$40,$48,$40,$64,$40,$4d,$40,$40,$40,$40,$40,$58,$40,$40,$40
1513- .byt $46,$40,$50,$40,$6a,$70,$47,$70,$48,$60,$60,$40,$48,$44,$48,$40
1514- .byt $48,$40,$61,$70,$48,$48,$48,$40,$44,$40,$4a,$40,$48,$40,$49,$54
1515- .byt $48,$68,$60,$48,$48,$40,$60,$48,$49,$40,$42,$40,$48,$40,$50,$50
1516- .byt $52,$40,$54,$68,$45,$40,$44,$40,$44,$40,$50,$40,$48,$40,$48,$40
1517- .byt $40,$40,$40,$40,$40,$40,$62,$40,$52,$40,$60,$40,$62,$40,$78,$40
1518- .byt $50,$40,$52,$40,$59,$40,$50,$40,$44,$40,$58,$40,$50,$40,$52,$50
1519- .byt $59,$40,$62,$40,$49,$40,$62,$40,$50,$40,$70,$40,$50,$40,$51,$40
1520- .byt $51,$40,$52,$48,$44,$40,$51,$40,$44,$40,$50,$40,$60,$40,$48,$40
1521- .byt $6e,$40,$40,$40,$40,$40,$40,$40,$7f,$40,$45,$40,$44,$64,$61,$40
1522- .byt $40,$40,$60,$40,$48,$40,$40,$40,$48,$40,$40,$40,$40,$40,$40,$40
1523- .byt $50,$40,$64,$40,$48,$40,$48,$40,$42,$40,$7f,$40,$61,$40,$62,$40
1524- .byt $50,$40,$64,$40,$42,$40,$40,$40,$40,$40,$46,$40,$7e,$40,$58,$40
1525- .byt $50,$40,$6d,$60,$48,$50,$50,$60,$60,$40,$50,$48,$50,$40,$50,$40
1526- .byt $60,$60,$50,$50,$50,$40,$48,$40,$51,$40,$50,$40,$51,$64,$50,$68
1527- .byt $60,$50,$50,$40,$60,$50,$50,$60,$42,$40,$48,$40,$60,$60,$4a,$40
1528- .byt $54,$68,$49,$40,$48,$40,$48,$40,$50,$40,$48,$40,$48,$40,$40,$40
1529- .byt $40,$40,$40,$40,$64,$40,$62,$40,$60,$40,$64,$40,$60,$40,$60,$40
1530- .byt $52,$40,$52,$40,$60,$40,$48,$40,$64,$40,$60,$40,$64,$60,$62,$40
1531- .byt $62,$40,$51,$40,$64,$40,$60,$40,$4c,$40,$60,$40,$66,$40,$52,$40
1532- .byt $52,$50,$4c,$40,$62,$40,$48,$40,$50,$40,$60,$40,$50,$40,$40,$40
1533- .byt $40,$40,$40,$40,$40,$40,$54,$40,$6a,$40,$44,$64,$62,$40,$40,$40
1534- .byt $50,$40,$50,$40,$40,$40,$40,$40,$50,$40,$40,$40,$40,$40,$60,$40
1535- .byt $64,$40,$48,$40,$50,$40,$64,$40,$44,$40,$62,$40,$64,$40,$50,$40
1536- .byt $64,$40,$64,$40,$40,$40,$40,$40,$41,$40,$40,$40,$60,$40,$40,$40
1537- .byt $50,$40,$50,$50,$51,$40,$50,$60,$50,$50,$50,$60,$50,$40,$50,$60
1538- .byt $50,$50,$50,$40,$48,$40,$50,$60,$51,$40,$51,$44,$50,$50,$50,$60
1539- .byt $50,$40,$50,$60,$50,$60,$62,$40,$50,$40,$61,$60,$4c,$40,$48,$50
1540- .byt $50,$60,$48,$40,$50,$60,$60,$40,$44,$40,$50,$40,$40,$40,$40,$40
1541- .byt $40,$40,$6c,$40,$64,$40,$64,$40,$6c,$40,$64,$40,$60,$40,$4c,$40
1542- .byt $62,$40,$60,$40,$48,$40,$64,$40,$60,$40,$64,$60,$62,$40,$64,$40
1543- .byt $52,$40,$6c,$40,$60,$40,$64,$40,$68,$40,$6a,$40,$52,$40,$52,$50
1544- .byt $54,$40,$66,$40,$52,$40,$60,$40,$60,$40,$50,$40,$40,$40,$40,$40
1545- .byt $60,$40,$40,$40,$54,$40,$7c,$40,$48,$58,$5c,$40,$40,$40,$50,$40
1546- .byt $60,$40,$40,$40,$40,$40,$60,$40,$40,$40,$60,$40,$40,$40,$58,$40
1547- .byt $7e,$40,$7f,$40,$78,$40,$4e,$40,$5c,$40,$58,$40,$60,$40,$78,$40
1548- .byt $78,$40,$60,$40,$50,$40,$40,$40,$40,$40,$40,$40,$60,$40,$4f,$40
1549- .byt $78,$78,$7e,$40,$4f,$40,$7f,$60,$7f,$60,$78,$40,$4f,$40,$78,$78
1550- .byt $78,$40,$48,$40,$78,$58,$7e,$40,$79,$4e,$78,$50,$4f,$40,$78,$40
1551- .byt $4f,$40,$78,$58,$7c,$40,$78,$40,$5e,$70,$48,$40,$48,$50,$79,$70
1552- .byt $5c,$40,$7f,$60,$60,$40,$44,$40,$50,$40,$40,$40,$40,$40,$40,$40
1553- .byt $76,$40,$78,$40,$78,$40,$76,$40,$78,$40,$60,$40,$48,$40,$63,$40
1554- .byt $70,$40,$48,$40,$66,$40,$70,$40,$64,$70,$63,$40,$78,$40,$5c,$40
1555- .byt $74,$40,$60,$40,$78,$40,$70,$40,$73,$40,$5c,$40,$5d,$60,$66,$40
1556- .byt $7a,$40,$7e,$40,$60,$40,$60,$40,$50,$40,$40,$40,$40,$40,$40,$40
1557- .byt $40,$40,$40,$40,$48,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1558- .byt $40,$40,$40,$40,$60,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1559- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1560- .byt $40,$40,$50,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1561- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1562- .byt $48,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$4c,$40
1563- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1564- .byt $40,$40,$70,$40,$40,$40,$70,$40,$40,$40,$40,$40,$40,$40,$40,$40
1565- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$54,$40,$40,$40,$40,$40
1566- .byt $48,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$50,$40,$44,$40
1567- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$42,$40
1568- .byt $40,$40,$70,$40,$40,$40,$70,$40,$40,$40,$40,$40,$40,$40,$40,$40
1569- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1570- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1571- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1572- .byt $60,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1573- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$50,$40
1574- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$53,$48,$40,$40
1575- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1576- .byt $40,$40,$40,$40,$40,$40,$40,$40,$7f,$60,$40,$40,$40,$40,$40,$40
1577- .byt $40,$40,$40,$40,$40,$40,$40,$40,$62,$40,$40,$40,$40,$40,$50,$40
1578- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$60,$40,$48,$40,$40,$40
1579- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$44,$40,$40,$40
1580- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1581- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1582- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1583- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1584- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1585- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$60,$40,$40,$40
1586- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$50,$78,$40,$40,$40,$40
1587- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1588- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1589- .byt $40,$40,$40,$40,$40,$40,$62,$40,$40,$40,$40,$40,$50,$40,$40,$40
1590- .byt $40,$40,$40,$40,$40,$40,$40,$40,$60,$40,$48,$40,$40,$40,$40,$40
1591- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$64,$40,$40,$40,$40,$40
1592- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1593- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1594- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1595- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1596- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1597- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1598- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1599- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1600- .byt $40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40,$40
1601- .byt $40,$40,$40,$40,$7c,$40,$40,$40,$40,$40,$60,$40,$40,$40,$40,$40
1602- .byt $40,$40,$40,$40,$40,$40,$60,$40,$48,$40,$40,$40,$40,$40,$40,$40
1603- .byt $40,$40,$40,$40,$40,$40,$40,$40,$78,$40,$40,$40,$40,$40,$40,$40
1604- .byt $40,$40,$40,$40
1438+#ifdef LANGUAGE_FR
1439+#include "generated_12x14_font_fr.s"
1440+#else
1441+#include "generated_12x14_font.s"
1442+#endif
16051443 _Font12x14End
16061444
16071445 ; 16 block of 6x6 pixels arranged vertically, 6x96 pixels bitmap
--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/floppybuilderscript.txt (revision 1706)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/floppybuilderscript.txt (revision 1707)
@@ -153,7 +153,9 @@
153153 AddDefine LOADER_PICTURE_LOCATIONS_END {FileIndex}
154154
155155 ; Additional images
156-AddFile ..\build\files\newspaper.hir
156+
157+AddFile ..\build\files\newspaper_fr.hir
158+
157159 AddDefine LOADER_PICTURE_NEWSPAPER {FileIndex}
158160
159161 AddFile ..\build\files\handwritten_note.hir
--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/floppybuilderscript_master.txt (revision 1706)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/floppybuilderscript_master.txt (revision 1707)
@@ -157,7 +157,11 @@
157157 AddDefine LOADER_PICTURE_LOCATIONS_END {FileIndex}
158158
159159 ; Additional images
160+#ifdef LANGUAGE_FR
161+AddFile ..\build\files\newspaper_fr.hir
162+#else // LANGUAGE_EN
160163 AddFile ..\build\files\newspaper.hir
164+#endif
161165 AddDefine LOADER_PICTURE_NEWSPAPER {FileIndex}
162166
163167 AddFile ..\build\files\handwritten_note.hir
--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_data.c (revision 1706)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_data.c (revision 1707)
@@ -93,62 +93,62 @@
9393 // The flags and usable containers are copied from the BASIC version.
9494 // The final version will contain actual bit-masks
9595 item gItems[e_ITEM_COUNT_] =
96-{ // Item World Associated Generic Containers usable
97- // description location item flags with this specific item
96+{ // Item World Associated Generic Containers usable
97+ // description location item flags with this specific item
9898 // Containers
99- { "an empty tobacco tin" ,e_LOCATION_LOUNGE ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_TobaccoTin
100- { "a wooden bucket" ,e_LOCATION_WELL ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_Bucket
101- { "a cardboard box" ,e_LOCATION_GREENHOUSE ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_CardboardBox
102- { "a fishing net" ,e_LOCATION_FISHPND ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_FishingNet
103- { "a plastic bag" ,e_LOCATION_MARKETPLACE ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_PlasticBag
104- { "a small bottle" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_SmallBottle
99+ { gTextItemTobaccoTin ,e_LOCATION_LOUNGE ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_TobaccoTin
100+ { gTextItemBucket ,e_LOCATION_WELL ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_Bucket
101+ { gTextItemCardboardBox ,e_LOCATION_GREENHOUSE ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_CardboardBox
102+ { gTextItemFishingNet ,e_LOCATION_FISHPND ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_FishingNet
103+ { gTextItemPlasticBag ,e_LOCATION_MARKETPLACE ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_PlasticBag
104+ { gTextItemSmallBottle ,e_LOCATION_NONE ,255 ,ITEM_FLAG_IS_CONTAINER ,0}, // e_ITEM_SmallBottle
105105
106106 // Items requiring containers
107- { "black dust" ,e_LOCATION_DARKTUNNEL ,255 ,ITEM_FLAG_DEFAULT ,CONTAINER_MASK4(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin,e_ITEM_CardboardBox)}, // e_ITEM_BlackDust
108- { "gritty yellow powder" ,e_LOCATION_INSIDEHOLE ,255 ,ITEM_FLAG_DEFAULT ,CONTAINER_MASK4(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin,e_ITEM_CardboardBox)}, // e_ITEM_YellowPowder
109- { "some petrol" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_EVAPORATES ,CONTAINER_MASK3(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin)}, // e_ITEM_Petrol
110- { "some water" ,e_LOCATION_WELL ,255 ,ITEM_FLAG_EVAPORATES ,CONTAINER_MASK3(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin)}, // e_ITEM_Water
107+ { gTextItemBlackDust ,e_LOCATION_DARKTUNNEL ,255 ,ITEM_FLAG_DEFAULT ,CONTAINER_MASK4(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin,e_ITEM_CardboardBox)}, // e_ITEM_BlackDust
108+ { gTextItemYellowPowder ,e_LOCATION_INSIDEHOLE ,255 ,ITEM_FLAG_DEFAULT ,CONTAINER_MASK4(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin,e_ITEM_CardboardBox)}, // e_ITEM_YellowPowder
109+ { gTextItemPetrol ,e_LOCATION_NONE ,255 ,ITEM_FLAG_EVAPORATES ,CONTAINER_MASK3(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin)}, // e_ITEM_Petrol
110+ { gTextItemWater ,e_LOCATION_WELL ,255 ,ITEM_FLAG_EVAPORATES ,CONTAINER_MASK3(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin)}, // e_ITEM_Water
111111
112112 // Normal items
113- { "a locked panel on the wall" ,e_LOCATION_DARKCELLARROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_LockedPanel
114- { "an open panel on wall" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_OpenPanel
115- { "a small hole in the door" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_SmallHoleInDoor
116- { "the window is broken" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_BrokenWindow
117- { "a large dove" ,e_LOCATION_WOODEDAVENUE ,255 ,ITEM_FLAG_DEFAULT ,CONTAINER_MASK3(e_ITEM_Bucket,e_ITEM_CardboardBox,e_ITEM_FishingNet)}, // e_ITEM_LargeDove
118- { "some twine" ,e_LOCATION_GREENHOUSE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Twine
119- { "a silver knife" ,e_LOCATION_VEGSGARDEN ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_SilverKnife
120- { "a ladder" ,e_LOCATION_APPLE_TREES ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Ladder
121- { "an abandoned car" ,e_LOCATION_TARMACAREA ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_AbandonedCar
122- { "an alsatian growling at you" ,e_LOCATION_ENTRANCEHALL ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_AlsatianDog
123- { "a joint of meat" ,e_LOCATION_DININGROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Meat
124- { "some brown bread" ,e_LOCATION_DININGROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Bread
125- { "a roll of sticky tape" ,e_LOCATION_BOXROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_RollOfTape
126- { "a chemistry book" ,e_LOCATION_LIBRARY ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_ChemistryBook
127- { "a box of matches" ,e_LOCATION_KITCHEN ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_BoxOfMatches
128- { "a snooker cue" ,e_LOCATION_GAMESROOM ,255 ,ITEM_FLAG_DEFAULT ,ITEM_FLAG_DEFAULT }, // e_ITEM_SnookerCue
129- { "a thug asleep on the bed" ,e_LOCATION_MASTERBEDROOM ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_Thug
130- { "a heavy safe" ,e_LOCATION_CELLAR ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_HeavySafe
131- { "a printed note" ,e_LOCATION_BOXROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_PrintedNote
132- { "a length of rope" ,e_LOCATION_WELL ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Rope
133- { "a rope hangs from the window" ,e_LOCATION_NONE ,e_ITEM_Rope ,ITEM_FLAG_ALIAS_ITEM ,0}, // e_ITEM_RopeHangingFromWindow
134- { "a roll of toilet tissue" ,e_LOCATION_TINY_WC ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_RollOfToiletPaper
135- { "a hose-pipe" ,e_LOCATION_ZENGARDEN ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_HosePipe
136- { "an open safe" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_OpenSafe
137- { "broken glass" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_BrokenGlass
138- { "an acid burn" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_AcidBurn
139- { "a young girl" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_YoungGirl
140- { "a fuse" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Fuse
141- { "some gunpowder" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,CONTAINER_MASK4(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin,e_ITEM_CardboardBox)}, // e_ITEM_GunPowder
142- { "a set of keys" ,e_LOCATION_MAINSTREET ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Keys
143- { "a newspaper" ,e_LOCATION_INVENTORY ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Newspaper
144- { "a bomb" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Bomb
145- { "a pistol" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Pistol
146- { "three .38 bullets" ,e_LOCATION_DARKCELLARROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Bullets
147- { "a young girl tied up on the floor" ,e_LOCATION_GIRLROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_YoungGirlOnFloor
148- { "a couple chemistry recipes" ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_ChemistryRecipes
149- { "a map of the United Kingdom" ,e_LOCATION_LIBRARY ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_UnitedKingdomMap
150- { "a ladder in a hole" ,e_LOCATION_NONE ,e_ITEM_Ladder ,ITEM_FLAG_ALIAS_ITEM ,0}, // e_ITEM_LadderInTheHole
151- { "a rope attached to a tree" ,e_LOCATION_NONE ,e_ITEM_Rope ,ITEM_FLAG_ALIAS_ITEM ,0}, // e_ITEM_RopeAttachedToATree
113+ { gTextItemLockedPanel ,e_LOCATION_DARKCELLARROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_LockedPanel
114+ { gTextItemOpenPanel ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_OpenPanel
115+ { gTextItemSmallHoleInDoor ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_SmallHoleInDoor
116+ { gTextItemBrokenWindow ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_BrokenWindow
117+ { gTextItemLargeDove ,e_LOCATION_WOODEDAVENUE ,255 ,ITEM_FLAG_DEFAULT ,CONTAINER_MASK3(e_ITEM_Bucket,e_ITEM_CardboardBox,e_ITEM_FishingNet)}, // e_ITEM_LargeDove
118+ { gTextItemTwine ,e_LOCATION_GREENHOUSE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Twine
119+ { gTextItemSilverKnife ,e_LOCATION_VEGSGARDEN ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_SilverKnife
120+ { gTextItemLadder ,e_LOCATION_APPLE_TREES ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Ladder
121+ { gTextItemAbandonedCar ,e_LOCATION_TARMACAREA ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_AbandonedCar
122+ { gTextItemAlsatianDog ,e_LOCATION_ENTRANCEHALL ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_AlsatianDog
123+ { gTextItemMeat ,e_LOCATION_DININGROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Meat
124+ { gTextItemBread ,e_LOCATION_DININGROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Bread
125+ { gTextItemRollOfTape ,e_LOCATION_BOXROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_RollOfTape
126+ { gTextItemChemistryBook ,e_LOCATION_LIBRARY ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_ChemistryBook
127+ { gTextItemBoxOfMatches ,e_LOCATION_KITCHEN ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_BoxOfMatches
128+ { gTextItemSnookerCue ,e_LOCATION_GAMESROOM ,255 ,ITEM_FLAG_DEFAULT ,ITEM_FLAG_DEFAULT }, // e_ITEM_SnookerCue
129+ { gTextItemThug ,e_LOCATION_MASTERBEDROOM ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_Thug
130+ { gTextItemHeavySafe ,e_LOCATION_CELLAR ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_HeavySafe
131+ { gTextItemPrintedNote ,e_LOCATION_BOXROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_PrintedNote
132+ { gTextItemRope ,e_LOCATION_WELL ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Rope
133+ { gTextItemRopeHangingFromWindow ,e_LOCATION_NONE ,e_ITEM_Rope ,ITEM_FLAG_ALIAS_ITEM ,0}, // e_ITEM_RopeHangingFromWindow
134+ { gTextItemRollOfToiletPaper ,e_LOCATION_TINY_WC ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_RollOfToiletPaper
135+ { gTextItemHosePipe ,e_LOCATION_ZENGARDEN ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_HosePipe
136+ { gTextItemOpenSafe ,e_LOCATION_NONE ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_OpenSafe
137+ { gTextItemBrokenGlass ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_BrokenGlass
138+ { gTextItemAcidBurn ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_AcidBurn
139+ { gTextItemYoungGirl ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_YoungGirl
140+ { gTextItemFuse ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Fuse
141+ { gTextItemGunPowder ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,CONTAINER_MASK4(e_ITEM_Bucket,e_ITEM_PlasticBag,e_ITEM_TobaccoTin,e_ITEM_CardboardBox)}, // e_ITEM_GunPowder
142+ { gTextItemKeys ,e_LOCATION_MAINSTREET ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Keys
143+ { gTextItemNewspaper ,e_LOCATION_INVENTORY ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Newspaper
144+ { gTextItemBomb ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Bomb
145+ { gTextItemPistol ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Pistol
146+ { gTextItemBullets ,e_LOCATION_DARKCELLARROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_Bullets
147+ { gTextItemYoungGirlOnFloor ,e_LOCATION_GIRLROOM ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_YoungGirlOnFloor
148+ { gTextItemChemistryRecipes ,e_LOCATION_NONE ,255 ,ITEM_FLAG_DEFAULT ,0}, // e_ITEM_ChemistryRecipes
149+ { gTextItemUnitedKingdomMap ,e_LOCATION_LIBRARY ,255 ,ITEM_FLAG_HEAVY ,0}, // e_ITEM_UnitedKingdomMap
150+ { gTextItemLadderInTheHole ,e_LOCATION_NONE ,e_ITEM_Ladder ,ITEM_FLAG_ALIAS_ITEM ,0}, // e_ITEM_LadderInTheHole
151+ { gTextItemeRopeAttachedToATree ,e_LOCATION_NONE ,e_ITEM_Rope ,ITEM_FLAG_ALIAS_ITEM ,0}, // e_ITEM_RopeAttachedToATree
152152 };
153153
154154
--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_defines.h (revision 1706)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_defines.h (revision 1707)
@@ -207,3 +207,58 @@
207207
208208 extern const char gTextLocationOutsidePit[]; // "Outside a deep pit"
209209 extern const char gTextLocationGirlRoomOpenned[]; // "The girl room (openned lock)"
210+
211+// Items
212+// Containers
213+extern const char gTextItemTobaccoTin[]; // "an empty tobacco tin"
214+extern const char gTextItemBucket[]; // "a wooden bucket"
215+extern const char gTextItemCardboardBox[]; // "a cardboard box"
216+extern const char gTextItemFishingNet[]; // "a fishing net"
217+extern const char gTextItemPlasticBag[]; // "a plastic bag"
218+extern const char gTextItemSmallBottle[]; // "a small bottle"
219+// Items requiring containers
220+extern const char gTextItemBlackDust[]; // "black dust"
221+extern const char gTextItemYellowPowder[]; // "gritty yellow powder"
222+extern const char gTextItemPetrol[]; // "some petrol"
223+extern const char gTextItemWater[]; // "some water"
224+// Normal items
225+extern const char gTextItemLockedPanel[]; // "a locked panel on the wall"
226+extern const char gTextItemOpenPanel[]; // "an open panel on wall"
227+extern const char gTextItemSmallHoleInDoor[]; // "a small hole in the door"
228+extern const char gTextItemBrokenWindow[]; // "the window is broken"
229+extern const char gTextItemLargeDove[]; // "a large dove"
230+extern const char gTextItemTwine[]; // "some twine"
231+extern const char gTextItemSilverKnife[]; // "a silver knife"
232+extern const char gTextItemLadder[]; // "a ladder"
233+extern const char gTextItemAbandonedCar[]; // "an abandoned car"
234+extern const char gTextItemAlsatianDog[]; // "an alsatian growling at you"
235+extern const char gTextItemMeat[]; // "a joint of meat"
236+extern const char gTextItemBread[]; // "some brown bread"
237+extern const char gTextItemRollOfTape[]; // "a roll of sticky tape"
238+extern const char gTextItemChemistryBook[]; // "a chemistry book"
239+extern const char gTextItemBoxOfMatches[]; // "a box of matches"
240+extern const char gTextItemSnookerCue[]; // "a snooker cue"
241+extern const char gTextItemThug[]; // "a thug asleep on the bed"
242+extern const char gTextItemHeavySafe[]; // "a heavy safe"
243+extern const char gTextItemPrintedNote[]; // "a printed note"
244+extern const char gTextItemRope[]; // "a length of rope"
245+extern const char gTextItemRopeHangingFromWindow[]; // "a rope hangs from the window"
246+extern const char gTextItemRollOfToiletPaper[]; // "a roll of toilet tissue"
247+extern const char gTextItemHosePipe[]; // "a hose-pipe"
248+extern const char gTextItemOpenSafe[]; // "an open safe"
249+extern const char gTextItemBrokenGlass[]; // "broken glass"
250+extern const char gTextItemAcidBurn[]; // "an acid burn"
251+extern const char gTextItemYoungGirl[]; // "a young girl"
252+extern const char gTextItemFuse[]; // "a fuse"
253+extern const char gTextItemGunPowder[]; // "some gunpowder"
254+extern const char gTextItemKeys[]; // "a set of keys"
255+extern const char gTextItemNewspaper[]; // "a newspaper"
256+extern const char gTextItemBomb[]; // "a bomb"
257+extern const char gTextItemPistol[]; // "a pistol"
258+extern const char gTextItemBullets[]; // "three .38 bullets"
259+extern const char gTextItemYoungGirlOnFloor[]; // "a young girl tied up on the floor"
260+extern const char gTextItemChemistryRecipes[]; // "a couple chemistry recipes"
261+extern const char gTextItemUnitedKingdomMap[]; // "a map of the United Kingdom"
262+extern const char gTextItemLadderInTheHole[]; // "a ladder in a hole"
263+extern const char gTextItemeRopeAttachedToATree[]; // "a rope attached to a tree"
264+
--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_text.s (revision 1706)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_text.s (revision 1707)
@@ -236,6 +236,116 @@
236236 _gTextLocationGirlRoomOpenned .byt "The girl room (openned lock)",0
237237 #endif
238238
239+
240+// Items
241+#ifdef LANGUAGE_FR
242+// Containers
243+_gTextItemTobaccoTin .byt "une boîte à tabac vide",0
244+_gTextItemBucket .byt "un seau en bois",0
245+_gTextItemCardboardBox .byt "une boite en carton",0
246+_gTextItemFishingNet .byt "un filet de pêche",0
247+_gTextItemPlasticBag .byt "un sac en plastique",0
248+_gTextItemSmallBottle .byt "une petite bouteille",0
249+// Items requiring containers
250+_gTextItemBlackDust .byt "de la poudre noire",0
251+_gTextItemYellowPowder .byt "poudre jaune granuleuse",0
252+_gTextItemPetrol .byt "du pétrole",0
253+_gTextItemWater .byt "de l'eau",0
254+// Normal items
255+_gTextItemLockedPanel .byt "un paneau mural verouillé",0
256+_gTextItemOpenPanel .byt "un paneau mural ouvert",0
257+_gTextItemSmallHoleInDoor .byt "un petit trou dans la porte",0
258+_gTextItemBrokenWindow .byt "une vitre brisée",0
259+_gTextItemLargeDove .byt "une grosse colombe",0
260+_gTextItemTwine .byt "un peu de ficelle",0
261+_gTextItemSilverKnife .byt "un coueau en argent",0
262+_gTextItemLadder .byt "une échelle",0
263+_gTextItemAbandonedCar .byt "une voiture abandonnée",0
264+_gTextItemAlsatianDog .byt "un alsacien qui grogne",0
265+_gTextItemMeat .byt "un morceau de viande",0
266+_gTextItemBread .byt "du pain complet",0
267+_gTextItemRollOfTape .byt "un rouleau de bande adhésive",0
268+_gTextItemChemistryBook .byt "un livre de chimie",0
269+_gTextItemBoxOfMatches .byt "une boite d'allumettes",0
270+_gTextItemSnookerCue .byt "une queue de billard",0
271+_gTextItemThug .byt "un voyou endormi sur le lit",0
272+_gTextItemHeavySafe .byt "un gros coffre fort",0
273+_gTextItemPrintedNote .byt "une note imprimée",0
274+_gTextItemRope .byt "une longueur de corde",0
275+_gTextItemRopeHangingFromWindow .byt "une core qui pend de la fenêtre",0
276+_gTextItemRollOfToiletPaper .byt "un rouleau de papier toilette",0
277+_gTextItemHosePipe .byt "un tuyau d'arrosage",0
278+_gTextItemOpenSafe .byt "un coffre fort ouvert",0
279+_gTextItemBrokenGlass .byt "des morceaux de glace",0
280+_gTextItemAcidBurn .byt "une brulure d'acide",0
281+_gTextItemYoungGirl .byt "une jeune fille",0
282+_gTextItemFuse .byt "un fusible",0
283+_gTextItemGunPowder .byt "de la poudre à cannon",0
284+_gTextItemKeys .byt "un jeu de clefs",0
285+_gTextItemNewspaper .byt "un journal",0
286+_gTextItemBomb .byt "une bombe",0
287+_gTextItemPistol .byt "un pistolet",0
288+_gTextItemBullets .byt "trois balles de calibre .38",0
289+_gTextItemYoungGirlOnFloor .byt "une jeunne fille attachée au sol",0
290+_gTextItemChemistryRecipes .byt "des formules de chimie",0
291+_gTextItemUnitedKingdomMap .byt "une carte du royaume uni",0
292+_gTextItemLadderInTheHole .byt "une échelle dans un trou",0
293+_gTextItemeRopeAttachedToATree .byt "une corde attachée à un arbre",0
294+#else
295+// Containers
296+_gTextItemTobaccoTin .byt "an empty tobacco tin",0
297+_gTextItemBucket .byt "a wooden bucket",0
298+_gTextItemCardboardBox .byt "a cardboard box",0
299+_gTextItemFishingNet .byt "a fishing net",0
300+_gTextItemPlasticBag .byt "a plastic bag",0
301+_gTextItemSmallBottle .byt "a small bottle",0
302+// Items requiring containers
303+_gTextItemBlackDust .byt "black dust",0
304+_gTextItemYellowPowder .byt "gritty yellow powder",0
305+_gTextItemPetrol .byt "some petrol",0
306+_gTextItemWater .byt "some water",0
307+// Normal items
308+_gTextItemLockedPanel .byt "a locked panel on the wall",0
309+_gTextItemOpenPanel .byt "an open panel on wall",0
310+_gTextItemSmallHoleInDoor .byt "a small hole in the door",0
311+_gTextItemBrokenWindow .byt "the window is broken",0
312+_gTextItemLargeDove .byt "a large dove",0
313+_gTextItemTwine .byt "some twine",0
314+_gTextItemSilverKnife .byt "a silver knife",0
315+_gTextItemLadder .byt "a ladder",0
316+_gTextItemAbandonedCar .byt "an abandoned car",0
317+_gTextItemAlsatianDog .byt "an alsatian growling at you",0
318+_gTextItemMeat .byt "a joint of meat",0
319+_gTextItemBread .byt "some brown bread",0
320+_gTextItemRollOfTape .byt "a roll of sticky tape",0
321+_gTextItemChemistryBook .byt "a chemistry book",0
322+_gTextItemBoxOfMatches .byt "a box of matches",0
323+_gTextItemSnookerCue .byt "a snooker cue",0
324+_gTextItemThug .byt "a thug asleep on the bed",0
325+_gTextItemHeavySafe .byt "a heavy safe",0
326+_gTextItemPrintedNote .byt "a printed note",0
327+_gTextItemRope .byt "a length of rope",0
328+_gTextItemRopeHangingFromWindow .byt "a rope hangs from the window",0
329+_gTextItemRollOfToiletPaper .byt "a roll of toilet tissue",0
330+_gTextItemHosePipe .byt "a hose-pipe",0
331+_gTextItemOpenSafe .byt "an open safe",0
332+_gTextItemBrokenGlass .byt "broken glass",0
333+_gTextItemAcidBurn .byt "an acid burn",0
334+_gTextItemYoungGirl .byt "a young girl",0
335+_gTextItemFuse .byt "a fuse",0
336+_gTextItemGunPowder .byt "some gunpowder",0
337+_gTextItemKeys .byt "a set of keys",0
338+_gTextItemNewspaper .byt "a newspaper",0
339+_gTextItemBomb .byt "a bomb",0
340+_gTextItemPistol .byt "a pistol",0
341+_gTextItemBullets .byt "three .38 bullets",0
342+_gTextItemYoungGirlOnFloor .byt "a young girl tied up on the floor",0
343+_gTextItemChemistryRecipes .byt "a couple chemistry recipes",0
344+_gTextItemUnitedKingdomMap .byt "a map of the United Kingdom",0
345+_gTextItemLadderInTheHole .byt "a ladder in a hole",0
346+_gTextItemeRopeAttachedToATree .byt "a rope attached to a tree",0
347+#endif
348+
239349 _gTextLowerCaseAlphabet .byt "abcde",255-2,"f",255-2,"ghi",255-2,"jklmnopqrstuvwxyz",0
240350
241351 // Scene descriptions
@@ -256,10 +366,17 @@
256366 _gDescriptionMarketPlace
257367 WAIT(DELAY_FIRST_BUBBLE)
258368 .byt COMMAND_BUBBLE,2,64
369+#ifdef LANGUAGE_FR
370+ .byt RECTANGLE(4,100,108,15)
371+ .byt RECTANGLE(4,106,63,15)
372+ .byt OFFSET(1,0),"La place du marché",0
373+ .byt OFFSET(1,4),"est désertée",0
374+#else
259375 .byt RECTANGLE(4,100,95,15)
260376 .byt RECTANGLE(4,106,59,15)
261377 .byt OFFSET(1,0),"The market place",0
262378 .byt OFFSET(1,4),"is deserted",0
379+#endif
263380 END
264381
265382 _gDescriptionDarkAlley
--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/osdk_makedata.bat (revision 1706)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/osdk_makedata.bat (revision 1707)
@@ -39,8 +39,9 @@
3939
4040 :: The 12x14 font
4141 :: palatino_linotype_italics_size_10_font.png
42-SET PARAMS=-u1 -m0 -f0 -o4_Font12x14
43-%PICTCONV% %PARAMS% data\palatino_linotype_italics_size_10_font.png build\12x14_font.s
42+SET PARAMS=-u1 -m0 -f0 -o4Font12x14
43+%PICTCONV% %PARAMS% data\palatino_linotype_italics_size_10_font.png code\generated_12x14_font.s
44+%PICTCONV% %PARAMS% data\palatino_linotype_italics_size_10_font_fr.png code\generated_12x14_font_fr.s
4445
4546
4647 :: Title picture
@@ -158,6 +159,7 @@
158159
159160 :: Other 240x128 full screen images which are not locations
160161 %PICTCONV% %PARAMS% data\newspaper.png %TARGET%\newspaper.hir
162+%PICTCONV% %PARAMS% data\newspaper_fr.png %TARGET%\newspaper_fr.hir
161163 %PICTCONV% %PARAMS% data\handwritten_note.png %TARGET%\handwritten_note.hir
162164 %PICTCONV% %PARAMS% data\science_book.png %TARGET%\science_book.hir
163165 %PICTCONV% %PARAMS% data\chemistry_recipes.png %TARGET%\chemistry_recipes.hir
Show on old repository browser