summaryrefslogtreecommitdiff
path: root/kamek_pal.x
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-08-30 13:26:29 -0500
committerColin Noga <Tempus@chronometry.ca>2012-08-30 13:26:29 -0500
commitd2ac274c00a448cefa4c82c079ba0a75f0b8fbba (patch)
tree616bdb246ffda022b4099dda55283cf61e603fe1 /kamek_pal.x
parent463e256e6a239facb902da4566502a14684e1b94 (diff)
parent2b5bc0f0397e50b7cad585196e403c99d27b6207 (diff)
downloadkamek-d2ac274c00a448cefa4c82c079ba0a75f0b8fbba.tar.gz
kamek-d2ac274c00a448cefa4c82c079ba0a75f0b8fbba.zip
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
-rw-r--r--kamek_pal.x2
1 files changed, 1 insertions, 1 deletions
diff --git a/kamek_pal.x b/kamek_pal.x
index c1194c9..0afeab8 100644
--- a/kamek_pal.x
+++ b/kamek_pal.x
@@ -365,7 +365,7 @@ SECTIONS {
blockUpdate__15daEnBlockMain_cFv = 0x800217B0;
blockResult__15daEnBlockMain_cFv = 0x800212C0;
PhysicsCallback1__15daEnBlockMain_c = 0x80021180;
- g = 0x80021170;
+ PhysicsCallback2__15daEnBlockMain_c = 0x80021170;
PhysicsCallback3__15daEnBlockMain_c = 0x800211A0;
OPhysicsCallback1__15daEnBlockMain_c = 0x80020BF0;
OPhysicsCallback2__15daEnBlockMain_c = 0x80020E70;