summaryrefslogtreecommitdiff
path: root/kamek_pal.x
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-03-29 11:11:11 -0500
committerColin Noga <Tempus@chronometry.ca>2012-03-29 11:11:11 -0500
commit2e5153002bccc3722dbacaa62b729493d2c2bf89 (patch)
tree0d235a689a0d7c831293dff206833f2d8efb277a /kamek_pal.x
parent128ab59a90b26c54e18f8823adc26d37115fb5f5 (diff)
parent7bbab722a388bc63ec195a48c22c7060e3fab999 (diff)
downloadkamek-2e5153002bccc3722dbacaa62b729493d2c2bf89.tar.gz
kamek-2e5153002bccc3722dbacaa62b729493d2c2bf89.zip
merging changes to latest pull
Diffstat (limited to '')
-rw-r--r--kamek_pal.x14
1 files changed, 8 insertions, 6 deletions
diff --git a/kamek_pal.x b/kamek_pal.x
index 10e75c2..0079576 100644
--- a/kamek_pal.x
+++ b/kamek_pal.x
@@ -1,9 +1,3 @@
-OUTPUT_FORMAT ("binary")
-
-/*MEMORY {
- loader_section : ORIGIN = 0x80001800, LENGTH = 0x1800
-}*/
-
SECTIONS {
/* Scrolling is annoying, clown car goes here! */
@@ -51,6 +45,12 @@ SECTIONS {
CosFIdx__Q24nw4r4mathFf = 0x80237D80;
SinCosFIdx__Q24nw4r4mathFPfPff = 0x80237DE0;
+ archiveHeap__5mHeap = 0x8042A72C;
+ commandHeap__5mHeap = 0x8042A730;
+ dylinkHeap__5mHeap = 0x8042A734;
+ assertHeap__5mHeap = 0x8042A738;
+ gameHeaps__5mHeap = 0x80377F48;
+
init__18StandOnTopColliderFP13dStageActor_cfffffsUcP7Point2d = 0x800DB270;
__ct__18StandOnTopColliderFv = 0x800DB220;
__dt__18StandOnTopColliderFv = 0x80044400;
@@ -1490,6 +1490,8 @@ SECTIONS {
SpawnThwompEffects = 0x809f6660;
+ HurtMarioBecauseOfBeingSquashed = 0x80056370;
+
.text : {
FILL (0)