← Back to team overview

hangman8086-devs team mailing list archive

[Merge] lp:~carsso/hangman8086/motus-sound into lp:hangman8086

 

Germain CARRÉ has proposed merging lp:~carsso/hangman8086/motus-sound into lp:hangman8086.

Requested reviews:
  Hangman 8086 Developers (hangman8086-devs)

For more details, see:
https://code.launchpad.net/~carsso/hangman8086/motus-sound/+merge/64564
-- 
https://code.launchpad.net/~carsso/hangman8086/motus-sound/+merge/64564
Your team Hangman 8086 Developers is requested to review the proposed merge of lp:~carsso/hangman8086/motus-sound into lp:hangman8086.
=== modified file 'mainfunc.asm'
--- mainfunc.asm	2011-05-26 14:19:39 +0000
+++ mainfunc.asm	2011-06-14 15:57:09 +0000
@@ -135,7 +135,7 @@
 ;; +------------------------------------+
 ;; |                                    | \
 ;; |                                    |  |
-;; |                                    |  | Clear
+;; |                                    |  | Clears
 ;; |        Menu/Game/Animation         |  | that
 ;; |                                    |  | part
 ;; |                                    |  |
@@ -473,3 +473,27 @@
 ret
 
 
+;Args:
+I2S_INT db 0 ;The number to convert
+
+;Returns
+I2S_STR db "0000"
+
+_inttostr:
+
+;Backup registers
+push ax
+push bx
+push cx
+push dx
+
+;TODO
+
+;Restore registers
+pop dx
+pop cx
+pop bx
+pop ax
+
+ret
+

=== added file 'run_windows.cmd'
--- run_windows.cmd	1970-01-01 00:00:00 +0000
+++ run_windows.cmd	2011-06-14 15:57:09 +0000
@@ -0,0 +1,2 @@
+set APP_NAME=HANGMAN.com
+dosbox -conf -c "ECHO" -c "MOUNT C %cd%" -c "C:" -c "%APP_NAME%" -c "EXIT"

=== modified file 'sounds.res'
--- sounds.res	2011-05-26 12:04:35 +0000
+++ sounds.res	2011-06-14 15:57:09 +0000
@@ -40,18 +40,46 @@
 
 ;========================================================== Startup music ====
 ;              Sound, duration
-SND_START dw    1046, 12
-          dw    1175, 04
-          dw    1328, 04
-          dw    1046, 08
-          dw    1175, 04
-          dw    1328, 04
-          dw    1046, 08
-          dw    1175, 04
-          dw    1328, 04
-          dw    1480, 08
-          dw       0,  0
-
+SND_START   dw     4049,  1
+            dw    40000,  1
+            dw     3033,  1
+            dw    40000,  4
+            dw     2702,  5
+            dw    40000,  1
+            dw     2407,  2
+            dw    40000,  2
+            dw     3033,  2
+            dw    40000,  3
+            dw     4049,  3
+            dw    40000,  2
+            dw     4049,  1
+            dw    40000,  3
+            dw     3405,  3
+            dw    40000,  3
+            dw     3607,  2
+            dw    40000,  3
+            dw     4049,  4
+            dw    40000,  5
+            dw     3405,  2
+            dw    40000,  2
+            dw     3405,  1
+            dw    40000,  1
+            dw     2551,  2
+            dw    40000,  1
+            dw     3405,  1
+            dw    40000,  1
+            dw     2551,  4
+            dw    40000,  4
+            dw     2272,  6
+            dw    40000,  2
+            dw     3405,  2
+            dw    40000,  2
+            dw     3405,  2
+            dw    40000,  2
+            dw     3405,  2
+            dw    40000,  1
+            dw     3033,  6
+            dw        0,  0
 
 
 ;================================================================== Menus ====

=== modified file 'words.res'
--- words.res	2011-05-31 13:03:40 +0000
+++ words.res	2011-06-14 15:57:09 +0000
@@ -143,7 +143,7 @@
               db  "AGROCHEMICALS$           "
 
 
-WORD_LIST_FR  db  "CACHETTERAIENt$          "
+WORD_LIST_FR  db  "CACHETTERAIENT$          "
               db  "ECLAIRAGISTES$           "
               db  "QUADRILLERAIENT$         "
               db  "INTUSSUSCEPTION$         "


Follow ups