Changeset 90838a1 in advance-wars

Timestamp:

Jan 30, 2011, 7:14:51 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

205f525

Parents:

dd3e793 (diff), c088db6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with b1ae6001d1e8a657ebc33569927039e37ca2d519

Location:

Spec

Files:

• Game Spec.docx (modified) ( previous)
• vba.ini (modified) (7 diffs)

Spec/vba.ini

@@ -1 +1 @@
 [preferences]
-windowX=1093
-windowY=495
+windowX=966
+windowY=432
 selectedFilter=1
-romdir=C:\Complete\GAMEBOY ADVANCE COMPLETE (U) [!] ROMSET
-video=0
+romdir=C:\Users\Serg\Desktop\Advance Wars Clone
+video=1
 language=1
 languageName=
 frameSkip=2
 gbFrameSkip=0
-autoFrameSkip=0
-vsync=0
+autoFrameSkip=1
+vsync=1
 synchronize=1
 stretch=0
@@ -16 +16 @@
 fsWidth=0
 fsHeight=0
-fsColorDepth=0
+fsColorDepth=32
 renderMethod=1
 useBios=0
 skipBios=0
 soundEnable=783
-soundOff=0
+soundOff=1
 soundQuality=2
 soundEcho=0
@@ -27 +27 @@
 soundReverse=0
 soundVolume=0
-ddrawEmulationOnly=0
+ddrawEmulationOnly=1
 ddrawUseVideoMemory=0
 tripleBuffering=1
-d3dFilter=0
+d3dFilter=1
 glFilter=0
 glType=0
@@ -51 +51 @@
 flashSize=65536
 agbPrint=0
-rtcEnabled=0
+rtcEnabled=1
 autoHideMenu=0
 skinEnabled=0
@@ -57 +57 @@
 borderOn=0
 borderAutomatic=0
-emulatorType=1
+emulatorType=4
 colorOption=0
 priority=2
@@ -65 +65 @@
 gbPalette=FF7FB5568C310000FF7FB5568C310000FF7FB5568C310000FF7FB5568C310000FF7FB5568C310000FF7FB5568C310000A4
 rewindTimer=0
-recent0=C:\Complete\GAMEBOY ADVANCE COMPLETE (U) [!] ROMSET\Advance Wars (U) (V1.1) [!].zip
-recent1=
+recent0=C:\Users\Serg\Desktop\Advance Wars Clone\Advance Wars (U) (V1.1) [!].zip
+recent1=C:\Complete\GAMEBOY ADVANCE COMPLETE (U) [!] ROMSET\Advance Wars (U) (V1.1) [!].zip
 recent2=
 recent3=
@@ -137 +137 @@
 Motion_Up=72
 Motion_Down=80
+[Viewer]
+AccelEditor=2C0000000000000001000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF63040000360200000F06000016030000EA
+TileView=2C0000000000000001000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF49040000190200003A060000E4030000AC
+PaletteView=2C0000000000000001000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF49040000190200002B060000E40300009D
+MemoryView=2C0000000000000001000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF49040000190200008B060000550300006E
+DisassembleView=2C0000000000000001000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4904000019020000AC060000A2030000DC
+IOView=2C0000000000000001000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4904000019020000E3050000B503000025