merge daycare with master

2017-11-15 17:18:05 +01:00
parent 0310be3007 055a419830
commit 1e79d53d2f
2818 changed files with 151329 additions and 5498 deletions
@@ -379,12 +379,12 @@ sub_816B148: @ 816B148
 	ldrb r0, [r0, 0x8]
 	cmp r0, 0
 	bne _0816B174
-	ldr r0, =gUnknown_081F863F
+	ldr r0, =LittlerootTown_BrendansHouse_2F_EventScript_1F863F
 	bl ScriptContext1_SetupScript
 	b _0816B184
 	.pool
 _0816B174:
-	ldr r0, =gUnknown_081F958F
+	ldr r0, =LittlerootTown_MaysHouse_2F_EventScript_1F958F
 	bl ScriptContext1_SetupScript
 	b _0816B184
 	.pool