summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-09-19 05:24:50 +0200
committerTreeki <treeki@gmail.com>2012-09-19 05:24:50 +0200
commita7fc34dfdfee0c899712e0209885e40b19305d7f (patch)
treed87c02fae0f59bd98fb383836da29739a0e07c17
parenta6e653e973d1b4ec402e5b7f34093849bbd60745 (diff)
downloadkamek-a7fc34dfdfee0c899712e0209885e40b19305d7f.tar.gz
kamek-a7fc34dfdfee0c899712e0209885e40b19305d7f.zip
couple of fixes
-rw-r--r--fileselect.yaml2
-rw-r--r--src/fileselect.S2
-rw-r--r--src/newer.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/fileselect.yaml b/fileselect.yaml
index a432a13..90c18f9 100644
--- a/fileselect.yaml
+++ b/fileselect.yaml
@@ -147,6 +147,6 @@ hooks:
- {name: DFNiceTitle, type: branch_insn, branch_type: bl, src_addr_pal: 0x8077D044, target_func: 'DFNiceTitle'}
- {name: DFNiceWorldName, type: branch_insn, branch_type: bl, src_addr_pal: 0x8077DA10, target_func: 'DFNiceWorldName'}
- - {name: FSDebugStates, type: add_func_pointer, src_addr_pal: 0x80943E38, target_func: 'FSDebugStates'}
+# - {name: FSDebugStates, type: add_func_pointer, src_addr_pal: 0x80943E38, target_func: 'FSDebugStates'}
diff --git a/src/fileselect.S b/src/fileselect.S
index 3145846..75f3130 100644
--- a/src/fileselect.S
+++ b/src/fileselect.S
@@ -86,7 +86,7 @@ DFNiceWorldName:
b gotName
invalidThing:
lis r4, InvalidWorld@h
- ori r4, InvalidWorld@l
+ ori r4, r4, InvalidWorld@l
gotName:
mr r3, r20
diff --git a/src/newer.cpp b/src/newer.cpp
index 3e08ded..6d672e2 100644
--- a/src/newer.cpp
+++ b/src/newer.cpp
@@ -66,7 +66,7 @@ const wchar_t *NewerWorldNames[] = {
};
// This is an array so it can be accessed from fileselect.S
-const int *NewerWorldCount[] = {
+int NewerWorldCount[] = {
18
};