Merge branch 'master' of https://github.com/doldecomp/pokerevo into split_nw4r_snd

2 files changed, 84 insertions, 4 deletions

diff --git a/asm/data.s b/asm/data.s
index 13ffc7e..ba0d092 100644
--- a/asm/data.s
+++ b/asm/data.s
@@ -198,21 +198,71 @@ lbl_8040601C:
 	.balign 4, 0
 	.global lbl_80406054
 lbl_80406054:
-	.incbin "baserom.dol", 0x402154, 0x166
+	.4byte lbl_8000C5C0, lbl_8000C5DC, lbl_8000C5F8, lbl_8000C614
+	.4byte lbl_8000C630, lbl_8000C64C, lbl_8000C67C, lbl_8000C698
+	.4byte lbl_8000C6C8, lbl_8000C6E4
+
+	.balign 4, 0
+	.global lbl_8040607C
+lbl_8040607C:
+	.asciz "[Jikkyo] SKIP BATTLE MSG [%d] : %cb_%03d(%d) (timing is bad, already turn-end phase.)\n"
+
+	.global lbl_804060D3
+lbl_804060D3:
+	.asciz "[Jikkyo] PLAY BATTLE MSG [%d] : %cb_%03d(%d)\n"
+
+	.global lbl_80406101
+lbl_80406101:
+	.asciz "[Jikkyo] SKIP BATTLE MSG (home button fade timing)\n"
+
+	.global lbl_80406135
+lbl_80406135:
+	.asciz "[Jikkyo] SKIP BATTLE MSG [%d] : %cb_%03d(%d) (timing is bad)\n"
+
+	.global lbl_80406173
+lbl_80406173:
+	.asciz "[Jikkyo] BATTLE MSG [%d] is not loaded. : %cb_%03d(%d)\n"
+
+	.global lbl_804061AB
+lbl_804061AB:
+	.asciz "StartJikkyoPre"
 
 	.global lbl_804061BA
 lbl_804061BA:
-	.incbin "baserom.dol", 0x4022BA, 0xFA
+	.asciz "[Jikkyo] Func : %s\n"
+
+	.global lbl_804061CE
+lbl_804061CE:
+	.asciz "## WARNING ## Input Heap : %d, Battle Heap : %d\n"
+
+	.global lbl_804061FF
+lbl_804061FF:
+	.asciz "[Jikkyo] INPUT HEAP  : [Used]%d(KByte) [Free]%d(KByte) [All]%d(KByte)\n"
+
+	.global lbl_80406246
+lbl_80406246:
+	.asciz "[Jikkyo] BATTLE HEAP : [Used]%d(KByte) [Free]%d(KByte) [All]%d(KByte)\n"
+
+	.global lbl_8040628D
+lbl_8040628D:
+	.asciz "StartJikkyo"
+
+	.global lbl_80406299
+lbl_80406299:
+	.asciz "## ERROR ## StartJikkyo()\n"
 
 	.global lbl_804062B4
 lbl_804062B4:
 	.incbin "baserom.dol", 0x4023B4, 0x5E
-.global lbl_80406312
+
+	.global lbl_80406312
 lbl_80406312:
 	.incbin "baserom.dol", 0x402412, 0x8C
-.global lbl_8040639E
+
+	.global lbl_8040639E
 lbl_8040639E:
 	.incbin "baserom.dol", 0x40249E, 0x196
+
 .global lbl_80406534
 lbl_80406534:
 	.incbin "baserom.dol", 0x402634, 0xF9
diff --git a/asm/text_1.s b/asm/text_1.s
index 216e578..2880b0f 100644
--- a/asm/text_1.s
+++ b/asm/text_1.s
@@ -6856,6 +6856,9 @@ func_8000C57C:
 /* 8000C5B4 00008214  7C 84 00 2E */	lwzx r4, r4, r0
 /* 8000C5B8 00008218  7C 89 03 A6 */	mtctr r4
 /* 8000C5BC 0000821C  4E 80 04 20 */	bctr
+
+.global lbl_8000C5C0
+lbl_8000C5C0:
 /* 8000C5C0 00008220  88 03 00 14 */	lbz r0, 0x14(r3)
 /* 8000C5C4 00008224  2C 00 00 00 */	cmpwi r0, 0
 /* 8000C5C8 00008228  40 82 00 0C */	bne lbl_8000C5D4
@@ -6864,6 +6867,9 @@ func_8000C57C:
 lbl_8000C5D4:
 /* 8000C5D4 00008234  38 A0 02 51 */	li r5, 0x251
 /* 8000C5D8 00008238  48 00 01 3C */	b lbl_8000C714
+
+.global lbl_8000C5DC
+lbl_8000C5DC:
 /* 8000C5DC 0000823C  A0 03 00 9A */	lhz r0, 0x9a(r3)
 /* 8000C5E0 00008240  28 00 00 01 */	cmplwi r0, 1
 /* 8000C5E4 00008244  40 82 00 0C */	bne lbl_8000C5F0
