summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2013-06-01 16:49:43 -0500
committerColin Noga <Tempus@chronometry.ca>2013-06-01 16:49:43 -0500
commitbf744bbb77f1d7a6a2346cbee9dd135d77a26bbb (patch)
tree036a12b2ebb85fdae103a56050766dbf5c42283d /src
parentfb2694aec8d0744ad3e407eb67b62e56c3b8cdd2 (diff)
parent59224f4e86b57638965422808878332fb775c00a (diff)
downloadkamek-bf744bbb77f1d7a6a2346cbee9dd135d77a26bbb.tar.gz
kamek-bf744bbb77f1d7a6a2346cbee9dd135d77a26bbb.zip
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'src')
-rw-r--r--src/randomcrap.S24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/randomcrap.S b/src/randomcrap.S
index b2d34ce..18dffa5 100644
--- a/src/randomcrap.S
+++ b/src/randomcrap.S
@@ -1,5 +1,29 @@
.text
+.global ThwompNewAutoDestruction
+ThwompNewAutoDestruction:
+ lfs f1, 0xB0(r31)
+ lis r3, ThwompDestroyAt@h
+ ori r3, r3, ThwompDestroyAt@l
+ lfs f2, 0(r3)
+ fcmpo cr0, f1, f2
+ bgt dontDestroyMe
+ mr r3, r31
+.extern Delete__13dStageActor_cFUc
+ lbz r4, 0x390(r3)
+ bl Delete__13dStageActor_cFUc
+dontDestroyMe:
+ li r3, 1
+ lwz r31, 0xC(r1)
+ lwz r0, 0x14(r1)
+ mtlr r0
+ addi r1, r1, 0x10
+ blr
+
+.data
+.align 4
+ThwompDestroyAt: .float -7533.0
+.text
.global TitleScreenFucker
.extern RESTART_CRSIN_LevelStartStruct
.extern SaveFileBuffer