Move the movie position array from 0x800f6000 to 0x800f8000, in order not to get...

diff --git a/patches/movie b/patches/movie
index d4822a152c31e2d04c7876080494a72ad012b839..a5629d2633f24254fe96c7edc0c4691accb1cc54 100644 (file)
--- a/patches/movie
+++ b/patches/movie
@@ -2,33 +2,36 @@
 # By default, there's room for 354 CD-ROM movies, needing 12 bytes each
 # (CD-ROM extent, size, filename checksum). We want to extend this,
 # so move to somewhere where we believe there's more room.
+#
+# 0x800f0000 starts an array that contains 40 bytes per arrow (or so it's said),
+# so we need to not put this too early.
 
-patch "move movie_cdrom_positions array to 0x800f6000"
+patch "move movie_cdrom_positions array to 0x800f8000"
 
 expect "80073c48:      1b80023c        lui     v0,0x801b"
 expect "80073c4c:      f8fb5524        addiu   s5,v0,-1032"
-apply  "80073c48:                      lui     v0,0x800f"
-apply  "80073c4c:                      addiu   s5,v0,0x6000"
+apply  "80073c48:                      lui     v0,0x8010"
+apply  "80073c4c:                      addiu   s5,v0,-0x8000"
 
 expect "80073e28:      1b80033c        lui     v1,0x801b"
 expect "80073e2c:      f8fb6324        addiu   v1,v1,-1032"
-apply  "80073e28:                      lui     v1,0x800f"
-apply  "80073e2c:                      addiu   v1,v1,0x6000"
+apply  "80073e28:                      lui     v1,0x8010"
+apply  "80073e2c:                      addiu   v1,v1,-0x8000"
 
 expect "80073eec:      1b80023c        lui     v0,0x801b"
 expect "80073ef4:      f8fb4424        addiu   a0,v0,-1032"
-apply  "80073eec:                      lui     v0,0x800f"
-apply  "80073ef4:                      addiu   a0,v0,0x6000"
+apply  "80073eec:                      lui     v0,0x8010"
+apply  "80073ef4:                      addiu   a0,v0,-0x8000"
 
 expect "80073f34:      1b80053c        lui     a1,0x801b"    # One instruction in-between.
 expect "80073f3c:      f8fba524        addiu   a1,a1,-1032"
-apply  "80073f34:                      lui     a1,0x800f"
-apply  "80073f3c:                      addiu   a1,a1,0x6000"
+apply  "80073f34:                      lui     a1,0x8010"
+apply  "80073f3c:                      addiu   a1,a1,-0x8000"
 
 expect "800746c4:      1b80023c        lui     v0,0x801b"    # One instruction in-between.
 expect "800746c8:      f8fb4224        addiu   v0,v0,-1032"
-apply  "800746c4:                      lui     v0,0x800f"
-apply  "800746c8:                      addiu   v0,v0,0x6000"
+apply  "800746c4:                      lui     v0,0x8010"
+apply  "800746c8:                      addiu   v0,v0,-0x8000"
 
 # There's a list of pointers to movie filenames that's used by
 # find_all_cdrom_sbs_files() (0x80073c04). We need to move it