@@ -6872,6 +6878,9 @@ lbl_8000C5D4:
 lbl_8000C5F0:
 /* 8000C5F0 00008250  38 A0 02 52 */	li r5, 0x252
 /* 8000C5F4 00008254  48 00 01 20 */	b lbl_8000C714
+
+.global lbl_8000C5F8
+lbl_8000C5F8:
 /* 8000C5F8 00008258  A0 03 00 9A */	lhz r0, 0x9a(r3)
 /* 8000C5FC 0000825C  28 00 00 01 */	cmplwi r0, 1
 /* 8000C600 00008260  40 82 00 0C */	bne lbl_8000C60C
@@ -6880,6 +6889,9 @@ lbl_8000C5F0:
 lbl_8000C60C:
 /* 8000C60C 0000826C  38 A0 02 53 */	li r5, 0x253
 /* 8000C610 00008270  48 00 01 04 */	b lbl_8000C714
+
+.global lbl_8000C614
+lbl_8000C614:
 /* 8000C614 00008274  A0 03 00 9A */	lhz r0, 0x9a(r3)
 /* 8000C618 00008278  28 00 00 01 */	cmplwi r0, 1
 /* 8000C61C 0000827C  40 82 00 0C */	bne lbl_8000C628
@@ -6888,6 +6900,9 @@ lbl_8000C60C:
 lbl_8000C628:
 /* 8000C628 00008288  38 A0 02 54 */	li r5, 0x254
 /* 8000C62C 0000828C  48 00 00 E8 */	b lbl_8000C714
+
+.global lbl_8000C630
+lbl_8000C630:
 /* 8000C630 00008290  A0 03 00 9A */	lhz r0, 0x9a(r3)
 /* 8000C634 00008294  28 00 00 01 */	cmplwi r0, 1
 /* 8000C638 00008298  40 82 00 0C */	bne lbl_8000C644
@@ -6896,6 +6911,9 @@ lbl_8000C628:
 lbl_8000C644:
 /* 8000C644 000082A4  38 A0 02 55 */	li r5, 0x255
 /* 8000C648 000082A8  48 00 00 CC */	b lbl_8000C714
+
+.global lbl_8000C64C
+lbl_8000C64C:
 /* 8000C64C 000082AC  88 03 00 14 */	lbz r0, 0x14(r3)
 /* 8000C650 000082B0  28 00 00 06 */	cmplwi r0, 6
 /* 8000C654 000082B4  40 82 00 20 */	bne lbl_8000C674
@@ -6910,6 +6928,9 @@ lbl_8000C66C:
 lbl_8000C674:
 /* 8000C674 000082D4  38 A0 02 57 */	li r5, 0x257
 /* 8000C678 000082D8  48 00 00 9C */	b lbl_8000C714
+
+.global lbl_8000C67C
+lbl_8000C67C:
 /* 8000C67C 000082DC  A0 03 00 9A */	lhz r0, 0x9a(r3)
 /* 8000C680 000082E0  28 00 00 01 */	cmplwi r0, 1
 /* 8000C684 000082E4  40 82 00 0C */	bne lbl_8000C690
@@ -6918,6 +6939,9 @@ lbl_8000C674:
 lbl_8000C690:
 /* 8000C690 000082F0  38 A0 02 58 */	li r5, 0x258
 /* 8000C694 000082F4  48 00 00 80 */	b lbl_8000C714
+
+.global lbl_8000C698
+lbl_8000C698:
 /* 8000C698 000082F8  88 03 00 14 */	lbz r0, 0x14(r3)
 /* 8000C69C 000082FC  28 00 00 0A */	cmplwi r0, 0xa
 /* 8000C6A0 00008300  40 82 00 20 */	bne lbl_8000C6C0
@@ -6932,6 +6956,9 @@ lbl_8000C6B8:
 lbl_8000C6C0:
 /* 8000C6C0 00008320  38 A0 02 5A */	li r5, 0x25a
 /* 8000C6C4 00008324  48 00 00 50 */	b lbl_8000C714
+
+.global lbl_8000C6C8
+lbl_8000C6C8:
 /* 8000C6C8 00008328  A0 03 00 9A */	lhz r0, 0x9a(r3)
 /* 8000C6CC 0000832C  28 00 00 01 */	cmplwi r0, 1
 /* 8000C6D0 00008330  40 82 00 0C */	bne lbl_8000C6DC
@@ -6940,6 +6967,9 @@ lbl_8000C6C0:
 lbl_8000C6DC:
 /* 8000C6DC 0000833C  38 A0 02 5B */	li r5, 0x25b
 /* 8000C6E0 00008340  48 00 00 34 */	b lbl_8000C714
+
+.global lbl_8000C6E4
+lbl_8000C6E4:
 /* 8000C6E4 00008344  38 60 00 39 */	li r3, 0x39
 /* 8000C6E8 00008348  48 15 63 A9 */	bl func_80162A90
 /* 8000C6EC 0000834C  2C 03 00 00 */	cmpwi r3, 0