Merge branch 'staging'

Properties/AssemblyInfo.cs

@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.5")]
-[assembly: AssemblyFileVersion("0.5.5")]
+[assembly: AssemblyVersion("0.5.7")]
+[assembly: AssemblyFileVersion("0.5.7")]
 
 namespace MinishRandomizer.Properties
 {

README.md

@@ -5,7 +5,7 @@
 
 This program creates a randomized version of The Legend of Zelda: The Minish Cap.
 
-Current version: `0.5.6a`
+Current version: `0.5.7a`
 
 ### Logic
 The following things are randomized:

Resources/Patches/ROM Buildfile.event

@@ -154,6 +154,7 @@ WORD 0x800D980 0x2002EA4 0x02 //Ocarina - check for a new flag for the ocarina b
 	//WORD 0x8014014 0x2002B32 0xFF //Sanctuary - yet more stone tablet
 WORD 0x8012F9C 0x2002EA4 0x08 //Rem - check a custom flag instead of boots
 WORD 0x8009FC4 0x2002EA5 0x01 //Belari - check a custom flag instead of bombs
+WORD 0x8012310 0x2002B32 0x01 //Percy's house - don't check for boots
 WORD 0 0 0 //terminator
 
 //ice blocks have a question mark inside

Resources/Patches/asm/pedestalItemsNoEquip.s

@@ -1,6 +1,13 @@
 .thumb
 push	{r4-r5,lr}
 push	{r0-r1}
+
+@check if room is right
+ldr	r0,=#0x3000BF0
+ldrb	r0,[r0,#4]
+cmp	r0,#0x78
+bne	vanilla
+
 @check if first flag is set
 ldr	r0,=#0x2002EA4
 ldr	r1,=#31
@@ -14,7 +21,7 @@ mov	r1,#31
 ldr	r3,=#0x801D5F4	@vanilla flag set routine
 mov	lr,r3
 .short	0xF800
-b	checksword
+b	end
 
 @check if second flag is set
 checksecond:
@@ -30,7 +37,7 @@ mov	r1,#32
 ldr	r3,=#0x801D5F4	@vanilla flag set routine
 mov	lr,r3
 .short	0xF800
-b	checksword
+b	end
 
 @check if third flag is set
 checkthird:
@@ -40,18 +47,20 @@ ldr	r3,=#0x801D5E0	@vanilla flag check routine
 mov	lr,r3
 .short	0xF800
 cmp	r0,#0
-bne	checksword
+bne	end
 ldr	r0,=#0x2002EA4
 mov	r1,#33
 ldr	r3,=#0x801D5F4	@vanilla flag set routine
 mov	lr,r3
 .short	0xF800
 
-checksword:
-ldr	r0,=#0x3000BF0
-ldrb	r0,[r0,#4]
-cmp	r0,#0x78
-beq	end
+end:
+ldr	r0,=#0x2002AF4
+mov	r1,#0
+strb	r1,[r0]
+strb	r1,[r0,#1]
+pop	{r0-r1}
+pop	{r4-r5,pc}
 
 vanilla:
 pop	{r0-r1}
@@ -60,11 +69,3 @@ ldr	r4,=#0xFFFF
 lsr	r5,r0,#0x10
 ldr	r3,=#0x807EC71
 bx	r3
-
-end:
-ldr	r0,=#0x2002AF4
-mov	r1,#0
-strb	r1,[r0]
-strb	r1,[r0,#1]
-pop	{r0-r1}
-pop	{r4-r5,pc}

Resources/Patches/logicfixes/installer.event

@@ -353,8 +353,8 @@ libraryTrapdoor:
 //carpenters don't need cane to spawn
 PUSH; ORG $4E53A; SHORT 0; POP
 
-//set cucco minigame whenever you win, not only when you win a heart
-PUSH; ORG $A0C48; SHORT 0x2800 0xD10F; POP
+//set cucco minigame flag whenever you win, not only when you win a heart
+PUSH; ORG $A0C36; SHORT 0xE019; POP
 
 //tingle checks for tingle trophy instead of all fusions
 PUSH; ORG $64A1C; jumpToHack(tingleCheck); POP

Resources/Patches/save/credits/credits.event

@@ -448,7 +448,7 @@ BYTE 2 0x01; String("Translators"); BYTE 2 0 0x0A
 String("Deoxis and Legrandgrand (French)"); BYTE 0x0A
 String("Martin and ToadsWoot (German)"); BYTE 0x0A
 String("Leonarth (Spanish)"); BYTE 0x0A
-String("Please someone do this (Italian)"); BYTE 0
+String("Mikonai (Italian)"); BYTE 0
 
 ALIGN 4
 debugFontCredits: