summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-10-21 20:41:12 +0200
committerTreeki <treeki@gmail.com>2012-10-21 20:41:12 +0200
commit1c3d3e04123e85d1117cf6607416c9e1077e2183 (patch)
tree6a1ac1852273e81c4e43aa53b7208bfb1fd0c4e8
parent82047462d5ba4d785783ce6d9d5934e31e2175a7 (diff)
downloadkamek-1c3d3e04123e85d1117cf6607416c9e1077e2183.tar.gz
kamek-1c3d3e04123e85d1117cf6607416c9e1077e2183.zip
changed sun and moon and crow Z order
-rw-r--r--bugfixes.yaml2
-rwxr-xr-xsrc/mrsun.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/bugfixes.yaml b/bugfixes.yaml
index 9dc847c..af1ea6e 100644
--- a/bugfixes.yaml
+++ b/bugfixes.yaml
@@ -225,3 +225,5 @@ hooks:
- {name: AlwaysDrawPictureFontWhite, type: branch_insn, branch_type: b, src_addr_pal: 0x800E596C, target_func: 'TextWriterCrap'}
- {name: DebugSCM, type: branch_insn, branch_type: b, src_addr_pal: 0x8006A6C4, target_func: 'EndSCM'}
+ - {name: FrontCrow, type: patch, addr_pal: 0x80ACF6A0, data: '45ABE000'} # 5500.0f
+
diff --git a/src/mrsun.cpp b/src/mrsun.cpp
index b643128..35d72a4 100755
--- a/src/mrsun.cpp
+++ b/src/mrsun.cpp
@@ -226,7 +226,10 @@ int daMrSun_c::onCreate() {
this->sunDying = 0;
this->killFlag = 0;
- this->pos.z = 5500.00;
+ if (this->settings == 1)
+ this->pos.z = 6000.0f; // moon
+ else
+ this->pos.z = 5750.0f; // sun
char eventNum = (this->settings >> 16) & 0xFF;