dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into render_text

Browse Source
This commit is contained in:
Diegoisawesome
2018-11-06 11:40:17 -06:00
parent 43a8534fce ccc5d27fcb
commit 9afe7a896e
86 changed files with 3821 additions and 9029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_1.s
+1 -1
View File
@@ -2163,7 +2163,7 @@ sub_8196D74: @ 8196D74
ldr r0, =gSaveBlock2Ptr ldr r0, =gSaveBlock2Ptr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xA adds r0, 0xA
bl ReadUnalignedWord bl GetTrainerId
adds r6, r0, 0 adds r6, r0, 0
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
ands r6, r0 ands r6, r0
asm/battle_frontier_2.s
+3 -6731
View File
File diff suppressed because it is too large Load Diff
asm/party_menu.s
+1 -1
View File
@@ -15615,7 +15615,7 @@ _081B8618:
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
ldr r3, =gUnknown_08611C9A ldr r3, =gFrontierBannedSpecies
lsls r1, r6, 1 lsls r1, r6, 1
adds r0, r1, r3 adds r0, r1, r3
ldrh r0, [r0] ldrh r0, [r0]
asm/rom_8011DC0.s
+1 -1
View File
@@ -11490,7 +11490,7 @@ _0801B628:
ldr r1, [r0] ldr r1, [r0]
adds r1, 0xA adds r1, 0xA
adds r0, r4, 0 adds r0, r4, 0
bl CopyUnalignedWord bl CopyTrainerId
mov r2, r8 mov r2, r8
ldr r1, [r2] ldr r1, [r2]
adds r0, r6, 0 adds r0, r6, 0
data/battle_frontier_2.s
-114
View File
@@ -6,120 +6,6 @@
.section .rodata .section .rodata
.align 2
gUnknown_08611550:: @ 8611550
.byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00
.align 2
gUnknown_0861156C:: @ 861156C
.byte 0x41, 0x00, 0xb3, 0x00, 0x18, 0x0f, 0x6a, 0x00, 0x98, 0x98, 0x64, 0x00
.align 2
gUnknown_08611578:: @ 8611578
.2byte 0x0009, 0x0007, 0x0008, 0x0032, 0x00f4, 0x008d, 0x0118, 0x9864, 0x0098, 0x0664, 0x007e, 0x015b, 0x00d8, 0x002e, 0x008f, 0x00b7
.2byte 0x0318, 0x9898, 0x0000, 0x646a, 0x0022, 0x00bb, 0x0119, 0x00f7, 0x00f3, 0x008d, 0x0f1f, 0x009e, 0x64fc, 0x0000, 0x0055, 0x015b
.2byte 0x0073, 0x009c, 0x0198, 0x00b3, 0x0f1f, 0x00fc, 0x06fc, 0x0000, 0x005e, 0x015b, 0x0069, 0x0151, 0x008f, 0x0086, 0x031f, 0xfcfc
.2byte 0x0000, 0x0006, 0x00ae, 0x00d8, 0x009c, 0x00f7, 0x011d, 0x00c4, 0x0214, 0x9898, 0x006a, 0x0064, 0x0039, 0x0059, 0x003a, 0x0044
.2byte 0x018d, 0x008d, 0x0314, 0x9898, 0x646a, 0x0000, 0x0059, 0x0118, 0x0151, 0x014c, 0x0006, 0x00b4, 0x1114, 0x9864, 0x986a, 0x0000
.2byte 0x013b, 0x009d, 0x014c, 0x0059, 0x011d, 0x00c8, 0x021f, 0xfcfc, 0x0006, 0x0000, 0x0039, 0x0059, 0x003a, 0x00f3, 0x0190, 0x00b7
.2byte 0x021f, 0xfcfc, 0x0006, 0x0000, 0x005e, 0x0135, 0x0059, 0x00b6, 0x0197, 0x0086, 0x0f1f, 0x00fc, 0x06fc, 0x0000, 0x0055, 0x005e
.2byte 0x015b, 0x009c, 0x00a9, 0x00b3, 0x0310, 0x0098, 0x9800, 0x6a64, 0x006d, 0x0068, 0x005c, 0x0013, 0x016e, 0x00c6, 0x0010, 0x9898
.2byte 0x6a00, 0x0064, 0x0059, 0x00cf, 0x00f7, 0x0118, 0x0083, 0x00b7, 0x1110, 0x0000, 0x00fc, 0x986a, 0x003a, 0x0020, 0x006d, 0x00b6
.2byte 0x003b, 0x00b4, 0x0b1f, 0xfc06, 0x00fc, 0x0000, 0x013b, 0x00f5, 0x002e, 0x00b6, 0x016e, 0x00c6, 0x001f, 0xfc06, 0xfc00, 0x0000
.2byte 0x003f, 0x0059, 0x00f7, 0x0119, 0x00f5, 0x00bb, 0x0b1f, 0x00fc, 0x06fc, 0x0000, 0x003b, 0x0039, 0x002c, 0x015b, 0x00d6, 0x00aa
.2byte 0x0d14, 0x986a, 0x9800, 0x6400, 0x00e0, 0x013d, 0x00cb, 0x00b3, 0x00c5, 0x00c8, 0x1414, 0x0098, 0x0064, 0x6a98, 0x0022, 0x006d
.2byte 0x005e, 0x00b9, 0x012f, 0x00b3, 0x0314, 0xfc00, 0xfc06, 0x0000, 0x00f7, 0x00d8, 0x006d, 0x014c, 0x00c5, 0x0086, 0x141f, 0x00fc
.2byte 0x0000, 0x06fc, 0x0026, 0x006d, 0x009c, 0x005e, 0x005e, 0x00c8, 0x0f1f, 0x00fc, 0x00fc, 0x0006, 0x005e, 0x005f, 0x008a, 0x00c2
.2byte 0x0133, 0x008d, 0x0d1f, 0xfc06, 0xfc00, 0x0000, 0x0093, 0x0108, 0x00ca, 0x001d, 0x018f, 0x008e, 0x021f, 0xfc00, 0x00fc, 0x0006
.2byte 0x0071, 0x005e, 0x0073, 0x00e8, 0x00e3, 0x008e, 0x081f, 0x00fc, 0x0000, 0xfc06, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x008e
.2byte 0x031f, 0xfc00, 0x0000, 0x06fc, 0x0055, 0x00b6, 0x004c, 0x0151, 0x018f, 0x008e, 0x021f, 0xfc00, 0x00fc, 0x0006, 0x0071, 0x005e
.2byte 0x0073, 0x00e8, 0x00e3, 0x008e, 0x081f, 0x00fc, 0x0000, 0xfc06, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x008e, 0x031f, 0xfc00
.2byte 0x0000, 0x06fc, 0x0055, 0x00b6, 0x004c, 0x0151, 0x017b, 0x00b7, 0x0210, 0x00fc, 0x00fc, 0x0006, 0x00cf, 0x00f2, 0x0131, 0x00ca
.2byte 0x00d5, 0x0086, 0x0510, 0x00fc, 0x0000, 0xfc6a, 0x005c, 0x00c9, 0x00b6, 0x009c, 0x0149, 0x00c8, 0x0f10, 0x0098, 0x0064, 0x6a98
.2byte 0x003a, 0x00f3, 0x0039, 0x0069, 0x017b, 0x00c4, 0x051f, 0x00fc, 0x0000, 0x06fc, 0x00cf, 0x00f2, 0x00bc, 0x00ca, 0x00d0, 0x00b3
.2byte 0x021f, 0x00fc, 0x0000, 0xfc06, 0x0059, 0x009d, 0x0099, 0x0067, 0x0082, 0x0086, 0x031f, 0x06fc, 0x0000, 0xfc00, 0x015d, 0x00d8
.2byte 0x002e, 0x009c, 0x0191, 0x00b7, 0x0310, 0x9898, 0x0000, 0x646a, 0x0099, 0x0114, 0x0059, 0x00f6, 0x0193, 0x00c8, 0x0310, 0x9898
.2byte 0x0000, 0xc806, 0x0059, 0x00e8, 0x005c, 0x014e, 0x0192, 0x0086, 0x0f10, 0x006a, 0x0098, 0x9864, 0x003a, 0x0085, 0x0057, 0x009c
.2byte 0x0090, 0x00c6, 0x101f, 0x0006, 0xfcfc, 0x0000, 0x003b, 0x0160, 0x014c, 0x0073, 0x0091, 0x008d, 0x101f, 0x0006, 0xfcfc, 0x0000
.2byte 0x0057, 0x00c5, 0x0041, 0x0071, 0x0092, 0x00b3, 0x101f, 0x0006, 0xfcfc, 0x0000, 0x007e, 0x003f, 0x014c, 0x00db
gUnknown_086118B4:: @ 86118B4
.byte 0x01, 0x02, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x03, 0x04, 0x04
.byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x02, 0x02, 0x00, 0x00
.byte 0x05, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x05, 0x06, 0x06, 0x02, 0x02, 0x00, 0x00, 0x05, 0x06, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x05, 0x06, 0x07, 0x07, 0x03, 0x03, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x05, 0x06, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x07, 0x08, 0x08, 0x03, 0x03, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x06, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x08, 0x09, 0x09, 0x04, 0x04, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0x08, 0x00, 0x00, 0x00, 0x08, 0x09, 0x0a, 0x0a, 0x04, 0x04, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0x09, 0x0a, 0x0b, 0x0b, 0x05, 0x05, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0c
.byte 0x05, 0x05, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x0d, 0x0d, 0x06, 0x06, 0x00, 0x00
.byte 0x09, 0x0a, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x0e, 0x0e, 0x06, 0x06, 0x00, 0x00, 0x09, 0x0a, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
.byte 0x09, 0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x0a, 0x00, 0x00
.byte 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00
.byte 0x0c, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00
.byte 0x0f, 0x0f, 0x0f, 0x0f, 0x09, 0x09, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f
.byte 0x09, 0x09, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x00, 0x00
.byte 0x0d, 0x0e, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00
.byte 0x0e, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0b, 0x0b, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00
.byte 0x0d, 0x0e, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0b, 0x0b, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00
.byte 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00
.byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00
.byte 0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 0x0d, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f
.byte 0x0d, 0x0d, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x00, 0x00
.byte 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00
.byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00
.byte 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00
.byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00
.align 2
gUnknown_08611BFC:: @ 8611BFC
.2byte 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080, 0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000
.align 2
gUnknown_08611C18:: @ 8611C18
.4byte sub_81A17A0
.4byte sub_81A1830
.4byte sub_81A1968
.4byte sub_81A1AD4
.4byte sub_81A1B1C
.4byte sub_81A1B28
.4byte sub_81A1B38
.4byte sub_81A1B98
.4byte sub_81A31FC
.4byte sub_81A35EC
.4byte sub_81A3B00
.4byte sub_81A3B64
.4byte sub_81A3D30
.4byte sub_81A3D58
.4byte sub_81A3DA0
.4byte sub_81A3FD4
.4byte sub_81A4224
.4byte sub_81A4230
.4byte sub_81A43A8
.4byte sub_81A4410
.4byte sub_81A443C
.4byte sub_81A447C
.4byte sub_81A457C
.align 2
gUnknown_08611C74:: @ 8611C74
window_template 0x00, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001
.align 2
gUnknown_08611C7C:: @ 8611C7C
window_template 0x00, 0x02, 0x02, 0x1a, 0x0f, 0x0f, 0x0001
.align 2
gUnknown_08611C84:: @ 8611C84
window_template 0x00, 0x02, 0x01, 0x1a, 0x11, 0x0f, 0x0001
gUnknown_08611C8C:: @ 8611C8C
.byte 0x46, 0x01, 0x47, 0x00, 0x49, 0x00, 0x48, 0x01, 0x4a, 0x00, 0x4b, 0x01, 0xea, 0x00
gUnknown_08611C9A:: @ 8611C9A
.2byte 0x0097, 0x0096, 0x00fa, 0x00f9, 0x00fb, 0x0194, 0x0195, 0x0196, 0x0199, 0x019a, 0xffff
.align 2 .align 2
gUnknown_08611CB0:: @ 8611CB0 gUnknown_08611CB0:: @ 8611CB0
.4byte gText_BattleTower2 .4byte gText_BattleTower2
data/event_scripts.s
+10 -10
View File
@@ -10302,12 +10302,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
special sub_81A703C special sub_81A703C
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A703C special sub_81A703C
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
@@ -10383,12 +10383,12 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
special sub_81A703C special sub_81A703C
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
special sub_81A703C special sub_81A703C
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@@ -10447,12 +10447,12 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
special sub_81A703C special sub_81A703C
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
special sub_81A703C special sub_81A703C
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@@ -10479,7 +10479,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
waitstate waitstate
end end
@@ -10489,7 +10489,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E
setorcopyvar VAR_0x8006, VAR_RESULT setorcopyvar VAR_0x8006, VAR_RESULT
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@@ -10503,7 +10503,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271
setvar VAR_0x8004, 21 setvar VAR_0x8004, 21
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A
@@ -11665,7 +11665,7 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
special sp194_trainer_tower special sp194_trainer_tower
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 5 setvar VAR_0x8005, 5
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq TrainerHill_1F_EventScript_2C83C9 goto_eq TrainerHill_1F_EventScript_2C83C9
compare VAR_RESULT, 3 compare VAR_RESULT, 3
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+22 -22
View File
@@ -11,7 +11,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
special sub_81A1780 special CallFrontierUtilFunc
call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE
end end
@@ -42,7 +42,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
@@ -51,7 +51,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
@@ -112,7 +112,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
waitstate waitstate
@@ -120,12 +120,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7
@@ -140,20 +140,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870
compare VAR_RESULT, 2 compare VAR_RESULT, 2
@@ -227,7 +227,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
waitstate waitstate
@@ -271,7 +271,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC
@@ -332,14 +332,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4
closemessage closemessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4
@@ -358,7 +358,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
@@ -369,21 +369,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4
goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4
closemessage closemessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4
@@ -402,7 +402,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
@@ -413,7 +413,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4
goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
@@ -429,17 +429,17 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_ARENA setvar VAR_0x8004, SPECIAL_BATTLE_ARENA
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special DoSpecialTrainerBattle special DoSpecialTrainerBattle
waitstate waitstate
setvar VAR_0x8004, 18 setvar VAR_0x8004, 18
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 21 setvar VAR_0x8004, 21
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+15 -15
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
@@ -40,7 +40,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
@@ -48,7 +48,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF
lockall lockall
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4 msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4
@@ -60,7 +60,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0
BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8
msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4 msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9 msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9
message BattleFrontier_BattleArenaLobby_Text_256931 message BattleFrontier_BattleArenaLobby_Text_256931
waitmessage waitmessage
@@ -88,7 +88,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B
BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
@@ -125,7 +125,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto BattleFrontier_BattleArenaLobby_EventScript_255F54 goto BattleFrontier_BattleArenaLobby_EventScript_255F54
@@ -155,13 +155,13 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4 msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattleArenaLobby_EventScript_23F2B7 call BattleFrontier_BattleArenaLobby_EventScript_23F2B7
@@ -181,7 +181,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A5238 special sub_81A5238
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
@@ -191,11 +191,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -208,12 +208,12 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4 msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4
closemessage closemessage
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@@ -244,7 +244,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleArenaLobby_EventScript_255FFB goto BattleFrontier_BattleArenaLobby_EventScript_255FFB
BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8 BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8
@@ -346,7 +346,7 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092
lockall lockall
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+20 -20
View File
@@ -10,7 +10,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
@@ -137,14 +137,14 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
@ goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5 @ goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5
BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
setvar VAR_0x8004, 20 setvar VAR_0x8004, 20
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_81A1780 special CallFrontierUtilFunc
message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1 message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1
waitmessage waitmessage
return return
@@ -152,7 +152,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5
setvar VAR_0x8004, 20 setvar VAR_0x8004, 20
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81A1780 special CallFrontierUtilFunc
message BattleFrontier_BattleDomeBattleRoom_Text_24CB34 message BattleFrontier_BattleDomeBattleRoom_Text_24CB34
waitmessage waitmessage
return return
@@ -179,12 +179,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
@@ -196,7 +196,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96 case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4
@@ -213,7 +213,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3
@@ -379,7 +379,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6
BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB
@@ -428,13 +428,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4
@@ -448,7 +448,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
closemessage closemessage
@@ -460,20 +460,20 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4
@@ -487,7 +487,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
closemessage closemessage
@@ -499,7 +499,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -527,7 +527,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_DOME setvar VAR_0x8004, SPECIAL_BATTLE_DOME
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -554,11 +554,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 3 compare VAR_RESULT, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
copyvar VAR_TEMP_E, VAR_RESULT copyvar VAR_TEMP_E, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+18 -18
View File
@@ -29,7 +29,7 @@ BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
@@ -51,7 +51,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
@@ -60,7 +60,7 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
call BattleFrontier_BattleDomeLobby_EventScript_241EBA call BattleFrontier_BattleDomeLobby_EventScript_241EBA
lockall lockall
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4 msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4
@@ -72,16 +72,16 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1
BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4 msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9 msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9
message BattleFrontier_BattleDomeLobby_Text_24A5D6 message BattleFrontier_BattleDomeLobby_Text_24A5D6
waitmessage waitmessage
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
@@ -106,9 +106,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
@@ -160,7 +160,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto BattleFrontier_BattleDomeLobby_EventScript_249BC2 goto BattleFrontier_BattleDomeLobby_EventScript_249BC2
@@ -208,13 +208,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4 msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattleDomeLobby_EventScript_23F2B7 call BattleFrontier_BattleDomeLobby_EventScript_23F2B7
@@ -234,17 +234,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special CallBattleDomeFunction special CallBattleDomeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -259,7 +259,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special CallBattleDomeFunction special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4
@@ -295,7 +295,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleDomeLobby_EventScript_249C64 goto BattleFrontier_BattleDomeLobby_EventScript_249C64
BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61 BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61
@@ -413,7 +413,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
@@ -424,7 +424,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+8 -8
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
waitmovement 0 waitmovement 0
@@ -100,7 +100,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
@@ -122,7 +122,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449 case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452 case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452
@@ -157,7 +157,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
special sub_80F9490 special sub_80F9490
waitstate waitstate
setvar VAR_0x8004, 21 setvar VAR_0x8004, 21
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
@@ -187,7 +187,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540 case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540
@@ -209,7 +209,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
@@ -246,7 +246,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
@@ -260,7 +260,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634 case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+17 -17
View File
@@ -6,14 +6,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
special sub_81A1780 special CallFrontierUtilFunc
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3
@@ -88,7 +88,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -102,7 +102,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
@ goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190 @ goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190
@@ -124,12 +124,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
@@ -140,7 +140,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
@@ -150,13 +150,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4
@@ -167,7 +167,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4
@@ -179,20 +179,20 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4
@@ -203,7 +203,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4
@@ -215,7 +215,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
@@ -224,7 +224,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -255,7 +255,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
special sub_81A5E74 special sub_81A5E74
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
end end
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+13 -13
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
@@ -46,7 +46,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
@@ -54,7 +54,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B
lockall lockall
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4 msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4
@@ -68,12 +68,12 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD
BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4 msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9 msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9
message BattleFrontier_BattleFactoryLobby_Text_259323 message BattleFrontier_BattleFactoryLobby_Text_259323
waitmessage waitmessage
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -88,7 +88,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
message BattleFrontier_BattleFactoryLobby_Text_258CC7 message BattleFrontier_BattleFactoryLobby_Text_258CC7
waitmessage waitmessage
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
@@ -134,7 +134,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
setvar VAR_0x8006, 2 setvar VAR_0x8006, 2
goto BattleFrontier_BattleFactoryLobby_EventScript_25871A goto BattleFrontier_BattleFactoryLobby_EventScript_25871A
@@ -183,7 +183,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5 msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A
@@ -197,7 +197,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
@@ -205,7 +205,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
closemessage closemessage
delay 2 delay 2
call BattleFrontier_BattleFactoryLobby_EventScript_27134F call BattleFrontier_BattleFactoryLobby_EventScript_27134F
@@ -249,7 +249,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleFactoryLobby_EventScript_25879D goto BattleFrontier_BattleFactoryLobby_EventScript_25879D
BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A
@@ -303,7 +303,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
@@ -314,7 +314,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+5 -5
View File
@@ -74,7 +74,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
playse 263 playse 263
@@ -95,14 +95,14 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
compare VAR_RESULT, 2 compare VAR_RESULT, 2
@@ -232,7 +232,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
@@ -243,7 +243,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
special CalculatePlayerPartyCount special CalculatePlayerPartyCount
goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+22 -22
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
special sub_81A1780 special CallFrontierUtilFunc
call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
end end
@@ -36,7 +36,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B
@@ -46,7 +46,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
@@ -71,19 +71,19 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7 applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7
@@ -97,20 +97,20 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
compare VAR_RESULT, 2 compare VAR_RESULT, 2
@@ -181,7 +181,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
@@ -194,7 +194,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61
@@ -246,13 +246,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4
@@ -265,7 +265,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
special sub_8195960 special sub_8195960
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4
@@ -277,7 +277,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
waitmovement 0 waitmovement 0
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
@@ -289,13 +289,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4
@@ -308,7 +308,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
special sub_8195960 special sub_8195960
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4
@@ -320,7 +320,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
waitmovement 0 waitmovement 0
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
@@ -336,17 +336,17 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_PALACE setvar VAR_0x8004, SPECIAL_BATTLE_PALACE
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special DoSpecialTrainerBattle special DoSpecialTrainerBattle
waitstate waitstate
setvar VAR_0x8004, 18 setvar VAR_0x8004, 18
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 21 setvar VAR_0x8004, 21
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+1 -1
View File
@@ -27,7 +27,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
closemessage closemessage
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+15 -15
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
@@ -40,7 +40,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
@@ -48,7 +48,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
lockall lockall
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4 msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4
@@ -60,7 +60,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4 msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9 msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9
message BattleFrontier_BattlePalaceLobby_Text_24E4F7 message BattleFrontier_BattlePalaceLobby_Text_24E4F7
waitmessage waitmessage
@@ -88,7 +88,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
@@ -126,7 +126,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3 goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3
@@ -179,13 +179,13 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4 msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7 call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7
@@ -205,7 +205,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_8195960 special sub_8195960
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
@@ -215,11 +215,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -232,7 +232,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4
closemessage closemessage
call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC
@@ -268,7 +268,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94 goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94
BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91 BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
@@ -364,7 +364,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
@@ -375,7 +375,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+2 -2
View File
@@ -12,7 +12,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 20 setvar VAR_0x8004, 20
special sub_81A703C special sub_81A703C
setvar VAR_0x8004, 24 setvar VAR_0x8004, 24
@@ -30,7 +30,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 99 setvar VAR_0x8006, 99
special sub_81A1780 special CallFrontierUtilFunc
call BattleFrontier_BattlePikeCorridor_EventScript_25BB49 call BattleFrontier_BattlePikeCorridor_EventScript_25BB49
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
waitstate waitstate
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+16 -16
View File
@@ -21,7 +21,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
@@ -42,7 +42,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
@@ -50,7 +50,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
lockall lockall
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4 msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4
@@ -64,10 +64,10 @@ BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784
BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4 msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A703C special sub_81A703C
@@ -98,11 +98,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
message BattleFrontier_BattlePikeLobby_Text_25C146 message BattleFrontier_BattlePikeLobby_Text_25C146
waitmessage waitmessage
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
@@ -148,13 +148,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4 msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattlePikeLobby_EventScript_23F2B7 call BattleFrontier_BattlePikeLobby_EventScript_23F2B7
@@ -175,13 +175,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 28 setvar VAR_0x8004, 28
special sub_81A703C special sub_81A703C
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
@@ -191,7 +191,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -204,11 +204,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4 msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4
closemessage closemessage
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
special sub_81A1780 special CallFrontierUtilFunc
call BattleFrontier_BattlePikeLobby_EventScript_25BA94 call BattleFrontier_BattlePikeLobby_EventScript_25BA94
special HealPlayerParty special HealPlayerParty
call BattleFrontier_BattlePikeLobby_EventScript_25BB49 call BattleFrontier_BattlePikeLobby_EventScript_25BB49
@@ -238,7 +238,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattlePikeLobby_EventScript_25BA76 goto BattleFrontier_BattlePikeLobby_EventScript_25BA76
BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73 BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73
@@ -255,7 +255,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
lockall lockall
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 5 setvar VAR_0x8005, 5
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+9 -9
View File
@@ -45,7 +45,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
waitstate waitstate
end end
@@ -144,13 +144,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4
@@ -161,7 +161,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4
@@ -171,7 +171,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4
closemessage closemessage
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
@@ -179,13 +179,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4
@@ -196,7 +196,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4
@@ -206,7 +206,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4
closemessage closemessage
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
lockall lockall
msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4
closemessage closemessage
data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+2 -2
View File
@@ -19,7 +19,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
waitstate waitstate
end end
@@ -37,7 +37,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271 call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 5 setvar VAR_0x8005, 5
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
compare VAR_RESULT, 3 compare VAR_RESULT, 3
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+8 -8
View File
@@ -23,7 +23,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A
@@ -43,27 +43,27 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4 msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4
closemessage closemessage
releaseall releaseall
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 99 setvar VAR_0x8006, 99
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968 case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968
case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978 case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978
@@ -133,7 +133,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
special sub_81A1780 special CallFrontierUtilFunc
message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
waitmessage waitmessage
special LoadPlayerParty special LoadPlayerParty
@@ -144,7 +144,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+9 -9
View File
@@ -41,14 +41,14 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A8E7C special sub_81A8E7C
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_TEMP_0 switch VAR_TEMP_0
case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66
case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 5 setvar VAR_0x8005, 5
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 4 compare VAR_RESULT, 4
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
compare VAR_RESULT, 5 compare VAR_RESULT, 5
@@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
setvar VAR_0x8005, 8 setvar VAR_0x8005, 8
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_D, 1 setvar VAR_TEMP_D, 1
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
@@ -76,7 +76,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
setvar VAR_0x8006, 255 setvar VAR_0x8006, 255
@@ -103,12 +103,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A8E7C special sub_81A8E7C
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_F, 1 setvar VAR_TEMP_F, 1
end end
@@ -128,12 +128,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
@@ -141,7 +141,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
waitstate waitstate
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+15 -15
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
@@ -43,7 +43,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
@@ -51,7 +51,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
lockall lockall
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4 msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4
@@ -66,7 +66,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB
clearflag FLAG_SPECIAL_FLAG_0x4004 clearflag FLAG_SPECIAL_FLAG_0x4004
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
special sub_81A8E7C special sub_81A8E7C
@@ -77,7 +77,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
waitse waitse
msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4 msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
message BattleFrontier_BattlePyramidLobby_Text_251A77 message BattleFrontier_BattlePyramidLobby_Text_251A77
waitmessage waitmessage
@@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
special sub_81A8E7C special sub_81A8E7C
@@ -152,13 +152,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4 msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7 call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7
@@ -178,7 +178,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A8E7C special sub_81A8E7C
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
@@ -188,11 +188,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
special sub_81A8E7C special sub_81A8E7C
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
@@ -209,14 +209,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4 msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4
closemessage closemessage
call BattleFrontier_BattlePyramidLobby_EventScript_250D56 call BattleFrontier_BattlePyramidLobby_EventScript_250D56
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special HealPlayerParty special HealPlayerParty
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
@@ -245,7 +245,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4 goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4
BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1 BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1
@@ -426,7 +426,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
lockall lockall
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+14 -14
View File
@@ -29,7 +29,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
call BattleFrontier_BattlePyramidTop_EventScript_242170 call BattleFrontier_BattlePyramidTop_EventScript_242170
@@ -37,14 +37,14 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
copyvar VAR_TEMP_C, VAR_RESULT copyvar VAR_TEMP_C, VAR_RESULT
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_TEMP_0 switch VAR_TEMP_0
case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 case 0, BattleFrontier_BattlePyramidTop_EventScript_255193
case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66 case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66
case 2, BattleFrontier_BattlePyramidTop_EventScript_255193 case 2, BattleFrontier_BattlePyramidTop_EventScript_255193
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 5 setvar VAR_0x8005, 5
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 3 compare VAR_RESULT, 3
@@ -76,12 +76,12 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A8E7C special sub_81A8E7C
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_F, 1 setvar VAR_TEMP_F, 1
end end
@@ -110,7 +110,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
waitstate waitstate
end end
@@ -135,7 +135,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
case 4, BattleFrontier_BattlePyramidTop_EventScript_255388 case 4, BattleFrontier_BattlePyramidTop_EventScript_255388
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0
special SpawnScriptEventObject special SpawnScriptEventObject
@@ -145,7 +145,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
closemessage closemessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4 msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4
@@ -166,7 +166,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A
msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4
@@ -175,14 +175,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4 msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4
goto BattleFrontier_BattlePyramidTop_EventScript_25521A goto BattleFrontier_BattlePyramidTop_EventScript_25521A
BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388
special SpawnScriptEventObject special SpawnScriptEventObject
@@ -192,7 +192,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
closemessage closemessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4 msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4
@@ -213,7 +213,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4
@@ -222,7 +222,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4 msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4
goto BattleFrontier_BattlePyramidTop_EventScript_25521A goto BattleFrontier_BattlePyramidTop_EventScript_25521A
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+22 -22
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
@@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
@@ -56,7 +56,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_8161F74 special sub_8161F74
@@ -74,7 +74,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
waitmovement 0 waitmovement 0
removeobject 1 removeobject 1
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
@@ -88,13 +88,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_81A1780 special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44
call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@@ -156,7 +156,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_8161F74 special sub_8161F74
@@ -174,7 +174,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44 BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44
@@ -224,7 +224,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA
BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA
BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA
setvar VAR_0x8004, 17 setvar VAR_0x8004, 17
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
@@ -288,13 +288,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4
@@ -306,7 +306,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4
@@ -315,20 +315,20 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4
@@ -340,7 +340,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4
@@ -349,7 +349,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
waitmessage waitmessage
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4 msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
@@ -360,7 +360,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_TOWER setvar VAR_0x8004, SPECIAL_BATTLE_TOWER
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -370,17 +370,17 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
compare VAR_0x8004, 3 compare VAR_0x8004, 3
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
setvar VAR_0x8004, 18 setvar VAR_0x8004, 18
special sub_81A1780 special CallFrontierUtilFunc
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 21 setvar VAR_0x8004, 21
special sub_81A1780 special CallFrontierUtilFunc
BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_8161F74 special sub_8161F74
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 5 setvar VAR_0x8005, 5
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170 BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170
@@ -390,7 +390,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170
BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170 BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170
BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170 BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170
setvar VAR_0x8004, 22 setvar VAR_0x8004, 22
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+7 -7
View File
@@ -47,7 +47,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
@@ -59,7 +59,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
@@ -117,7 +117,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_8161F74 special sub_8161F74
@@ -156,7 +156,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
@@ -166,7 +166,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
@@ -234,7 +234,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_8161F74 special sub_8161F74
@@ -252,7 +252,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+31 -31
View File
@@ -49,7 +49,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
@@ -68,7 +68,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
release release
end end
@@ -77,7 +77,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778
message BattleFrontier_BattleTowerLobby_Text_23F60D message BattleFrontier_BattleTowerLobby_Text_23F60D
@@ -101,7 +101,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4 msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9 msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9
call BattleFrontier_BattleTowerLobby_EventScript_23E84D call BattleFrontier_BattleTowerLobby_EventScript_23E84D
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
@@ -151,7 +151,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
message BattleFrontier_BattleTowerLobby_Text_23F70F message BattleFrontier_BattleTowerLobby_Text_23F70F
waitmessage waitmessage
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
@@ -182,7 +182,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4
BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4
BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4
setvar VAR_0x8004, 19 setvar VAR_0x8004, 19
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7
playse SE_SAVE playse SE_SAVE
@@ -208,7 +208,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0
BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
@@ -228,7 +228,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end end
@@ -262,13 +262,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4 msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
@@ -287,7 +287,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_8161F74 special sub_8161F74
@@ -298,7 +298,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -342,13 +342,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4 msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
@@ -367,7 +367,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_8161F74 special sub_8161F74
@@ -378,7 +378,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -423,13 +423,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4 msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
@@ -448,7 +448,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_8161F74 special sub_8161F74
@@ -459,7 +459,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -503,13 +503,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4 msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4
fadescreen 1 fadescreen 1
call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
@@ -528,7 +528,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_8161F74 special sub_8161F74
@@ -539,7 +539,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -634,7 +634,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
@@ -645,7 +645,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
@@ -656,7 +656,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 2 setvar VAR_0x8006, 2
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
@@ -667,7 +667,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
@@ -717,7 +717,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2
BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6 goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6
end end
@@ -736,7 +736,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
call BattleFrontier_BattleTowerLobby_EventScript_23F272 call BattleFrontier_BattleTowerLobby_EventScript_23F272
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
@@ -924,7 +924,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7
BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_81A1780 special CallFrontierUtilFunc
return return
BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+1 -1
View File
@@ -98,7 +98,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03 goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03
end end
data/maps/BattleFrontier_RankingHall/scripts.inc
+2 -2
View File
@@ -62,9 +62,9 @@ BattleFrontier_RankingHall_EventScript_25E516:: @ 825E516
end end
BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522 BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
special sub_81A4AA0 special ShowRankingHallRecordsWindow
waitbuttonpress waitbuttonpress
special sub_81A4AE8 special ScrollRankingHallRecordsWindow
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+4 -4
View File
@@ -114,7 +114,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_8161F74 special sub_8161F74
@@ -123,7 +123,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_8161F74 special sub_8161F74
@@ -157,7 +157,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_8161F74 special sub_8161F74
@@ -166,7 +166,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_8161F74 special sub_8161F74
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+8 -8
View File
@@ -37,7 +37,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73 goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73
@@ -71,7 +71,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
@@ -87,12 +87,12 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C
FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3 case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3
applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E
@@ -107,7 +107,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
@@ -115,7 +115,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43
compare VAR_RESULT, 2 compare VAR_RESULT, 2
@@ -156,7 +156,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
@@ -191,7 +191,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73 FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73
data/maps/FallarborTown_BattleTentLobby/scripts.inc
+14 -14
View File
@@ -22,7 +22,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
@@ -32,12 +32,12 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
releaseall releaseall
end end
@@ -51,7 +51,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81B9B80 special sub_81B9B80
@@ -67,7 +67,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
message FallarborTown_BattleTentLobby_Text_2C4F69 message FallarborTown_BattleTentLobby_Text_2C4F69
waitmessage waitmessage
playfanfare MUS_FANFA4 playfanfare MUS_FANFA4
@@ -99,7 +99,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81B9B80 special sub_81B9B80
@@ -123,7 +123,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto FallarborTown_BattleTentLobby_EventScript_20013C goto FallarborTown_BattleTentLobby_EventScript_20013C
@@ -152,13 +152,13 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_FRONTIER_BATTLE_MODE, 0
setvar VAR_RESULT, 2 setvar VAR_RESULT, 2
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq FallarborTown_BattleTentLobby_EventScript_200176 goto_eq FallarborTown_BattleTentLobby_EventScript_200176
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 2 setvar VAR_0x8006, 2
special sub_81A1780 special CallFrontierUtilFunc
msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4 msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
@@ -177,17 +177,17 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81B9B80 special sub_81B9B80
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -200,7 +200,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4
closemessage closemessage
call FallarborTown_BattleTentLobby_EventScript_2001CF call FallarborTown_BattleTentLobby_EventScript_2001CF
@@ -230,7 +230,7 @@ FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto FallarborTown_BattleTentLobby_EventScript_2001C5 goto FallarborTown_BattleTentLobby_EventScript_2001C5
FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2 FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2
data/maps/LilycoveCity_ContestLobby/scripts.inc
+1 -1
View File
@@ -562,7 +562,7 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
lockall lockall
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
special sub_81A1780 special CallFrontierUtilFunc
waitbuttonpress waitbuttonpress
special RemoveRecordsWindow special RemoveRecordsWindow
releaseall releaseall
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+2 -2
View File
@@ -263,13 +263,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
special ReducePlayerPartyToThree special ReducePlayerPartyToThree
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special DoSpecialTrainerBattle special DoSpecialTrainerBattle
waitstate waitstate
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
switch VAR_RESULT switch VAR_RESULT
case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+4 -4
View File
@@ -66,7 +66,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
@@ -74,12 +74,12 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B
@ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B @ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B
@@ -92,7 +92,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+2 -2
View File
@@ -70,7 +70,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014 call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014
compare VAR_RESULT, 2 compare VAR_RESULT, 2
@@ -136,7 +136,7 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
data/maps/SlateportCity_BattleTentLobby/scripts.inc
+12 -12
View File
@@ -22,7 +22,7 @@ SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F
SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
@@ -32,12 +32,12 @@ SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
releaseall releaseall
end end
@@ -50,7 +50,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81B9D08 special sub_81B9D08
@@ -66,7 +66,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
message SlateportCity_BattleTentLobby_Text_23F68C message SlateportCity_BattleTentLobby_Text_23F68C
waitmessage waitmessage
playfanfare MUS_FANFA4 playfanfare MUS_FANFA4
@@ -84,7 +84,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81B9D08 special sub_81B9D08
@@ -110,7 +110,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
setvar VAR_0x8006, 2 setvar VAR_0x8006, 2
goto SlateportCity_BattleTentLobby_EventScript_2089AC goto SlateportCity_BattleTentLobby_EventScript_2089AC
@@ -141,7 +141,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 2 setvar VAR_0x8006, 2
special sub_81A1780 special CallFrontierUtilFunc
msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5 msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_208A2B case 0, SlateportCity_BattleTentLobby_EventScript_208A2B
@@ -152,17 +152,17 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81B9D08 special sub_81B9D08
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
closemessage closemessage
delay 2 delay 2
call SlateportCity_BattleTentLobby_EventScript_27134F call SlateportCity_BattleTentLobby_EventScript_27134F
@@ -224,7 +224,7 @@ SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto SlateportCity_BattleTentLobby_EventScript_208A2E goto SlateportCity_BattleTentLobby_EventScript_208A2E
SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
setvar VAR_0x8004, 16 setvar VAR_0x8004, 16
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
compare VAR_0x40C0, 0 compare VAR_0x40C0, 0
@@ -75,7 +75,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 16 setvar VAR_0x8004, 16
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E
compare VAR_TEMP_1, 1 compare VAR_TEMP_1, 1
data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+8 -8
View File
@@ -36,7 +36,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
@@ -58,7 +58,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
@@ -66,12 +66,12 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780 special CallFrontierUtilFunc
switch VAR_RESULT switch VAR_RESULT
case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501 case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501
applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581
@@ -85,7 +85,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
@@ -93,7 +93,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565 call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565
compare VAR_RESULT, 2 compare VAR_RESULT, 2
@@ -131,7 +131,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
@@ -146,7 +146,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
waitse waitse
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special sub_81A1780 special CallFrontierUtilFunc
end end
VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+14 -14
View File
@@ -22,7 +22,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF
VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81A1780 special CallFrontierUtilFunc
end end
VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
@@ -32,12 +32,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
releaseall releaseall
end end
@@ -51,7 +51,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81B99B4 special sub_81B99B4
@@ -67,7 +67,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
message VerdanturfTown_BattleTentLobby_Text_24A554 message VerdanturfTown_BattleTentLobby_Text_24A554
waitmessage waitmessage
playfanfare MUS_FANFA4 playfanfare MUS_FANFA4
@@ -99,7 +99,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_81B99B4 special sub_81B99B4
@@ -124,7 +124,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto VerdanturfTown_BattleTentLobby_EventScript_2019AE goto VerdanturfTown_BattleTentLobby_EventScript_2019AE
@@ -153,13 +153,13 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_FRONTIER_BATTLE_MODE, 0
setvar VAR_RESULT, 2 setvar VAR_RESULT, 2
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_81A1780 special CallFrontierUtilFunc
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 2 setvar VAR_0x8006, 2
special sub_81A1780 special CallFrontierUtilFunc
msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4 msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
@@ -178,17 +178,17 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_81B99B4 special sub_81B99B4
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special sub_81A1780 special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@@ -201,7 +201,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
special SavePlayerParty special SavePlayerParty
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special sub_81A1780 special CallFrontierUtilFunc
msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4
closemessage closemessage
call VerdanturfTown_BattleTentLobby_EventScript_201A41 call VerdanturfTown_BattleTentLobby_EventScript_201A41
@@ -231,7 +231,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special sub_81A1780 special CallFrontierUtilFunc
goto VerdanturfTown_BattleTentLobby_EventScript_201A37 goto VerdanturfTown_BattleTentLobby_EventScript_201A37
VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34 VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34
data/specials.inc
+3 -3
View File
@@ -242,7 +242,7 @@ gSpecials:: @ 81DBA64
def_special FinishCyclingRoadChallenge def_special FinishCyclingRoadChallenge
def_special UpdateCyclingRoadState def_special UpdateCyclingRoadState
def_special GetLeadMonFriendshipScore def_special GetLeadMonFriendshipScore
def_special sub_81A1780 def_special CallFrontierUtilFunc
def_special sub_8161F74 def_special sub_8161F74
def_special CallBattleDomeFunction def_special CallBattleDomeFunction
def_special sub_8195960 def_special sub_8195960
@@ -448,8 +448,8 @@ gSpecials:: @ 81DBA64
def_special sub_80F90DC def_special sub_80F90DC
def_special sub_80F910C def_special sub_80F910C
def_special sub_80F9160 def_special sub_80F9160
def_special sub_81A4AA0 def_special ShowRankingHallRecordsWindow
def_special sub_81A4AE8 def_special ScrollRankingHallRecordsWindow
def_special sub_8139F20 def_special sub_8139F20
def_special sub_80F9134 def_special sub_80F9134
def_special sub_80F9154 def_special sub_80F9154
include/apprentice.h
+2 -1
View File
@@ -9,7 +9,8 @@ struct ApprenticeTrainer
u16 otId; u16 otId;
u8 facilityClass; u8 facilityClass;
u16 species[APPRENTICE_SPECIES_COUNT]; u16 species[APPRENTICE_SPECIES_COUNT];
u8 rest[14]; u8 id;
u16 easyChatWords[6];
}; };
extern const struct ApprenticeTrainer gApprentices[]; extern const struct ApprenticeTrainer gApprentices[];
include/battle_dome.h
+1 -1
View File
@@ -3,7 +3,7 @@
extern u32 gUnknown_0203CD70; extern u32 gUnknown_0203CD70;
s32 GetTrainerMonCountInBits(u16 tournamentTrainerId); s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId);
s32 TrainerIdToDomeTournamentId(u16 trainerId); s32 TrainerIdToDomeTournamentId(u16 trainerId);
#endif // GUARD_BATTLE_DOME_H #endif // GUARD_BATTLE_DOME_H
include/battle_frontier_1.h
-6
View File
@@ -1,6 +0,0 @@
#ifndef GUARD_BATTLE_FRONTIER_1_H
#define GUARD_BATTLE_FRONTIER_1_H
bool32 sub_8196034(void);
#endif // GUARD_BATTLE_FRONTIER_1_H
include/battle_frontier_2.h
-19
View File
@@ -1,19 +0,0 @@
#ifndef GUARD_BATTLE_FRONTIER_2_H
#define GUARD_BATTLE_FRONTIER_2_H
#define FRONTIER_BEFORE_TEXT 0
#define FRONTIER_WIN_TEXT 1
#define FRONTIER_LOSE_TEXT 2
void CopyFrontierTrainerText(u8 whichText, u16 trainerId);
void sub_81A8934(u8);
void sub_81A895C(void);
u16 sub_81A89A0(u8);
void sub_81A8AF8(void);
bool8 InBattlePike(void);
void sub_81AA078(u16*, u8);
void sub_81A4C30(void);
bool8 sub_81A6BF4(void);
u8 sub_81A6CA8(u8, u8);
#endif // GUARD_BATTLE_FRONTIER_2_H
include/constants/battle_frontier.h
+3
View File
@@ -38,4 +38,7 @@
#define SPECIAL_BATTLE_PIKE_DOUBLE 9 #define SPECIAL_BATTLE_PIKE_DOUBLE 9
#define SPECIAL_BATTLE_PYRAMID 10 #define SPECIAL_BATTLE_PYRAMID 10
// For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special.
#define RESULTS_LINK_CONTEST 7
#endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H #endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H
include/field_specials.h
+1
View File
@@ -15,5 +15,6 @@ bool32 sub_8138168(void);
bool32 sub_81381B0(void); bool32 sub_81381B0(void);
bool32 sub_81381F8(void); bool32 sub_81381F8(void);
bool32 CountSSTidalStep(u16 delta); bool32 CountSSTidalStep(u16 delta);
void sub_813A878(u8 a0);
#endif // GUARD_FIELD_SPECIALS_H #endif // GUARD_FIELD_SPECIALS_H
include/frontier_util.h
+31
View File
@@ -0,0 +1,31 @@
#ifndef GUARD_FRONTIER_UTIL_H
#define GUARD_FRONTIER_UTIL_H
#define FRONTIER_BEFORE_TEXT 0
#define FRONTIER_PLAYER_LOST_TEXT 1
#define FRONTIER_PLAYER_WON_TEXT 2
void CallFrontierUtilFunc(void);
u8 sub_81A3610(void);
void CopyFrontierTrainerText(u8 whichText, u16 trainerId);
void sub_81A3908(void);
u32 GetCurrentFacilityWinStreak(void);
void sub_81A3ACC(void);
u8 GetPlayerSymbolCountForFacility(u8 facility);
void ShowRankingHallRecordsWindow(void);
void ScrollRankingHallRecordsWindow(void);
void ClearRankingHallRecords(void);
u8 GetFrontierBrainTrainerPicIndex(void);
u8 GetFrontierBrainTrainerClass(void);
void CopyFrontierBrainTrainerName(u8 *dst);
bool8 IsFrontierBrainFemale(void);
void SetFrontierBrainEventObjGfx_2(void);
void CreateFrontierBrainPokemon(void);
u16 GetFrontierBrainMonSpecies(u8 monId);
void SetFrontierBrainEventObjGfx(u8 facility);
u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId);
u8 GetFrontierBrainMonNature(u8 monId);
u8 GetFrontierBrainMonEvs(u8 monId, u8 evStatId);
s32 GetFronterBrainSymbol(void);
#endif // GUARD_FRONTIER_UTIL_H
include/global.h
+51 -40
View File
@@ -137,6 +137,7 @@ enum LanguageId
#define BAG_BERRIES_COUNT 46 #define BAG_BERRIES_COUNT 46
#define PYRAMID_BAG_ITEMS_COUNT 10 #define PYRAMID_BAG_ITEMS_COUNT 10
#define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode.
// string lengths // string lengths
#define ITEM_NAME_LENGTH 14 #define ITEM_NAME_LENGTH 14
@@ -331,8 +332,8 @@ struct EmeraldBattleTowerRecord
/*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
/*0x0C*/ u8 trainerId[4]; /*0x0C*/ u8 trainerId[4];
/*0x10*/ u16 greeting[6]; /*0x10*/ u16 greeting[6];
/*0x1C*/ u16 unk1C[6]; /*0x1C*/ u16 speechWon[6];
/*0x28*/ u16 unk28[6]; /*0x28*/ u16 speechLost[6];
/*0x34*/ struct UnknownPokemonStruct party[4]; /*0x34*/ struct UnknownPokemonStruct party[4];
/*0xE4*/ u8 language; /*0xE4*/ u8 language;
/*0xE8*/ u32 checksum; /*0xE8*/ u32 checksum;
@@ -400,14 +401,11 @@ struct BattleFrontier
/*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor.
/*0xCB4*/ u16 field_CB4[20]; /*0xCB4*/ u16 field_CB4[20];
/*0xCDC*/ u32 field_CDC; /*0xCDC*/ u32 field_CDC;
/*0xCE0*/ u16 winStreaks[4][2]; /*0xCE0*/ u16 towerWinStreaks[4][2];
/*0xCF0*/ u16 field_CF0[2]; /*0xCF0*/ u16 towerRecordWinStreaks[4][2];
/*0xCF4*/ u16 field_CF4[2]; /*0xD00*/ u16 field_D00;
/*0xCF8*/ u16 field_CF8[2]; /*0xD02*/ u16 field_D02;
/*0xCFC*/ u16 field_CFC[2]; /*0xD04*/ u16 field_D04;
/*0xD06*/ u16 field_D00;
/*0xD06*/ u16 field_D02;
/*0xD06*/ u16 field_D04;
/*0xD06*/ u8 field_D06; /*0xD06*/ u8 field_D06;
/*0xD07*/ u8 field_D07; /*0xD07*/ u8 field_D07;
/*0xD08*/ u8 field_D08_0:1; /*0xD08*/ u8 field_D08_0:1;
@@ -421,43 +419,37 @@ struct BattleFrontier
/*0xD09*/ u8 filler_D09; /*0xD09*/ u8 filler_D09;
/*0xD0A*/ u8 field_D0A; /*0xD0A*/ u8 field_D0A;
/*0xD0B*/ u8 field_D0B; /*0xD0B*/ u8 field_D0B;
/*0xD0C*/ u16 field_D0C[2][2]; /*0xD0C*/ u16 domeWinStreaks[2][2];
/*0xD14*/ u16 field_D14[2][2]; /*0xD14*/ u16 domeRecordWinStreaks[2][2];
/*0xD1C*/ u16 field_D1C[2][2]; /*0xD1C*/ u16 domeTotalChampionships[2][2];
/*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT]; /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT];
/*0xD64*/ u16 domeMonId[DOME_TOURNAMENT_TRAINERS_COUNT][3]; /*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][3];
/*0xD64*/ u16 field_DC4[2]; /*0xD64*/ u16 field_DC4[2];
/*0xDC8*/ u16 field_DC8[2][2]; /*0xDC8*/ u16 palaceWinStreaks[2][2];
/*0xDD0*/ u16 field_DD0[2][2]; /*0xDD0*/ u16 palaceRecordWinStreaks[2][2];
/*0xDD8*/ u16 field_DD8; /*0xDD8*/ u16 field_DD8;
/*0xDDA*/ u16 field_DDA[2]; /*0xDDA*/ u16 arenaWinStreaks[2];
/*0xDDE*/ u16 field_DDE[2]; /*0xDDE*/ u16 arenaRecordStreaks[2];
/*0xDE2*/ u16 field_DE2[2][2]; /*0xDE2*/ u16 factoryWinStreaks[2][2];
/*0xDEA*/ u16 field_DEA[2]; /*0xDEA*/ u16 factoryRecordWinStreaks[2][2];
/*0xDEE*/ u16 field_DEE; /*0xDF6*/ u16 factoryRentsCount[2][2];
/*0xDF0*/ u16 field_DF0; /*0xDFA*/ u16 factoryRecordRentsCount[2][2];
/*0xDF2*/ u16 field_DF2;
/*0xDF4*/ u16 field_DF4;
/*0xDF6*/ u16 field_DF6;
/*0xDF8*/ u16 field_DF8;
/*0xDFA*/ u16 field_DFA;
/*0xDFC*/ u16 field_DFC;
/*0xDFE*/ u16 field_DFE;
/*0xE00*/ u16 field_E00;
/*0xE02*/ u16 field_E02; /*0xE02*/ u16 field_E02;
/*0xE04*/ u16 field_E04[2]; /*0xE04*/ u16 pikeWinStreaks[2];
/*0xE08*/ u16 field_E08[9]; /*0xE08*/ u16 pikeRecordStreaks[2];
/*0xE1A*/ u16 field_E1A[2]; /*0xE0C*/ u16 pikeTotalStreaks[2];
/*0xE1E*/ u16 field_E1E[7]; /*0xE10*/ u16 field_E10[5];
/*0xE1A*/ u16 pyramidWinStreaks[2];
/*0xE1E*/ u16 pyramidRecordStreaks[2];
/*0xE1E*/ u16 field_E1F[5];
/*0xE2C*/ struct PyramidBag pyramidBag; /*0xE2C*/ struct PyramidBag pyramidBag;
/*0xE58*/ u16 field_E58; /*0xE58*/ u16 field_E58;
/*0xE6A*/ u16 field_E6A; /*0xE6A*/ u16 field_E6A;
/*0xE6C*/ u16 field_E6C; /*0xE6C*/ u16 field_E6C;
/*0xE6E*/ u16 field_E6E; /*0xE6E*/ u16 field_E6E;
/*0xE70*/ struct Struct_field_E70 field_E70[6]; /*0xE70*/ struct Struct_field_E70 field_E70[6];
/*0xEB8*/ u16 frontierBattlePoints; /*0xEB8*/ u16 battlePoints;
/*0xEBA*/ u8 field_EBA; /*0xEBA*/ u16 field_EBA;
/*0xEBB*/ u8 field_EBB;
/*0xEBC*/ u32 battlesCount; /*0xEBC*/ u32 battlesCount;
/*0xEC0*/ u16 field_EC0[16]; /*0xEC0*/ u16 field_EC0[16];
/*0xEE0*/ u8 field_EE0; /*0xEE0*/ u8 field_EE0;
@@ -491,6 +483,24 @@ struct PlayersApprentice
/*0xB8*/ struct Sav2_B8 field_B8[9]; /*0xB8*/ struct Sav2_B8 field_B8[9];
}; };
struct RankingHall1P
{
u8 id[4];
u16 winStreak;
u8 name[PLAYER_NAME_LENGTH + 1];
u8 language;
};
struct RankingHall2P
{
u8 id1[4];
u8 id2[4];
u16 winStreak;
u8 name1[PLAYER_NAME_LENGTH + 1];
u8 name2[PLAYER_NAME_LENGTH + 1];
u8 language;
};
struct SaveBlock2 struct SaveBlock2
{ {
/*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@@ -515,12 +525,13 @@ struct SaveBlock2
/*0xA8*/ u32 field_A8; /*0xA8*/ u32 field_A8;
/*0xAC*/ u32 encryptionKey; /*0xAC*/ u32 encryptionKey;
/*0xB0*/ struct PlayersApprentice playerApprentice; /*0xB0*/ struct PlayersApprentice playerApprentice;
/*0xDC*/ struct Apprentice apprentices[4]; /*0xDC*/ struct Apprentice apprentices[4]; // From record mixing.
/*0x1EC*/ struct BerryCrush berryCrush; /*0x1EC*/ struct BerryCrush berryCrush;
/*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x1FC*/ struct PokemonJumpResults pokeJump;
/*0x20C*/ struct BerryPickingResults berryPick; /*0x20C*/ struct BerryPickingResults berryPick;
/*0x21C*/ u8 field_21C[1032]; /*0x21C*/ struct RankingHall1P hallRecords1P[HALL_FACILITIES_COUNT][2][3]; // From record mixing.
/*0x624*/ u16 contestLinkResults[20]; // 4 positions for 5 categories, possibly a struct or a 2d array /*0x57C*/ struct RankingHall2P hallRecords2P[2][3]; // From record mixing.
/*0x624*/ u16 contestLinkResults[5][4]; // 4 positions for 5 categories.
/*0x64C*/ struct BattleFrontier frontier; /*0x64C*/ struct BattleFrontier frontier;
}; // sizeof=0xF2C }; // sizeof=0xF2C
include/menu.h
-1
View File
@@ -26,7 +26,6 @@ u16 RunTextPrintersAndIsPrinter0Active(void);
void sub_81973A4(void); void sub_81973A4(void);
void NewMenuHelpers_DrawDialogueFrame(u8, u8); void NewMenuHelpers_DrawDialogueFrame(u8, u8);
void sub_819746C(u8 windowId, bool8 copyToVram); void sub_819746C(u8 windowId, bool8 copyToVram);
void NewMenuHelpers_DrawStdWindowFrame(u8, u8);
u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
include/new_game.h
+3 -3
View File
@@ -1,9 +1,9 @@
#ifndef GUARD_NEW_GAME_H #ifndef GUARD_NEW_GAME_H
#define GUARD_NEW_GAME_H #define GUARD_NEW_GAME_H
void WriteUnalignedWord(u32 var, u8 *dataPtr); void SetTrainerId(u32 trainerId, u8 *dst);
u32 ReadUnalignedWord(u8* dataPtr); u32 GetTrainerId(u8 *trainerId);
void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom); void CopyTrainerId(u8 *dst, u8 *src);
void NewGameInitData(void); void NewGameInitData(void);
void sub_808447C(void); void sub_808447C(void);
void Sav2_ClearSetDefault(void); void Sav2_ClearSetDefault(void);
include/record_mixing.h
+4 -26
View File
@@ -1,35 +1,13 @@
#ifndef GUARD_RECORD_MIXING_H #ifndef GUARD_RECORD_MIXING_H
#define GUARD_RECORD_MIXING_H #define GUARD_RECORD_MIXING_H
// Exported type declarations struct PlayerHallRecords
struct UnkRecordMixingStruct2a
{ {
u8 playerId[4]; struct RankingHall1P onePlayer[9][2];
u16 field_4; struct RankingHall2P twoPlayers[2];
u8 playerName[PLAYER_NAME_LENGTH + 1];
u8 language;
}; };
struct UnkRecordMixingStruct2b
{
u8 playerId1[4];
u8 playerId2[4];
u16 field_8;
u8 playerName1[PLAYER_NAME_LENGTH + 1];
u8 playerName2[PLAYER_NAME_LENGTH + 1];
u8 language;
};
struct UnkRecordMixingStruct2
{
struct UnkRecordMixingStruct2a field_0[9][2];
struct UnkRecordMixingStruct2b field_120[2];
};
// Exported RAM declarations
// Exported ROM declarations
void sub_80E6BE8(void); void sub_80E6BE8(void);
void sub_80E8260(struct UnkRecordMixingStruct2 *arg0); void GetPlayerHallRecords(struct PlayerHallRecords *dst);
#endif //GUARD_RECORD_MIXING_H #endif //GUARD_RECORD_MIXING_H
include/recorded_battle.h
+9 -9
View File
@@ -14,16 +14,16 @@ u8 sub_81850D0(void);
u8 sub_81850DC(u8 *arg0); u8 sub_81850DC(u8 *arg0);
void sub_81851A8(u8 *arg0); void sub_81851A8(u8 *arg0);
bool32 CanCopyRecordedBattleSaveData(void); bool32 CanCopyRecordedBattleSaveData(void);
u32 MoveRecordedBattleToSaveData(void); bool32 MoveRecordedBattleToSaveData(void);
void PlayRecordedBattle(void (*CB2_After)(void)); void PlayRecordedBattle(void (*CB2_After)(void));
u8 GetRecordedBattleFrontierFacility(void); u8 GetRecordedBattleFrontierFacility(void);
u8 sub_8185EAC(void); u8 GetRecordedBattleFronterBrainSymbol(void);
void RecordedBattle_SaveParties(void); void RecordedBattle_SaveParties(void);
u8 GetActiveBattlerLinkPlayerGender(void); u8 GetActiveBattlerLinkPlayerGender(void);
void sub_8185F84(void); void sub_8185F84(void);
void sub_8185F90(u16 arg0); void sub_8185F90(u16 arg0);
u8 sub_8185FAC(void); u8 sub_8185FAC(void);
u8 GetBattleStyleInRecordedBattle(void); u8 GetBattleSceneInRecordedBattle(void);
u8 GetTextSpeedInRecordedBattle(void); u8 GetTextSpeedInRecordedBattle(void);
void RecordedBattle_CopyBattlerMoves(void); void RecordedBattle_CopyBattlerMoves(void);
void sub_818603C(u8 arg0); void sub_818603C(u8 arg0);
@@ -31,11 +31,11 @@ u32 GetAiScriptsInRecordedBattle(void);
void sub_8186444(void); void sub_8186444(void);
bool8 sub_8186450(void); bool8 sub_8186450(void);
void sub_8186468(u8 *dst); void sub_8186468(u8 *dst);
u8 sub_818649C(void); u8 GetRecordedBattleRecordMixFriendClass(void);
u8 sub_81864A8(void); u8 GetRecordedBattleApprenticeId(void);
u8 sub_81864B4(void); u8 GetRecordedBattleRecordMixFriendLanguage(void);
u8 sub_81864C0(void); u8 GetRecordedBattleApprenticeLanguage(void);
void sub_81864CC(void); void RecordedBattle_SaveBattleOutcome(void);
u16 *sub_81864E0(void); u16 *GetRecordedBattleEasyChatSpeech(void);
#endif // GUARD_RECORDED_BATTLE_H #endif // GUARD_RECORDED_BATTLE_H
include/save.h
+1 -1
View File
@@ -94,7 +94,7 @@ u16 CalculateChecksum(void *data, u16 size);
void UpdateSaveAddresses(void); void UpdateSaveAddresses(void);
u8 HandleSavingData(u8 saveType); u8 HandleSavingData(u8 saveType);
u8 TrySavingData(u8 saveType); u8 TrySavingData(u8 saveType);
u8 sub_8153380(void); bool8 sub_8153380(void);
bool8 sub_81533AC(void); bool8 sub_81533AC(void);
u8 sub_81533E0(void); u8 sub_81533E0(void);
u8 sub_8153408(void); u8 sub_8153408(void);
include/strings.h
+43
View File
@@ -877,4 +877,47 @@ extern const u8 gText_PokemonOnHook[];
extern const u8 gText_NotEvenANibble[]; extern const u8 gText_NotEvenANibble[];
extern const u8 gText_ItGotAway[]; extern const u8 gText_ItGotAway[];
// Frontier records.
extern const u8 gText_WinStreak[];
extern const u8 gText_Record[];
extern const u8 gText_Current[];
extern const u8 gText_RoomsCleared[];
extern const u8 gText_Prev[];
extern const u8 gText_SingleBattleRoomResults[];
extern const u8 gText_DoubleBattleRoomResults[];
extern const u8 gText_MultiBattleRoomResults[];
extern const u8 gText_LinkMultiBattleRoomResults[];
extern const u8 gText_Lv502[];
extern const u8 gText_OpenLv[];
extern const u8 gText_RentalSwap[];
extern const u8 gText_ClearStreak[];
extern const u8 gText_Total[];
extern const u8 gText_Championships[];
extern const u8 gText_SingleBattleTourneyResults[];
extern const u8 gText_DoubleBattleTourneyResults[];
extern const u8 gText_SingleBattleHallResults[];
extern const u8 gText_DoubleBattleHallResults[];
extern const u8 gText_BattleChoiceResults[];
extern const u8 gText_TimesCleared[];
extern const u8 gText_KOsInARow[];
extern const u8 gText_SetKOTourneyResults[];
extern const u8 gText_TimesVar1[];
extern const u8 gText_BattleSwapSingleResults[];
extern const u8 gText_BattleSwapDoubleResults[];
extern const u8 gText_FloorsCleared[];
extern const u8 gText_BattleQuestResults[];
extern const u8 gText_LinkContestResults[];
extern const u8 gText_4th[];
extern const u8 gText_3rd[];
extern const u8 gText_2nd[];
extern const u8 gText_1st[];
extern const u8 gText_SpaceAndSpace[];
extern const u8 gText_CommaSpace[];
extern const u8 gText_NewLine[];
extern const u8 gText_ScrollTextUp[];
extern const u8 gText_Space2[];
extern const u8 gText_Are[];
extern const u8 gText_Are2[];
extern const u8 gText_123Dot[][3];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H
include/tv.h
+2
View File
@@ -51,5 +51,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 move);
void UpdateTVScreensOnMap(int, int); void UpdateTVScreensOnMap(int, int);
void TV_PrintIntToStringVar(u8 varIdx, int value); void TV_PrintIntToStringVar(u8 varIdx, int value);
void SaveRecordedItemPurchasesForTVShow(void); void SaveRecordedItemPurchasesForTVShow(void);
bool8 sub_80EE818(void);
void sub_80EE8C8(u16 winStreak, u8 facilityAndMode);
#endif //GUARD_TV_H #endif //GUARD_TV_H
ld_script.txt
+2
View File
@@ -264,6 +264,7 @@ SECTIONS {
src/menu.o(.text); src/menu.o(.text);
src/battle_factory.o(.text); src/battle_factory.o(.text);
src/apprentice.o(.text); src/apprentice.o(.text);
src/frontier_util.o(.text);
asm/battle_frontier_2.o(.text); asm/battle_frontier_2.o(.text);
src/item_menu.o(.text); src/item_menu.o(.text);
src/list_menu.o(.text); src/list_menu.o(.text);
@@ -567,6 +568,7 @@ SECTIONS {
src/menu.o(.rodata); src/menu.o(.rodata);
src/battle_factory.o(.rodata); src/battle_factory.o(.rodata);
src/apprentice.o(.rodata); src/apprentice.o(.rodata);
src/frontier_util.o(.rodata);
data/battle_frontier_2.o(.rodata); data/battle_frontier_2.o(.rodata);
src/item_menu.o(.rodata); src/item_menu.o(.rodata);
src/list_menu.o(.rodata); src/list_menu.o(.rodata);
src/apprentice.c
+33 -17
View File
@@ -388,112 +388,128 @@ const struct ApprenticeTrainer gApprentices[] =
.otId = 0xBDC9, .otId = 0xBDC9,
.facilityClass = 0x43, .facilityClass = 0x43,
.species = {SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT}, .species = {SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT},
.rest = {0, 0, 0x1D, 8, 0x3e, 20, 0, 12, 1, 10, 0x30, 6, 0x44, 20}, .id = 0,
.easyChatWords = {0x81D, 0x143E, 0xC00, 0xA01, 0x630, 0x1444},
}, },
{ {
.name = {_("ヒロオ"), _("LIONEL"), _("LIONEL"), _("CAIO"), _("LUDWIG"), _("LEO")}, .name = {_("ヒロオ"), _("LIONEL"), _("LIONEL"), _("CAIO"), _("LUDWIG"), _("LEO")},
.otId = 0xCF09, .otId = 0xCF09,
.facilityClass = 0x2B, .facilityClass = 0x2B,
.species = {SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH}, .species = {SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH},
.rest = {1, 0, 0x38, 12, 1, 10, 0x30, 6, 6, 10, 0x20, 0x10, 0x13, 0x22}, .id = 1,
.easyChatWords = {0xC38, 0xA01, 0x630, 0xA06, 0x1020, 0x2213},
}, },
{ {
.name = {_("ケイジ"), _("SONNY"), _("HERVE"), _("FEDRO"), _("WENZEL"), _("SANTI")}, .name = {_("ケイジ"), _("SONNY"), _("HERVE"), _("FEDRO"), _("WENZEL"), _("SANTI")},
.otId = 0x2E34, .otId = 0x2E34,
.facilityClass = 0x26, .facilityClass = 0x26,
.species = {SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP}, .species = {SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP},
.rest = {2, 0, 1, 10, 10, 0x16, 0x15, 14, 0x30, 6, 0x3b, 12, 0x4, 12}, .id = 2,
.easyChatWords = {0xA01, 0x160A, 0xE15, 0x630, 0xC3B, 0xC04},
}, },
{ {
.name = {_("ユラ"), _("LAYLA"), _("LAYLA"), _("ASTRID"), _("SONJA"), _("LOLA")}, .name = {_("ユラ"), _("LAYLA"), _("LAYLA"), _("ASTRID"), _("SONJA"), _("LOLA")},
.otId = 0x84EF, .otId = 0x84EF,
.facilityClass = 0x47, .facilityClass = 0x47,
.species = {SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA}, .species = {SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA},
.rest = {3, 0, 11, 16, 15, 0x1e, 0x39, 16, 0x21, 0x14, 0x3, 12, 0xff, 0xff}, .id = 3,
.easyChatWords = {0x100B, 0x1E0F, 0x1039, 0x1421, 0xC03, 0xFFFF},
}, },
{ {
.name = {_("ヨウカ"), _("MACY"), _("AMELIE"), _("CLEO"), _("MARIA"), _("ELISA")}, .name = {_("ヨウカ"), _("MACY"), _("AMELIE"), _("CLEO"), _("MARIA"), _("ELISA")},
.otId = 0x1E43, .otId = 0x1E43,
.facilityClass = 0x27, .facilityClass = 0x27,
.species = {SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY}, .species = {SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY},
.rest = {4, 0, 15, 0x1e, 0x14, 16, 6, 16, 15, 0x28, 0x1c, 0x1c, 0x13, 0x1c}, .id = 4,
.easyChatWords = {0x1E0F, 0x1014, 0x1006, 0x280F, 0x1C1C, 0x1C13},
}, },
{ {
.name = {_("ヤスシ"), _("DONTE"), _("BRAHIM"), _("GLAUCO"), _("JOSEF"), _("ROQUE")}, .name = {_("ヤスシ"), _("DONTE"), _("BRAHIM"), _("GLAUCO"), _("JOSEF"), _("ROQUE")},
.otId = 0x379F, .otId = 0x379F,
.facilityClass = 0x30, .facilityClass = 0x30,
.species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA}, .species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA},
.rest = {5, 0, 0x29, 0x0A, 0x08, 0x14, 0x2F, 0x10, 0x38, 0x16, 0x20, 0x08, 0x00, 0x0C}, .id = 5,
.easyChatWords = {0xA29, 0x1408, 0x102F, 0x1638, 0x820, 0xC00},
}, },
{ {
.name = {_("ミサオ"), _("AMIRA"), _("LAURE"), _("DAFNE"), _("AMELIE"), _("LARA")}, .name = {_("ミサオ"), _("AMIRA"), _("LAURE"), _("DAFNE"), _("AMELIE"), _("LARA")},
.otId = 0xF555, .otId = 0xF555,
.facilityClass = 0x31, .facilityClass = 0x31,
.species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO}, .species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO},
.rest = {6, 0, 0x0B, 0x0C, 0x3E, 0x12, 0x00, 0x0C, 0x31, 0x0A, 0x30, 0x14, 0x00, 0x0C}, .id = 6,
.easyChatWords = {0xC0B, 0x123E, 0xC00, 0xA31, 0x1430, 0xC00},
}, },
{ {
.name = {_("カズサ"), _("KALI"), _("JODIE"), _("ILENIA"), _("KARO"), _("ELSA")}, .name = {_("カズサ"), _("KALI"), _("JODIE"), _("ILENIA"), _("KARO"), _("ELSA")},
.otId = 0x8D26, .otId = 0x8D26,
.facilityClass = 0x14, .facilityClass = 0x14,
.species = {SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC}, .species = {SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC},
.rest = {7, 0, 0x06, 0x0A, 0x20, 0x06, 0x1F, 0x0A, 0x02, 0x0A, 0x03, 0x0C, 0xFF, 0xFF}, .id = 7,
.easyChatWords = {0xA06, 0x620, 0xA1F, 0xA02, 0xC03, 0xFFFF},
}, },
{ {
.name = {_("スミレ"), _("ANNIE"), _("ANNIE"), _("IMELDA"), _("INES"), _("ROSA")}, .name = {_("スミレ"), _("ANNIE"), _("ANNIE"), _("IMELDA"), _("INES"), _("ROSA")},
.otId = 0x800C, .otId = 0x800C,
.facilityClass = 0xD, .facilityClass = 0xD,
.species = {SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY}, .species = {SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY},
.rest = {8, 0, 0x22, 0x1E, 0x33, 0x04, 0x0E, 0x02, 0x02, 0x0A, 0x1E, 0x10, 0x00, 0x0C}, .id = 8,
.easyChatWords = {0x1E22, 0x433, 0x20E, 0xA02, 0x101E, 0xC00},
}, },
{ {
.name = {_("アキノリ"), _("DILLEN"), _("RENE"), _("INDRO"), _("DETLEF"), _("PEDRO")}, .name = {_("アキノリ"), _("DILLEN"), _("RENE"), _("INDRO"), _("DETLEF"), _("PEDRO")},
.otId = 0x469f, .otId = 0x469f,
.facilityClass = 0, .facilityClass = 0,
.species = {SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON}, .species = {SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON},
.rest = {9, 0, 0x3D, 0x0A, 0x11, 0x10, 0x1E, 0x0E, 0x1C, 0x20, 0x04, 0x0C, 0xFF, 0xFF}, .id = 9,
.easyChatWords = {0xA3D, 0x1011, 0xE1E, 0x201C, 0xC04, 0xFFFF},
}, },
{ {
.name = {_("トウゾウ"), _("DALLAS"), _("BRUNO"), _("LEARCO"), _("ANSGAR"), _("MANOLO")}, .name = {_("トウゾウ"), _("DALLAS"), _("BRUNO"), _("LEARCO"), _("ANSGAR"), _("MANOLO")},
.otId = 0x71FC, .otId = 0x71FC,
.facilityClass = 0x2D, .facilityClass = 0x2D,
.species = {SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA}, .species = {SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA},
.rest = {10, 0, 0x05, 0x0A, 0x06, 0x06, 0x0E, 0x16, 0x14, 0x0A, 0x00, 0x0C, 0xFF, 0xFF}, .id = 10,
.easyChatWords = {0xA05, 0x606, 0x160E, 0xA14, 0xC00, 0xFFFF},
}, },
{ {
.name = {_("セイヤ"), _("FRANK"), _("FRANK"), _("OLINDO"), _("FRANK"), _("MAURO")}, .name = {_("セイヤ"), _("FRANK"), _("FRANK"), _("OLINDO"), _("FRANK"), _("MAURO")},
.otId = 0xA39E, .otId = 0xA39E,
.facilityClass = 0x3A, .facilityClass = 0x3A,
.species = {SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE}, .species = {SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE},
.rest = {11, 0, 0x0E, 0x28, 0x3D, 0x10, 0x0F, 0x24, 0x14, 0x0A, 0x23, 0x1E, 0x24, 0x10}, .id = 11,
.easyChatWords = {0x280E, 0x103D, 0x240F, 0xA14, 0x1E23, 0x1024},
}, },
{ {
.name = {_("リュウジ"), _("LAMONT"), _("XAV"), _("ORFEO"), _("JÜRGEN"), _("JORGE")}, .name = {_("リュウジ"), _("LAMONT"), _("XAV"), _("ORFEO"), _("JÜRGEN"), _("JORGE")},
.otId = 0xE590, .otId = 0xE590,
.facilityClass = 0x19, .facilityClass = 0x19,
.species = {SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING}, .species = {SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING},
.rest = {12, 0, 0x20, 0x10, 0x2E, 0x06, 0x0B, 0x10, 0x22, 0x1E, 0x0F, 0x1E, 0x0B, 0x10}, .id = 12,
.easyChatWords = {0x1020, 0x62E, 0x100B, 0x1E22, 0x1E0F, 0x100B},
}, },
{ {
.name = {_("カツアキ"), _("TYRESE"), _("ANDY"), _("PARIDE"), _("DAVID"), _("CHICHO")}, .name = {_("カツアキ"), _("TYRESE"), _("ANDY"), _("PARIDE"), _("DAVID"), _("CHICHO")},
.otId = 0xD018, .otId = 0xD018,
.facilityClass = 10, .facilityClass = 10,
.species = {SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING}, .species = {SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING},
.rest = {13, 0, 0x29, 0x0A, 0x3A, 0x06, 0x15, 0x0E, 0x35, 0x14, 0x34, 0x10, 0x1E, 0x06}, .id = 13,
.easyChatWords = {0xA29, 0x63A, 0xE15, 0x1435, 0x1034, 0x61E},
}, },
{ {
.name = {_("トシミツ"), _("DANTE"), _("DANTE"), _("RAOUL"), _("LOTHAR"), _("PABLO")}, .name = {_("トシミツ"), _("DANTE"), _("DANTE"), _("RAOUL"), _("LOTHAR"), _("PABLO")},
.otId = 0xBC75, .otId = 0xBC75,
.facilityClass = 14, .facilityClass = 14,
.species = {SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM}, .species = {SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM},
.rest = {14, 0, 0x01, 0x0A, 0x17, 0x10, 0x43, 0x12, 0x22, 0x1E, 0x0B, 0x10, 0x0F, 0x28}, .id = 14,
.easyChatWords = {0xA01, 0x1017, 0x1243, 0x1E22, 0x100B, 0x280F},
}, },
{ {
.name = {_("ローウェン"), _("ARTURO"), _("ARTURO"), _("ROMOLO"), _("BRIAN"), _("ARTURO")}, .name = {_("ローウェン"), _("ARTURO"), _("ARTURO"), _("ROMOLO"), _("BRIAN"), _("ARTURO")},
.otId = 0xFA02, .otId = 0xFA02,
.facilityClass = 0x20, .facilityClass = 0x20,
.species = {SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS}, .species = {SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS},
.rest = {15, 0, 0x0F, 0x1E, 0x04, 0x14, 0x2F, 0x10, 0x06, 0x10, 0x20, 0x10, 0x03, 0x0E}, .id = 15,
.easyChatWords = {0x1E0F, 0x1404, 0x102F, 0x1006, 0x1020, 0xE03},
}, },
}; };
@@ -2222,7 +2238,7 @@ static void sub_81A1370(void)
r9 = -1; r9 = -1;
for (i = 1; i < 4; i++) for (i = 1; i < 4; i++)
{ {
if (ReadUnalignedWord(gSaveBlock2Ptr->apprentices[i].playerId) == ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId) if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId)
&& gSaveBlock2Ptr->apprentices[i].number < r10) && gSaveBlock2Ptr->apprentices[i].number < r10)
{ {
r10 = gSaveBlock2Ptr->apprentices[i].number; r10 = gSaveBlock2Ptr->apprentices[i].number;
src/battle_dome.c
+75 -75
View File
@@ -3,6 +3,7 @@
#include "battle.h" #include "battle.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "frontier_util.h"
#include "battle_message.h" #include "battle_message.h"
#include "event_data.h" #include "event_data.h"
#include "overworld.h" #include "overworld.h"
@@ -56,13 +57,12 @@ struct UnkStruct_860DD10
}; };
extern void sub_81B8558(void); extern void sub_81B8558(void);
extern u32 sub_81A39C4(void); extern u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId);
extern u16 sub_81A5060(u8 monId, u8 moveSlotId); extern u8 GetFrontierBrainMonEvs(u8, u8);
extern u8 sub_81A50F0(u8, u8); extern u8 GetFrontierBrainMonNature(u8);
extern u8 sub_81A50B0(u8);
extern void sub_81A4C30(void); extern void sub_81A4C30(void);
extern bool8 sub_81A3610(void); extern u8 sub_81A3610(void);
extern u16 sub_81A4FF0(u8); extern u16 GetFrontierBrainMonSpecies(u8);
extern void ReducePlayerPartyToThree(void); extern void ReducePlayerPartyToThree(void);
extern u8 gUnknown_0203CEF8[]; extern u8 gUnknown_0203CEF8[];
@@ -2408,7 +2408,7 @@ static void sub_818E9CC(void)
gSaveBlock2Ptr->frontier.field_CA9_a = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0;
gSaveBlock2Ptr->frontier.field_CA9_b = 0; gSaveBlock2Ptr->frontier.field_CA9_b = 0;
if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860D0EC[battleMode][lvlMode])) if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860D0EC[battleMode][lvlMode]))
gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode] = 0; gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = 0;
saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
gTrainerBattleOpponent_A = 0; gTrainerBattleOpponent_A = 0;
@@ -2422,7 +2422,7 @@ static void sub_818EA84(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case 0:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode];
break; break;
case 1: case 1:
gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860D0EC[battleMode][lvlMode]) != 0); gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860D0EC[battleMode][lvlMode]) != 0);
@@ -2490,7 +2490,7 @@ static void sub_818ED28(void)
switch (gSpecialVar_0x8005) switch (gSpecialVar_0x8005)
{ {
case 0: case 0:
gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode] = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006;
break; break;
case 1: case 1:
if (gSpecialVar_0x8006) if (gSpecialVar_0x8006)
@@ -2575,7 +2575,7 @@ static void InitDomeTrainers(void)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
gSaveBlock2Ptr->frontier.domeMonId[0][i] = GetMonData(&gPlayerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_SPECIES, NULL); gSaveBlock2Ptr->frontier.domeMonIds[0][i] = GetMonData(&gPlayerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_SPECIES, NULL);
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
gSaveBlock2Ptr->frontier.field_EFC[i].moves[j] = GetMonData(&gPlayerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_MOVE1 + j, NULL); gSaveBlock2Ptr->frontier.field_EFC[i].moves[j] = GetMonData(&gPlayerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_MOVE1 + j, NULL);
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
@@ -2590,7 +2590,7 @@ static void InitDomeTrainers(void)
{ {
do do
{ {
trainerId = sub_8162548(sub_81A39C4(), 0); trainerId = sub_8162548(GetCurrentFacilityWinStreak(), 0);
for (j = 1; j < i; j++) for (j = 1; j < i; j++)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId == trainerId) if (gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId == trainerId)
@@ -2603,7 +2603,7 @@ static void InitDomeTrainers(void)
{ {
do do
{ {
trainerId = sub_8162548(sub_81A39C4() + 1, 0); trainerId = sub_8162548(GetCurrentFacilityWinStreak() + 1, 0);
for (j = 1; j < i; j++) for (j = 1; j < i; j++)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId == trainerId) if (gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId == trainerId)
@@ -2621,7 +2621,7 @@ static void InitDomeTrainers(void)
monTournamentId = RandomizeFacilityTrainerMonId(trainerId); monTournamentId = RandomizeFacilityTrainerMonId(trainerId);
for (k = 0; k < j; k++) for (k = 0; k < j; k++)
{ {
s32 checkingMonId = gSaveBlock2Ptr->frontier.domeMonId[i][k]; s32 checkingMonId = gSaveBlock2Ptr->frontier.domeMonIds[i][k];
if (checkingMonId == monTournamentId if (checkingMonId == monTournamentId
|| species[0] == gFacilityTrainerMons[monTournamentId].species || species[0] == gFacilityTrainerMons[monTournamentId].species
|| species[1] == gFacilityTrainerMons[monTournamentId].species || species[1] == gFacilityTrainerMons[monTournamentId].species
@@ -2630,7 +2630,7 @@ static void InitDomeTrainers(void)
} }
} while (k != j); } while (k != j);
gSaveBlock2Ptr->frontier.domeMonId[i][j] = monTournamentId; gSaveBlock2Ptr->frontier.domeMonIds[i][j] = monTournamentId;
species[j] = gFacilityTrainerMons[monTournamentId].species; species[j] = gFacilityTrainerMons[monTournamentId].species;
} }
@@ -2671,10 +2671,10 @@ static void InitDomeTrainers(void)
ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
{ {
CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species, CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species,
monLevel, ivs, monLevel, ivs,
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].evSpread, gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].evSpread,
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].nature, gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].nature,
statValues); statValues);
statSums[i] += statValues[STAT_ATK]; statSums[i] += statValues[STAT_ATK];
@@ -2683,8 +2683,8 @@ static void InitDomeTrainers(void)
statSums[i] += statValues[STAT_SPDEF]; statSums[i] += statValues[STAT_SPDEF];
statSums[i] += statValues[STAT_SPEED]; statSums[i] += statValues[STAT_SPEED];
statSums[i] += statValues[STAT_HP]; statSums[i] += statValues[STAT_HP];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species].type1]; monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type1];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species].type2]; monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type2];
} }
for (monTypesCount = 0, j = 0; j < 32; j++) for (monTypesCount = 0, j = 0; j < 32; j++)
@@ -2737,7 +2737,7 @@ static void InitDomeTrainers(void)
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
gSaveBlock2Ptr->frontier.domeMonId[j][i] = sub_81A4FF0(i); gSaveBlock2Ptr->frontier.domeMonIds[j][i] = GetFrontierBrainMonSpecies(i);
} }
Free(statSums); Free(statSums);
@@ -2799,7 +2799,7 @@ static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray)
SWAP(gSaveBlock2Ptr->frontier.domeTrainers[id1].trainerId, gSaveBlock2Ptr->frontier.domeTrainers[id2].trainerId, temp); SWAP(gSaveBlock2Ptr->frontier.domeTrainers[id1].trainerId, gSaveBlock2Ptr->frontier.domeTrainers[id2].trainerId, temp);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
SWAP(gSaveBlock2Ptr->frontier.domeMonId[id1][i], gSaveBlock2Ptr->frontier.domeMonId[id2][i], temp); SWAP(gSaveBlock2Ptr->frontier.domeMonIds[id1][i], gSaveBlock2Ptr->frontier.domeMonIds[id2][i], temp);
} }
static void sub_818F9B0(void) static void sub_818F9B0(void)
@@ -2829,24 +2829,24 @@ static void CreateDomeMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentM
u8 fixedIv = GetDomeTrainerMonIvs(tournamentTrainerId); // BUG: Should be using trainerId instead of tournamentTrainerId. As a result, all Pokemon have ivs of 3. u8 fixedIv = GetDomeTrainerMonIvs(tournamentTrainerId); // BUG: Should be using trainerId instead of tournamentTrainerId. As a result, all Pokemon have ivs of 3.
u8 level = SetFacilityPtrsGetLevel(); u8 level = SetFacilityPtrsGetLevel();
CreateMonWithEVSpreadPersonalityOTID(&gEnemyParty[monPartyId], CreateMonWithEVSpreadPersonalityOTID(&gEnemyParty[monPartyId],
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][tournamentMonId]].species, gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][tournamentMonId]].species,
level, level,
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][tournamentMonId]].nature, gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][tournamentMonId]].nature,
fixedIv, fixedIv,
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][tournamentMonId]].evSpread, otId); gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][tournamentMonId]].evSpread, otId);
happiness = 0xFF; happiness = 0xFF;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
SetMonMoveSlot(&gEnemyParty[monPartyId], SetMonMoveSlot(&gEnemyParty[monPartyId],
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][tournamentMonId]].moves[i], i); gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][tournamentMonId]].moves[i], i);
if (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][tournamentMonId]].moves[i] == MOVE_FRUSTRATION) if (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][tournamentMonId]].moves[i] == MOVE_FRUSTRATION)
happiness = 0; happiness = 0;
} }
SetMonData(&gEnemyParty[monPartyId], MON_DATA_FRIENDSHIP, &happiness); SetMonData(&gEnemyParty[monPartyId], MON_DATA_FRIENDSHIP, &happiness);
SetMonData(&gEnemyParty[monPartyId], MON_DATA_HELD_ITEM, SetMonData(&gEnemyParty[monPartyId], MON_DATA_HELD_ITEM,
&gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][tournamentMonId]].itemTableId]); &gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][tournamentMonId]].itemTableId]);
} }
static void CreateDomeTrainerMons(u16 tournamentTrainerId) static void CreateDomeTrainerMons(u16 tournamentTrainerId)
@@ -2856,7 +2856,7 @@ static void CreateDomeTrainerMons(u16 tournamentTrainerId)
s32 i, bits; s32 i, bits;
ZeroEnemyPartyMons(); ZeroEnemyPartyMons();
bits = GetTrainerMonCountInBits(tournamentTrainerId); bits = GetDomeTrainerMonCountInBits(tournamentTrainerId);
otId = Random32(); otId = Random32();
if (Random() % 10 > 5) if (Random() % 10 > 5)
{ {
@@ -2884,7 +2884,7 @@ static void CreateDomeTrainerMons(u16 tournamentTrainerId)
} }
} }
s32 GetTrainerMonCountInBits(u16 tournamentTrainerId) s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId)
{ {
s32 bits; s32 bits;
if (Random() & 1) if (Random() & 1)
@@ -2917,12 +2917,12 @@ static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN) if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN)
{ {
array[i] += GetTypeEffectivenessPoints(sub_81A5060(i, moveId), array[i] += GetTypeEffectivenessPoints(GetFrontierBrainMonMove(i, moveId),
GetMonData(&gPlayerParty[playerMonId], MON_DATA_SPECIES, NULL), 0); GetMonData(&gPlayerParty[playerMonId], MON_DATA_SPECIES, NULL), 0);
} }
else else
{ {
array[i] += GetTypeEffectivenessPoints(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][i]].moves[moveId], array[i] += GetTypeEffectivenessPoints(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][i]].moves[moveId],
GetMonData(&gPlayerParty[playerMonId], MON_DATA_SPECIES, NULL), 0); GetMonData(&gPlayerParty[playerMonId], MON_DATA_SPECIES, NULL), 0);
} }
} }
@@ -2945,12 +2945,12 @@ static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN) if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentTrainerId].trainerId == TRAINER_FRONTIER_BRAIN)
{ {
array[i] += GetTypeEffectivenessPoints(sub_81A5060(i, moveId), array[i] += GetTypeEffectivenessPoints(GetFrontierBrainMonMove(i, moveId),
GetMonData(&gPlayerParty[playerMonId], MON_DATA_SPECIES, NULL), 1); GetMonData(&gPlayerParty[playerMonId], MON_DATA_SPECIES, NULL), 1);
} }
else else
{ {
array[i] += GetTypeEffectivenessPoints(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentTrainerId][i]].moves[moveId], array[i] += GetTypeEffectivenessPoints(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][i]].moves[moveId],
GetMonData(&gPlayerParty[playerMonId], MON_DATA_SPECIES, NULL), 1); GetMonData(&gPlayerParty[playerMonId], MON_DATA_SPECIES, NULL), 1);
} }
} }
@@ -3481,13 +3481,13 @@ static void sub_819033C(void)
u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
if (gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode] < 999) if (gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] < 999)
gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode]++; gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode]++;
if (gSaveBlock2Ptr->frontier.field_D1C[battleMode][lvlMode] < 999) if (gSaveBlock2Ptr->frontier.domeTotalChampionships[battleMode][lvlMode] < 999)
gSaveBlock2Ptr->frontier.field_D1C[battleMode][lvlMode]++; gSaveBlock2Ptr->frontier.domeTotalChampionships[battleMode][lvlMode]++;
if (gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode] > gSaveBlock2Ptr->frontier.field_D14[battleMode][lvlMode]) if (gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode] > gSaveBlock2Ptr->frontier.domeRecordWinStreaks[battleMode][lvlMode])
gSaveBlock2Ptr->frontier.field_D14[battleMode][lvlMode] = gSaveBlock2Ptr->frontier.field_D0C[battleMode][lvlMode]; gSaveBlock2Ptr->frontier.domeRecordWinStreaks[battleMode][lvlMode] = gSaveBlock2Ptr->frontier.domeWinStreaks[battleMode][lvlMode];
} }
static void ShowDomeOpponentInfo(void) static void ShowDomeOpponentInfo(void)
@@ -4756,7 +4756,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
{ {
if (trainerId == TRAINER_PLAYER) if (trainerId == TRAINER_PLAYER)
{ {
sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i], sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i],
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sInfoTrainerMonX[i], x | sInfoTrainerMonX[i],
y + sInfoTrainerMonY[i], y + sInfoTrainerMonY[i],
@@ -4765,7 +4765,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
} }
else if (trainerId == TRAINER_FRONTIER_BRAIN) else if (trainerId == TRAINER_FRONTIER_BRAIN)
{ {
sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i], sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i],
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sInfoTrainerMonX[i], x | sInfoTrainerMonX[i],
y + sInfoTrainerMonY[i], y + sInfoTrainerMonY[i],
@@ -4774,7 +4774,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
} }
else else
{ {
sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].species, sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].species,
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sInfoTrainerMonX[i], x | sInfoTrainerMonX[i],
y + sInfoTrainerMonY[i], y + sInfoTrainerMonY[i],
@@ -4837,11 +4837,11 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
{ {
textPrinter.currentY = gUnknown_0860D346[i]; textPrinter.currentY = gUnknown_0860D346[i];
if (trainerId == TRAINER_PLAYER) if (trainerId == TRAINER_PLAYER)
textPrinter.currentChar = gSpeciesNames[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]]; textPrinter.currentChar = gSpeciesNames[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]];
else if (trainerId == TRAINER_FRONTIER_BRAIN) else if (trainerId == TRAINER_FRONTIER_BRAIN)
textPrinter.currentChar = gSpeciesNames[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]]; textPrinter.currentChar = gSpeciesNames[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]];
else else
textPrinter.currentChar = gSpeciesNames[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].species]; textPrinter.currentChar = gSpeciesNames[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].species];
textPrinter.windowId = 1 + i + windowId; textPrinter.windowId = 1 + i + windowId;
if (i == 1) if (i == 1)
@@ -4875,11 +4875,11 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
for (k = 0; k < DOME_TOURNAMENT_TRAINERS_COUNT; k++) for (k = 0; k < DOME_TOURNAMENT_TRAINERS_COUNT; k++)
{ {
if (trainerId == TRAINER_FRONTIER_BRAIN) if (trainerId == TRAINER_FRONTIER_BRAIN)
allocatedArray[k] += sMovePointsForDomeTrainers[sub_81A5060(i, j)][k]; allocatedArray[k] += sMovePointsForDomeTrainers[GetFrontierBrainMonMove(i, j)][k];
else if (trainerId == TRAINER_PLAYER) else if (trainerId == TRAINER_PLAYER)
allocatedArray[k] += sMovePointsForDomeTrainers[gSaveBlock2Ptr->frontier.field_EFC[i].moves[j]][k]; allocatedArray[k] += sMovePointsForDomeTrainers[gSaveBlock2Ptr->frontier.field_EFC[i].moves[j]][k];
else else
allocatedArray[k] += sMovePointsForDomeTrainers[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].moves[j]][k]; allocatedArray[k] += sMovePointsForDomeTrainers[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].moves[j]][k];
} }
} }
} }
@@ -4916,7 +4916,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
{ {
if (trainerId == TRAINER_FRONTIER_BRAIN) if (trainerId == TRAINER_FRONTIER_BRAIN)
allocatedArray[j] = sub_81A50F0(i, j); allocatedArray[j] = GetFrontierBrainMonEvs(i, j);
else else
allocatedArray[j] = gSaveBlock2Ptr->frontier.field_EFC[i].evs[j]; allocatedArray[j] = gSaveBlock2Ptr->frontier.field_EFC[i].evs[j];
} }
@@ -4924,7 +4924,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
for (j = 0; j < 5; j++) for (j = 0; j < 5; j++)
{ {
if (trainerId == TRAINER_FRONTIER_BRAIN) if (trainerId == TRAINER_FRONTIER_BRAIN)
nature = sub_81A50B0(i); nature = GetFrontierBrainMonNature(i);
else else
nature = gSaveBlock2Ptr->frontier.field_EFC[i].nature; nature = gSaveBlock2Ptr->frontier.field_EFC[i].nature;
@@ -4952,7 +4952,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
{ {
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
s32 evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].evSpread; s32 evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].evSpread;
for (k = 0, j = 0; j < 6; j++) for (k = 0, j = 0; j < 6; j++)
{ {
allocatedArray[j] = 0; allocatedArray[j] = 0;
@@ -4961,7 +4961,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
evBits >>= 1; evBits >>= 1;
} }
k = MAX_TOTAL_EVS / k; k = MAX_TOTAL_EVS / k;
evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].evSpread; evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].evSpread;
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
{ {
if (evBits & 1) if (evBits & 1)
@@ -4972,7 +4972,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
allocatedArray[6] += allocatedArray[0]; allocatedArray[6] += allocatedArray[0];
for (j = 0; j < 5; j++) for (j = 0; j < 5; j++)
{ {
nature = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[trainerTournamentId][i]].nature; nature = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].nature;
if (gNatureStatTable[nature][j] > 0) if (gNatureStatTable[nature][j] > 0)
{ {
allocatedArray[j + 7] += (allocatedArray[j + 1] * 110) / 100; allocatedArray[j + 7] += (allocatedArray[j + 1] * 110) / 100;
@@ -5210,7 +5210,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
{ {
if (trainerIds[0] == TRAINER_PLAYER) if (trainerIds[0] == TRAINER_PLAYER)
{ {
sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i], sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonIds[tournamentIds[0]][i],
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sFirstTrainerMonX[i], x | sFirstTrainerMonX[i],
y + sFirstTrainerMonY[i], y + sFirstTrainerMonY[i],
@@ -5219,7 +5219,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
} }
else if (trainerIds[0] == TRAINER_FRONTIER_BRAIN) else if (trainerIds[0] == TRAINER_FRONTIER_BRAIN)
{ {
sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i], sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonIds[tournamentIds[0]][i],
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sFirstTrainerMonX[i], x | sFirstTrainerMonX[i],
y + sFirstTrainerMonY[i], y + sFirstTrainerMonY[i],
@@ -5228,7 +5228,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
} }
else else
{ {
sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[0]][i]].species, sBattleDomeStruct->arr[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentIds[0]][i]].species,
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sFirstTrainerMonX[i], x | sFirstTrainerMonX[i],
y + sFirstTrainerMonY[i], y + sFirstTrainerMonY[i],
@@ -5250,7 +5250,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
{ {
if (trainerIds[1] == TRAINER_PLAYER) if (trainerIds[1] == TRAINER_PLAYER)
{ {
sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i], sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonIds[tournamentIds[1]][i],
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sSecondTrainerMonX[i], x | sSecondTrainerMonX[i],
y + sSecondTrainerMonY[i], y + sSecondTrainerMonY[i],
@@ -5259,7 +5259,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
} }
else if (trainerIds[1] == TRAINER_FRONTIER_BRAIN) else if (trainerIds[1] == TRAINER_FRONTIER_BRAIN)
{ {
sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i], sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gSaveBlock2Ptr->frontier.domeMonIds[tournamentIds[1]][i],
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sSecondTrainerMonX[i], x | sSecondTrainerMonX[i],
y + sSecondTrainerMonY[i], y + sSecondTrainerMonY[i],
@@ -5268,7 +5268,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
} }
else else
{ {
sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentIds[1]][i]].species, sBattleDomeStruct->arr[5 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentIds[1]][i]].species,
SpriteCb_MonIcon, SpriteCb_MonIcon,
x | sSecondTrainerMonX[i], x | sSecondTrainerMonX[i],
y + sSecondTrainerMonY[i], y + sSecondTrainerMonY[i],
@@ -5564,9 +5564,9 @@ static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roun
{ {
moveScores[i * 4 + j] = 0; moveScores[i * 4 + j] = 0;
if (gSaveBlock2Ptr->frontier.domeTrainers[winnerTournamentId].trainerId == TRAINER_FRONTIER_BRAIN) if (gSaveBlock2Ptr->frontier.domeTrainers[winnerTournamentId].trainerId == TRAINER_FRONTIER_BRAIN)
moveIds[i * 4 + j] = sub_81A5060(i, j); moveIds[i * 4 + j] = GetFrontierBrainMonMove(i, j);
else else
moveIds[i * 4 + j] = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[winnerTournamentId][i]].moves[j]; moveIds[i * 4 + j] = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[winnerTournamentId][i]].moves[j];
movePower = gBattleMoves[moveIds[i * 4 + j]].power; movePower = gBattleMoves[moveIds[i * 4 + j]].power;
if (movePower == 0) if (movePower == 0)
@@ -5584,9 +5584,9 @@ static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roun
do do
{ {
var = Random32(); var = Random32();
} while (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[loserTournamentId][k]].nature != GetNatureFromPersonality(var)); } while (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[loserTournamentId][k]].nature != GetNatureFromPersonality(var));
targetSpecies = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[loserTournamentId][k]].species; targetSpecies = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[loserTournamentId][k]].species;
if (var & 1) if (var & 1)
targetAbility = gBaseStats[targetSpecies].ability2; targetAbility = gBaseStats[targetSpecies].ability2;
else else
@@ -6193,7 +6193,7 @@ static void sub_8194F58(void)
monTournamentId = RandomizeFacilityTrainerMonId(trainerId); monTournamentId = RandomizeFacilityTrainerMonId(trainerId);
for (k = 0; k < j; k++) for (k = 0; k < j; k++)
{ {
s32 checkingMonId = gSaveBlock2Ptr->frontier.domeMonId[i][k]; s32 checkingMonId = gSaveBlock2Ptr->frontier.domeMonIds[i][k];
if (checkingMonId == monTournamentId if (checkingMonId == monTournamentId
|| species[0] == gFacilityTrainerMons[monTournamentId].species || species[0] == gFacilityTrainerMons[monTournamentId].species
|| species[1] == gFacilityTrainerMons[monTournamentId].species || species[1] == gFacilityTrainerMons[monTournamentId].species
@@ -6202,7 +6202,7 @@ static void sub_8194F58(void)
} }
} while (k != j); } while (k != j);
gSaveBlock2Ptr->frontier.domeMonId[i][j] = monTournamentId; gSaveBlock2Ptr->frontier.domeMonIds[i][j] = monTournamentId;
species[j] = gFacilityTrainerMons[monTournamentId].species; species[j] = gFacilityTrainerMons[monTournamentId].species;
} }
gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated = 0; gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated = 0;
@@ -6218,10 +6218,10 @@ static void sub_8194F58(void)
ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
{ {
CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species, CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species,
monLevel, ivs, monLevel, ivs,
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].evSpread, gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].evSpread,
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].nature, gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].nature,
statValues); statValues);
statSums[i] += statValues[STAT_ATK]; statSums[i] += statValues[STAT_ATK];
@@ -6230,8 +6230,8 @@ static void sub_8194F58(void)
statSums[i] += statValues[STAT_SPDEF]; statSums[i] += statValues[STAT_SPDEF];
statSums[i] += statValues[STAT_SPEED]; statSums[i] += statValues[STAT_SPEED];
statSums[i] += statValues[STAT_HP]; statSums[i] += statValues[STAT_HP];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species].type1]; monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type1];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species].type2]; monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type2];
} }
// Because GF hates temporary vars, trainerId acts like monTypesCount here. // Because GF hates temporary vars, trainerId acts like monTypesCount here.
@@ -6347,11 +6347,11 @@ static void DecideRoundWinners(u8 roundId)
{ {
for (monId2 = 0; monId2 < 3; monId2++) for (monId2 = 0; monId2 < 3; monId2++)
{ {
points1 += GetTypeEffectivenessPoints(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId1][monId1]].moves[moveSlot], points1 += GetTypeEffectivenessPoints(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentId1][monId1]].moves[moveSlot],
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId2][monId2]].species, 2); gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentId2][monId2]].species, 2);
} }
} }
species = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId1][monId1]].species; species = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentId1][monId1]].species;
points1 += ( gBaseStats[species].baseHP points1 += ( gBaseStats[species].baseHP
+ gBaseStats[species].baseAttack + gBaseStats[species].baseAttack
+ gBaseStats[species].baseDefense + gBaseStats[species].baseDefense
@@ -6370,11 +6370,11 @@ static void DecideRoundWinners(u8 roundId)
{ {
for (monId2 = 0; monId2 < 3; monId2++) for (monId2 = 0; monId2 < 3; monId2++)
{ {
points2 += GetTypeEffectivenessPoints(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId2][monId1]].moves[moveSlot], points2 += GetTypeEffectivenessPoints(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentId2][monId1]].moves[moveSlot],
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId1][monId2]].species, 2); gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentId1][monId2]].species, 2);
} }
} }
species = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId2][monId1]].species; species = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentId2][monId1]].species;
points2 += ( gBaseStats[species].baseHP points2 += ( gBaseStats[species].baseHP
+ gBaseStats[species].baseAttack + gBaseStats[species].baseAttack
+ gBaseStats[species].baseDefense + gBaseStats[species].baseDefense
src/battle_factory.c
+1 -1
View File
@@ -1670,7 +1670,7 @@ static void CreateFrontierFactorySelectableMons(u8 firstMonId)
u32 otId = 0; u32 otId = 0;
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u8 var_2C = gSaveBlock2Ptr->frontier.field_DE2[battleMode][lvlMode] / 7; u8 var_2C = gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] / 7;
u8 var_28 = 0; u8 var_28 = 0;
gFacilityTrainerMons = gBattleFrontierMons; gFacilityTrainerMons = gBattleFrontierMons;
src/battle_frontier_1.c
+9 -9
View File
@@ -27,7 +27,7 @@ void sub_8195980(void)
gSaveBlock2Ptr->frontier.field_CA9_a = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0;
gSaveBlock2Ptr->frontier.field_CA9_b = 0; gSaveBlock2Ptr->frontier.field_CA9_b = 0;
if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860DE98[battleMode][lvlMode])) if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860DE98[battleMode][lvlMode]))
gSaveBlock2Ptr->frontier.field_DC8[battleMode][lvlMode] = 0; gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = 0;
saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
gTrainerBattleOpponent_A = 0; gTrainerBattleOpponent_A = 0;
@@ -44,7 +44,7 @@ void sub_8195A38(void)
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_DC4[1]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_DC4[1];
break; break;
case 1: case 1:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_DC8[battleMode][lvlMode]; gSpecialVar_Result = gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode];
break; break;
case 2: case 2:
gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860DE98[battleMode][lvlMode]) != 0); gSpecialVar_Result = ((gSaveBlock2Ptr->frontier.field_CDC & gUnknown_0860DE98[battleMode][lvlMode]) != 0);
@@ -63,7 +63,7 @@ void sub_8195AE4(void)
gSaveBlock2Ptr->frontier.field_DC4[1] = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.field_DC4[1] = gSpecialVar_0x8006;
break; break;
case 1: case 1:
gSaveBlock2Ptr->frontier.field_DC8[battleMode][lvlMode] = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006;
break; break;
case 2: case 2:
if (gSpecialVar_0x8006) if (gSpecialVar_0x8006)
@@ -79,9 +79,9 @@ void sub_8195BB0(void)
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
if (gSaveBlock2Ptr->frontier.field_DC8[battleMode][lvlMode] < 50) if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] < 50)
gSpecialVar_Result = Random() % 3; gSpecialVar_Result = Random() % 3;
else if (gSaveBlock2Ptr->frontier.field_DC8[battleMode][lvlMode] < 99) else if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] < 99)
gSpecialVar_Result = 3; gSpecialVar_Result = 3;
else else
gSpecialVar_Result = 4; gSpecialVar_Result = 4;
@@ -105,14 +105,14 @@ void sub_8195C7C(void)
u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
if (gSaveBlock2Ptr->frontier.field_DC8[battleMode][lvlMode] < 9999) if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] < 9999)
{ {
u16 wat = 0; u16 wat = 0;
gSaveBlock2Ptr->frontier.field_DC8[battleMode][lvlMode]++; gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode]++;
if (lvlMode < gSaveBlock2Ptr->frontier.field_DD0[battleMode][lvlMode]) if (lvlMode < gSaveBlock2Ptr->frontier.field_DD0[battleMode][lvlMode])
wat = 1; wat = 1;
if (gSaveBlock2Ptr->frontier.field_DC8[battleMode][wat] != 0) if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][wat] != 0)
gSaveBlock2Ptr->frontier.field_DD0[battleMode][lvlMode] = gSaveBlock2Ptr->frontier.field_DC8[battleMode][lvlMode]; gSaveBlock2Ptr->frontier.field_DD0[battleMode][lvlMode] = gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode];
} }
} }
*/ */
src/battle_main.c
+1 -1
View File
@@ -3027,7 +3027,7 @@ static void BattleStartClearSetData(void)
if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gSaveBlock2Ptr->optionsBattleSceneOff == TRUE) if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gSaveBlock2Ptr->optionsBattleSceneOff == TRUE)
gHitMarker |= HITMARKER_NO_ANIMATIONS; gHitMarker |= HITMARKER_NO_ANIMATIONS;
} }
else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleStyleInRecordedBattle()) else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleSceneInRecordedBattle())
gHitMarker |= HITMARKER_NO_ANIMATIONS; gHitMarker |= HITMARKER_NO_ANIMATIONS;
gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle; gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle;
src/battle_message.c
+5 -5
View File
@@ -17,7 +17,7 @@
#include "menu.h" #include "menu.h"
#include "recorded_battle.h" #include "recorded_battle.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "battle_frontier_2.h" #include "frontier_util.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "data2.h" #include "data2.h"
@@ -2579,7 +2579,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
case B_TXT_TRAINER1_LOSE_TEXT: // trainerA lose text case B_TXT_TRAINER1_LOSE_TEXT: // trainerA lose text
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
{ {
CopyFrontierTrainerText(FRONTIER_LOSE_TEXT, gTrainerBattleOpponent_A); CopyFrontierTrainerText(FRONTIER_PLAYER_WON_TEXT, gTrainerBattleOpponent_A);
toCpy = gStringVar4; toCpy = gStringVar4;
} }
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
@@ -2595,7 +2595,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
{ {
CopyFrontierTrainerText(FRONTIER_WIN_TEXT, gTrainerBattleOpponent_A); CopyFrontierTrainerText(FRONTIER_PLAYER_LOST_TEXT, gTrainerBattleOpponent_A);
toCpy = gStringVar4; toCpy = gStringVar4;
} }
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
@@ -2676,7 +2676,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
case B_TXT_TRAINER2_LOSE_TEXT: case B_TXT_TRAINER2_LOSE_TEXT:
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
{ {
CopyFrontierTrainerText(FRONTIER_LOSE_TEXT, gTrainerBattleOpponent_B); CopyFrontierTrainerText(FRONTIER_PLAYER_WON_TEXT, gTrainerBattleOpponent_B);
toCpy = gStringVar4; toCpy = gStringVar4;
} }
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
@@ -2692,7 +2692,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
case B_TXT_TRAINER2_WIN_TEXT: case B_TXT_TRAINER2_WIN_TEXT:
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
{ {
CopyFrontierTrainerText(FRONTIER_WIN_TEXT, gTrainerBattleOpponent_B); CopyFrontierTrainerText(FRONTIER_PLAYER_LOST_TEXT, gTrainerBattleOpponent_B);
toCpy = gStringVar4; toCpy = gStringVar4;
} }
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL)
src/battle_tent.c
+3 -1
View File
@@ -9,7 +9,7 @@
#include "random.h" #include "random.h"
#include "item.h" #include "item.h"
#include "battle_factory.h" #include "battle_factory.h"
#include "battle_frontier_2.h" #include "frontier_util.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
@@ -19,6 +19,8 @@ extern const u16 gBattleFrontierHeldItems[];
extern u16 gUnknown_03006298[]; extern u16 gUnknown_03006298[];
extern void sub_81A4C30(void);
// This file's functions. // This file's functions.
static void sub_81B99D4(void); static void sub_81B99D4(void);
static void sub_81B9A28(void); static void sub_81B9A28(void);
src/battle_tower.c
+35 -40
View File
@@ -9,8 +9,7 @@
#include "main.h" #include "main.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "battle.h" #include "battle.h"
#include "battle_frontier_1.h" #include "frontier_util.h"
#include "battle_frontier_2.h"
#include "recorded_battle.h" #include "recorded_battle.h"
#include "easy_chat.h" #include "easy_chat.h"
#include "gym_leader_rematch.h" #include "gym_leader_rematch.h"
@@ -30,15 +29,9 @@
extern u16 gUnknown_03006298[]; extern u16 gUnknown_03006298[];
extern void sub_81A3ACC(void);
extern void CreateFrontierBrainPokemon(void);
extern void sub_81A6CD0(void); extern void sub_81A6CD0(void);
extern u16 sub_81A39C4(void); extern void sub_81A4C30(void);
extern void SetFrontierBrainTrainerGfxId(void); extern u8 sub_81A6CA8(u8, u8);
extern u8 GetFrontierBrainTrainerPicIndex(void);
extern u8 GetFrontierBrainTrainerClass(void);
extern u8 IsFrontierBrainFemale(void);
extern void CopyFrontierBrainTrainerName(u8 *dst);
extern void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 move, u8 moveSlot); extern void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 move, u8 moveSlot);
extern const u8 *const *const gUnknown_085DD690[]; extern const u8 *const *const gUnknown_085DD690[];
@@ -220,7 +213,7 @@ static void sub_8161F94(void)
gSaveBlock2Ptr->frontier.field_CA9_b = 0; gSaveBlock2Ptr->frontier.field_CA9_b = 0;
sub_81A3ACC(); sub_81A3ACC();
if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_085DF9AC[battleMode][lvlMode])) if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_085DF9AC[battleMode][lvlMode]))
gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode] = 0; gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] = 0;
ValidateBattleTowerRecordChecksums(); ValidateBattleTowerRecordChecksums();
saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
@@ -258,7 +251,7 @@ static void sub_81620F4(void)
case 0: case 0:
break; break;
case 1: case 1:
gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode] = gSpecialVar_0x8006; gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] = gSpecialVar_0x8006;
break; break;
case 2: case 2:
if (gSpecialVar_0x8006) if (gSpecialVar_0x8006)
@@ -364,7 +357,8 @@ static void ChooseNextBattleTowerTrainer(void)
{ {
u16 id; u16 id;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u32 r5 = sub_81A39C4() / 7; u16 winStreak = GetCurrentFacilityWinStreak();
u32 challengeNum = winStreak / 7;
SetFacilityPtrsGetLevel(); SetFacilityPtrsGetLevel();
if (battleMode == FRONTIER_MODE_MULTIS || battleMode == FRONTIER_MODE_LINK_MULTIS) if (battleMode == FRONTIER_MODE_MULTIS || battleMode == FRONTIER_MODE_LINK_MULTIS)
@@ -385,7 +379,7 @@ static void ChooseNextBattleTowerTrainer(void)
s32 i; s32 i;
while (1) while (1)
{ {
id = sub_8162548(r5, gSaveBlock2Ptr->frontier.curChallengeBattleNum); id = sub_8162548(challengeNum, gSaveBlock2Ptr->frontier.curChallengeBattleNum);
// Ensure trainer wasn't previously fought in this challenge. // Ensure trainer wasn't previously fought in this challenge.
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
@@ -525,7 +519,7 @@ void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId)
} }
else if (trainerId == TRAINER_FRONTIER_BRAIN) else if (trainerId == TRAINER_FRONTIER_BRAIN)
{ {
SetFrontierBrainTrainerGfxId(); SetFrontierBrainEventObjGfx_2();
return; return;
} }
else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) else if (trainerId < TRAINER_RECORD_MIXING_FRIEND)
@@ -769,14 +763,14 @@ u8 GetFrontierTrainerFrontSpriteId(u16 trainerId)
else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE) else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
return gFacilityClassToPicIndex[sub_818649C()]; return gFacilityClassToPicIndex[GetRecordedBattleRecordMixFriendClass()];
else else
return gFacilityClassToPicIndex[gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass]; return gFacilityClassToPicIndex[gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass];
} }
else else
{ {
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
return gFacilityClassToPicIndex[gApprentices[sub_81864A8()].facilityClass]; return gFacilityClassToPicIndex[gApprentices[GetRecordedBattleApprenticeId()].facilityClass];
else else
return gFacilityClassToPicIndex[gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass]; return gFacilityClassToPicIndex[gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass];
} }
@@ -807,7 +801,7 @@ u8 GetFrontierOpponentClass(u16 trainerId)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
{ {
trainerClass = gFacilityClassToTrainerClass[sub_818649C()]; trainerClass = gFacilityClassToTrainerClass[GetRecordedBattleRecordMixFriendClass()];
} }
else else
{ {
@@ -819,7 +813,7 @@ u8 GetFrontierOpponentClass(u16 trainerId)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
{ {
trainerClass = gFacilityClassToTrainerClass[gApprentices[sub_81864A8()].facilityClass]; trainerClass = gFacilityClassToTrainerClass[gApprentices[GetRecordedBattleApprenticeId()].facilityClass];
} }
else else
{ {
@@ -847,14 +841,14 @@ static u8 GetFrontierTrainerFacilityClass(u16 trainerId)
else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE) else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
facilityClass = sub_818649C(); facilityClass = GetRecordedBattleRecordMixFriendClass();
else else
facilityClass = gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass; facilityClass = gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass;
} }
else else
{ {
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
facilityClass = gApprentices[sub_81864A8()].facilityClass; facilityClass = gApprentices[GetRecordedBattleApprenticeId()].facilityClass;
else else
facilityClass = gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass; facilityClass = gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass;
} }
@@ -907,8 +901,8 @@ void GetFrontierTrainerName(u8 *dst, u16 trainerId)
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
{ {
id = sub_81864A8(); id = GetRecordedBattleApprenticeId();
language = sub_81864C0(); language = GetRecordedBattleApprenticeLanguage();
} }
else else
{ {
@@ -1179,7 +1173,7 @@ static void FillFactoryFrontierTrainerParty(u16 trainerId, u8 firstMonId)
{ {
u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; // Unused variable. u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; // Unused variable.
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u8 challengeNum = gSaveBlock2Ptr->frontier.winStreaks[battleMode][0] / 7; u8 challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][0] / 7;
if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 6) if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 6)
fixedIV = sub_81A6CA8(challengeNum, 0); fixedIV = sub_81A6CA8(challengeNum, 0);
else else
@@ -1297,7 +1291,7 @@ static void HandleSpecialTrainerBattleEnd(void)
{ {
s32 i; s32 i;
sub_81864CC(); RecordedBattle_SaveBattleOutcome();
switch (gBattleScripting.specialTrainerBattleType) switch (gBattleScripting.specialTrainerBattleType)
{ {
case SPECIAL_BATTLE_TOWER: case SPECIAL_BATTLE_TOWER:
@@ -1480,8 +1474,8 @@ static void SaveCurrentWinStreak(void)
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u16 winStreak = GetCurrentBattleTowerWinStreak(lvlMode, battleMode); u16 winStreak = GetCurrentBattleTowerWinStreak(lvlMode, battleMode);
if (gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode] < winStreak) if (gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] < winStreak)
gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode] = winStreak; gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] = winStreak;
} }
static void sub_8163EE4(void) static void sub_8163EE4(void)
@@ -1509,15 +1503,15 @@ static void sub_8163EE4(void)
} }
playerRecord->lvlMode = lvlMode; playerRecord->lvlMode = lvlMode;
playerRecord->facilityClass = class; playerRecord->facilityClass = class;
CopyUnalignedWord(playerRecord->trainerId, gSaveBlock2Ptr->playerTrainerId); CopyTrainerId(playerRecord->trainerId, gSaveBlock2Ptr->playerTrainerId);
StringCopy7(playerRecord->name, gSaveBlock2Ptr->playerName); StringCopy7(playerRecord->name, gSaveBlock2Ptr->playerName);
playerRecord->winStreak = GetCurrentBattleTowerWinStreak(lvlMode, battleMode); playerRecord->winStreak = GetCurrentBattleTowerWinStreak(lvlMode, battleMode);
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{ {
playerRecord->greeting[i] = gSaveBlock1Ptr->unk2BBC[i]; playerRecord->greeting[i] = gSaveBlock1Ptr->unk2BBC[i];
playerRecord->unk1C[i] = gSaveBlock1Ptr->unk2BC8[i]; playerRecord->speechWon[i] = gSaveBlock1Ptr->unk2BC8[i];
playerRecord->unk28[i] = gSaveBlock1Ptr->unk2BD4[i]; playerRecord->speechLost[i] = gSaveBlock1Ptr->unk2BD4[i];
} }
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
@@ -1535,7 +1529,7 @@ static void SaveBattleTowerProgress(void)
{ {
u16 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u16 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u16 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u16 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
s32 challengeNum = (signed)(gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode] / 7); s32 challengeNum = (signed)(gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7);
if (gSpecialVar_0x8005 == 0 && (challengeNum > 1 || gSaveBlock2Ptr->frontier.curChallengeBattleNum != 0)) if (gSpecialVar_0x8005 == 0 && (challengeNum > 1 || gSaveBlock2Ptr->frontier.curChallengeBattleNum != 0))
sub_8163EE4(); sub_8163EE4();
@@ -1625,7 +1619,7 @@ static void sub_81642A0(void)
eventObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; eventObjTemplates = gSaveBlock1Ptr->eventObjectTemplates;
lvlMode = gSaveBlock2Ptr->frontier.lvlMode; lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
challengeNum = gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode] / 7; challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7;
species1 = GetMonData(&gPlayerParty[0], MON_DATA_SPECIES, NULL); species1 = GetMonData(&gPlayerParty[0], MON_DATA_SPECIES, NULL);
species2 = GetMonData(&gPlayerParty[1], MON_DATA_SPECIES, NULL); species2 = GetMonData(&gPlayerParty[1], MON_DATA_SPECIES, NULL);
level = SetFacilityPtrsGetLevel(); level = SetFacilityPtrsGetLevel();
@@ -1795,7 +1789,8 @@ static void sub_8164828(void)
s32 i, j, arrId; s32 i, j, arrId;
s32 monPoolId; s32 monPoolId;
s32 level = SetFacilityPtrsGetLevel(); s32 level = SetFacilityPtrsGetLevel();
s32 challengeNum = sub_81A39C4() / 7; u16 winStreak = GetCurrentFacilityWinStreak();
s32 challengeNum = winStreak / 7;
s32 k = gSpecialVar_LastTalked - 2; s32 k = gSpecialVar_LastTalked - 2;
s32 trainerId = gSaveBlock2Ptr->frontier.field_CB4[k]; s32 trainerId = gSaveBlock2Ptr->frontier.field_CB4[k];
@@ -1911,7 +1906,7 @@ static void sub_8164B74(void)
case 0: case 0:
if (battleMode == FRONTIER_MODE_LINK_MULTIS) if (battleMode == FRONTIER_MODE_LINK_MULTIS)
{ {
challengeNum = gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode] / 7; challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7;
if (sub_800A520()) if (sub_800A520())
{ {
SendBlock(bitmask_all_link_players_but_self(), &challengeNum, sizeof(challengeNum)); SendBlock(bitmask_all_link_players_but_self(), &challengeNum, sizeof(challengeNum));
@@ -2069,7 +2064,7 @@ static void ClearBattleTowerRecord(struct EmeraldBattleTowerRecord *record)
u16 GetCurrentBattleTowerWinStreak(u8 lvlMode, u8 battleMode) u16 GetCurrentBattleTowerWinStreak(u8 lvlMode, u8 battleMode)
{ {
u16 winStreak = gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode]; u16 winStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode];
if (winStreak > 9999) if (winStreak > 9999)
return 9999; return 9999;
@@ -2164,7 +2159,7 @@ static void FillEReaderTrainerWithPlayerData(void)
+ gSaveBlock2Ptr->playerTrainerId[2] + gSaveBlock2Ptr->playerTrainerId[3]) % ARRAY_COUNT(gTowerMaleFacilityClasses)]; + gSaveBlock2Ptr->playerTrainerId[2] + gSaveBlock2Ptr->playerTrainerId[3]) % ARRAY_COUNT(gTowerMaleFacilityClasses)];
} }
CopyUnalignedWord(ereaderTrainer->trainerId, gSaveBlock2Ptr->playerTrainerId); CopyTrainerId(ereaderTrainer->trainerId, gSaveBlock2Ptr->playerTrainerId);
StringCopy7(ereaderTrainer->name, gSaveBlock2Ptr->playerName); StringCopy7(ereaderTrainer->name, gSaveBlock2Ptr->playerName);
ereaderTrainer->winStreak = 1; ereaderTrainer->winStreak = 1;
@@ -2425,9 +2420,9 @@ bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct Em
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dst->greeting[i] = src->greeting[i]; dst->greeting[i] = src->greeting[i];
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dst->unk1C[i] = gUnknown_085DFA46[i]; dst->speechWon[i] = gUnknown_085DFA46[i];
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dst->unk28[i] = gUnknown_085DFA52[i]; dst->speechLost[i] = gUnknown_085DFA52[i];
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
dst->party[i] = src->party[i]; dst->party[i] = src->party[i];
@@ -2526,14 +2521,14 @@ void GetBattleTowerTrainerLanguage(u8 *dst, u16 trainerId)
else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE) else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
*dst = sub_81864B4(); *dst = GetRecordedBattleRecordMixFriendLanguage();
else else
*dst = gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].language; *dst = gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].language;
} }
else else
{ {
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
*dst = sub_81864C0(); *dst = GetRecordedBattleApprenticeLanguage();
else else
*dst = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].language; *dst = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].language;
} }
src/field_control_avatar.c
+2 -1
View File
@@ -1,6 +1,5 @@
#include "global.h" #include "global.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "battle_frontier_1.h"
#include "bike.h" #include "bike.h"
#include "coord_event_weather.h" #include "coord_event_weather.h"
#include "daycare.h" #include "daycare.h"
@@ -31,6 +30,8 @@
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/songs.h" #include "constants/songs.h"
extern bool32 sub_8196034(void);
static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
src/field_poison.c
+3 -1
View File
@@ -6,7 +6,7 @@
#include "field_message_box.h" #include "field_message_box.h"
#include "strings.h" #include "strings.h"
#include "rom_818CFC8.h" #include "rom_818CFC8.h"
#include "battle_frontier_2.h" #include "frontier_util.h"
#include "pokenav.h" #include "pokenav.h"
#include "event_data.h" #include "event_data.h"
#include "script.h" #include "script.h"
@@ -14,6 +14,8 @@
#include "fldeff_80F9BCC.h" #include "fldeff_80F9BCC.h"
#include "field_poison.h" #include "field_poison.h"
extern bool8 InBattlePike(void);
static bool32 sub_80F9568(struct Pokemon *pokemon) static bool32 sub_80F9568(struct Pokemon *pokemon)
{ {
u16 species = GetMonData(pokemon, MON_DATA_SPECIES2); u16 species = GetMonData(pokemon, MON_DATA_SPECIES2);
src/field_specials.c
+30 -30
View File
@@ -2158,73 +2158,73 @@ void sub_8139F20(void)
case 1: case 1:
case 2: case 2:
case 3: case 3:
if (gSaveBlock2Ptr->frontier.winStreaks[var][0] >= gSaveBlock2Ptr->frontier.winStreaks[var][1]) if (gSaveBlock2Ptr->frontier.towerWinStreaks[var][0] >= gSaveBlock2Ptr->frontier.towerWinStreaks[var][1])
{ {
unk = gSaveBlock2Ptr->frontier.winStreaks[var][0]; unk = gSaveBlock2Ptr->frontier.towerWinStreaks[var][0];
} }
else else
{ {
unk = gSaveBlock2Ptr->frontier.winStreaks[var][1]; unk = gSaveBlock2Ptr->frontier.towerWinStreaks[var][1];
} }
break; break;
case 4: case 4:
if (gSaveBlock2Ptr->frontier.field_D0C[0][0] >= gSaveBlock2Ptr->frontier.field_D0C[0][1]) if (gSaveBlock2Ptr->frontier.domeWinStreaks[0][0] >= gSaveBlock2Ptr->frontier.domeWinStreaks[0][1])
{ {
unk = gSaveBlock2Ptr->frontier.field_D0C[0][0]; unk = gSaveBlock2Ptr->frontier.domeWinStreaks[0][0];
} }
else else
{ {
unk = gSaveBlock2Ptr->frontier.field_D0C[0][1]; unk = gSaveBlock2Ptr->frontier.domeWinStreaks[0][1];
} }
break; break;
case 5: case 5:
if (gSaveBlock2Ptr->frontier.field_DE2[0][0] >= gSaveBlock2Ptr->frontier.field_DE2[0][1]) if (gSaveBlock2Ptr->frontier.factoryWinStreaks[0][0] >= gSaveBlock2Ptr->frontier.factoryWinStreaks[0][1])
{ {
unk = gSaveBlock2Ptr->frontier.field_DE2[0][0]; unk = gSaveBlock2Ptr->frontier.factoryWinStreaks[0][0];
} }
else else
{ {
unk = gSaveBlock2Ptr->frontier.field_DE2[0][1]; unk = gSaveBlock2Ptr->frontier.factoryWinStreaks[0][1];
} }
break; break;
case 6: case 6:
if (gSaveBlock2Ptr->frontier.field_DC8[0][0] >= gSaveBlock2Ptr->frontier.field_DC8[0][1]) if (gSaveBlock2Ptr->frontier.palaceWinStreaks[0][0] >= gSaveBlock2Ptr->frontier.palaceWinStreaks[0][1])
{ {
unk = gSaveBlock2Ptr->frontier.field_DC8[0][0]; unk = gSaveBlock2Ptr->frontier.palaceWinStreaks[0][0];
} }
else else
{ {
unk = gSaveBlock2Ptr->frontier.field_DC8[0][1]; unk = gSaveBlock2Ptr->frontier.palaceWinStreaks[0][1];
} }
break; break;
case 7: case 7:
if (gSaveBlock2Ptr->frontier.field_DDA[0] >= gSaveBlock2Ptr->frontier.field_DDA[1]) if (gSaveBlock2Ptr->frontier.arenaWinStreaks[0] >= gSaveBlock2Ptr->frontier.arenaWinStreaks[1])
{ {
unk = gSaveBlock2Ptr->frontier.field_DDA[0]; unk = gSaveBlock2Ptr->frontier.arenaWinStreaks[0];
} }
else else
{ {
unk = gSaveBlock2Ptr->frontier.field_DDA[1]; unk = gSaveBlock2Ptr->frontier.arenaWinStreaks[1];
} }
break; break;
case 8: case 8:
if (gSaveBlock2Ptr->frontier.field_E04[0] >= gSaveBlock2Ptr->frontier.field_E04[1]) if (gSaveBlock2Ptr->frontier.pikeWinStreaks[0] >= gSaveBlock2Ptr->frontier.pikeWinStreaks[1])
{ {
unk = gSaveBlock2Ptr->frontier.field_E04[0]; unk = gSaveBlock2Ptr->frontier.pikeWinStreaks[0];
} }
else else
{ {
unk = gSaveBlock2Ptr->frontier.field_E04[1]; unk = gSaveBlock2Ptr->frontier.pikeWinStreaks[1];
} }
break; break;
case 9: case 9:
if (gSaveBlock2Ptr->frontier.field_E1A[0] >= gSaveBlock2Ptr->frontier.field_E1A[1]) if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[0] >= gSaveBlock2Ptr->frontier.pyramidWinStreaks[1])
{ {
unk = gSaveBlock2Ptr->frontier.field_E1A[0]; unk = gSaveBlock2Ptr->frontier.pyramidWinStreaks[0];
} }
else else
{ {
unk = gSaveBlock2Ptr->frontier.field_E1A[1]; unk = gSaveBlock2Ptr->frontier.pyramidWinStreaks[1];
} }
break; break;
} }
@@ -2253,7 +2253,7 @@ void sub_813A080(void)
for (i = 0; i < 9; i++) for (i = 0; i < 9; i++)
{ {
if (gUnknown_085B2CDC[i] > gSaveBlock2Ptr->frontier.winStreaks[battleMode][lvlMode]) if (gUnknown_085B2CDC[i] > gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode])
{ {
gSpecialVar_0x8005 = 4; gSpecialVar_0x8005 = 4;
gSpecialVar_0x8006 = i + 5; gSpecialVar_0x8006 = i + 5;
@@ -2997,7 +2997,7 @@ void sub_813A8FC(void)
{ {
u8 string[32]; u8 string[32];
u32 x; u32 x;
StringCopy(ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->frontier.frontierBattlePoints, STR_CONV_MODE_RIGHT_ALIGN, 4), gText_BP); StringCopy(ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->frontier.battlePoints, STR_CONV_MODE_RIGHT_ALIGN, 4), gText_BP);
x = GetStringRightAlignXOffset(1, string, 48); x = GetStringRightAlignXOffset(1, string, 48);
AddTextPrinterParameterized(gUnknown_0203AB6D, 1, string, x, 1, 0, NULL); AddTextPrinterParameterized(gUnknown_0203AB6D, 1, string, x, 1, 0, NULL);
} }
@@ -3028,31 +3028,31 @@ void sub_813A988(void)
void sub_813A9A4(void) void sub_813A9A4(void)
{ {
if (gSaveBlock2Ptr->frontier.frontierBattlePoints < gSpecialVar_0x8004) if (gSaveBlock2Ptr->frontier.battlePoints < gSpecialVar_0x8004)
{ {
gSaveBlock2Ptr->frontier.frontierBattlePoints = 0; gSaveBlock2Ptr->frontier.battlePoints = 0;
} }
else else
{ {
gSaveBlock2Ptr->frontier.frontierBattlePoints -= gSpecialVar_0x8004; gSaveBlock2Ptr->frontier.battlePoints -= gSpecialVar_0x8004;
} }
} }
void sub_813A9D0(void) void sub_813A9D0(void)
{ {
if (gSaveBlock2Ptr->frontier.frontierBattlePoints + gSpecialVar_0x8004 > 0x270F) if (gSaveBlock2Ptr->frontier.battlePoints + gSpecialVar_0x8004 > 9999)
{ {
gSaveBlock2Ptr->frontier.frontierBattlePoints = 0x270f; gSaveBlock2Ptr->frontier.battlePoints = 9999;
} }
else else
{ {
gSaveBlock2Ptr->frontier.frontierBattlePoints = gSaveBlock2Ptr->frontier.frontierBattlePoints + gSpecialVar_0x8004; gSaveBlock2Ptr->frontier.battlePoints = gSaveBlock2Ptr->frontier.battlePoints + gSpecialVar_0x8004;
} }
} }
u16 sub_813AA04(void) u16 sub_813AA04(void)
{ {
return gSaveBlock2Ptr->frontier.frontierBattlePoints; return gSaveBlock2Ptr->frontier.battlePoints;
} }
void sub_813AA18(void) void sub_813AA18(void)
src/fieldmap.c
+3 -1
View File
@@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "overworld.h" #include "overworld.h"
#include "bg.h" #include "bg.h"
#include "battle_frontier_2.h" #include "frontier_util.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "fldeff_80F9BCC.h" #include "fldeff_80F9BCC.h"
@@ -14,6 +14,8 @@
#include "secret_base.h" #include "secret_base.h"
#include "tv.h" #include "tv.h"
extern void sub_81AA078(u16*, u8);
struct ConnectionFlags struct ConnectionFlags
{ {
u8 south:1; u8 south:1;
src/frontier_util.c
+2752
View File
File diff suppressed because it is too large Load Diff
src/item_menu.c
+3 -1
View File
@@ -2,7 +2,7 @@
#include "item_menu.h" #include "item_menu.h"
#include "battle.h" #include "battle.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "battle_frontier_2.h" #include "frontier_util.h"
#include "berry_tag_screen.h" #include "berry_tag_screen.h"
#include "bg.h" #include "bg.h"
#include "constants/items.h" #include "constants/items.h"
@@ -48,6 +48,8 @@
#include "window.h" #include "window.h"
#include "apprentice.h" #include "apprentice.h"
extern bool8 InBattlePike(void);
void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
void CB2_Bag(void); void CB2_Bag(void);
bool8 setup_bag_menu(void); bool8 setup_bag_menu(void);
src/new_game.c
+12 -12
View File
@@ -26,6 +26,7 @@
#include "item.h" #include "item.h"
#include "pokedex.h" #include "pokedex.h"
#include "apprentice.h" #include "apprentice.h"
#include "frontier_util.h"
extern u8 gDifferentSaveFile; extern u8 gDifferentSaveFile;
extern u16 gSaveFileStatus; extern u16 gSaveFileStatus;
@@ -45,7 +46,6 @@ extern void NewGameInitPCItems(void);
extern void ClearDecorationInventories(void); extern void ClearDecorationInventories(void);
extern void ResetFanClub(void); extern void ResetFanClub(void);
extern void copy_strings_to_sav1(void); extern void copy_strings_to_sav1(void);
extern void sub_81A4B14(void);
extern void sub_8195E10(void); extern void sub_8195E10(void);
extern void sub_801AFD8(void); extern void sub_801AFD8(void);
extern void sub_800E5AC(void); extern void sub_800E5AC(void);
@@ -69,30 +69,30 @@ static const struct ContestWinner sContestWinnerPicDummy =
}; };
// code // code
void WriteUnalignedWord(u32 var, u8 *dataPtr) void SetTrainerId(u32 trainerId, u8 *dst)
{ {
dataPtr[0] = var; dst[0] = trainerId;
dataPtr[1] = var >> 8; dst[1] = trainerId >> 8;
dataPtr[2] = var >> 16; dst[2] = trainerId >> 16;
dataPtr[3] = var >> 24; dst[3] = trainerId >> 24;
} }
u32 ReadUnalignedWord(u8* dataPtr) u32 GetTrainerId(u8 *trainerId)
{ {
return (dataPtr[3] << 24) | (dataPtr[2] << 16) | (dataPtr[1] << 8) | (dataPtr[0]); return (trainerId[3] << 24) | (trainerId[2] << 16) | (trainerId[1] << 8) | (trainerId[0]);
} }
void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom) void CopyTrainerId(u8 *dst, u8 *src)
{ {
s32 i; s32 i;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
copyTo[i] = copyFrom[i]; dst[i] = src[i];
} }
static void InitPlayerTrainerId(void) static void InitPlayerTrainerId(void)
{ {
u32 trainerId = (Random() << 0x10) | GetGeneratedTrainerIdLower(); u32 trainerId = (Random() << 0x10) | GetGeneratedTrainerIdLower();
WriteUnalignedWord(trainerId, gSaveBlock2Ptr->playerTrainerId); SetTrainerId(trainerId, gSaveBlock2Ptr->playerTrainerId);
} }
// L=A isnt set here for some reason. // L=A isnt set here for some reason.
@@ -204,7 +204,7 @@ void NewGameInitData(void)
copy_strings_to_sav1(); copy_strings_to_sav1();
SetLilycoveLady(); SetLilycoveLady();
ResetAllApprenticeData(); ResetAllApprenticeData();
sub_81A4B14(); ClearRankingHallRecords();
sub_8195E10(); sub_8195E10();
sub_801AFD8(); sub_801AFD8();
sub_800E5AC(); sub_800E5AC();
src/overworld.c
+1 -1
View File
@@ -52,6 +52,7 @@
#include "tv.h" #include "tv.h"
#include "scanline_effect.h" #include "scanline_effect.h"
#include "wild_encounter.h" #include "wild_encounter.h"
#include "frontier_util.h"
#include "constants/abilities.h" #include "constants/abilities.h"
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/maps.h" #include "constants/maps.h"
@@ -136,7 +137,6 @@ extern void sub_8087D74(void);
extern void battle_pyramid_map_load_related(u8); extern void battle_pyramid_map_load_related(u8);
extern void sub_80B00E8(u8); extern void sub_80B00E8(u8);
extern void sub_80E9238(u8); extern void sub_80E9238(u8);
extern void sub_81A3908(void);
extern void sub_81AA2F8(void); extern void sub_81AA2F8(void);
extern void sub_8195E10(void); extern void sub_8195E10(void);
extern void sub_80EDB44(void); extern void sub_80EDB44(void);
src/pokemon_summary_screen.c
+3 -1
View File
@@ -2,7 +2,7 @@
#include "main.h" #include "main.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h" #include "battle_anim.h"
#include "battle_frontier_2.h" #include "frontier_util.h"
#include "battle_message.h" #include "battle_message.h"
#include "battle_tent.h" #include "battle_tent.h"
#include "bg.h" #include "bg.h"
@@ -45,6 +45,8 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h" #include "constants/species.h"
extern bool8 sub_81A6BF4(void);
static EWRAM_DATA struct UnkSummaryStruct static EWRAM_DATA struct UnkSummaryStruct
{ {
/*0x00*/ union { /*0x00*/ union {
src/record_mixing.c
+132 -540
View File
@@ -33,31 +33,17 @@
#include "new_game.h" #include "new_game.h"
#include "daycare.h" #include "daycare.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "constants/battle_frontier.h"
extern void ReceiveSecretBasesData(struct SecretBaseRecord *, size_t, u8); extern void ReceiveSecretBasesData(struct SecretBaseRecord *, size_t, u8);
extern void ReceiveEasyChatPairsData(struct EasyChatPair *, size_t, u8); extern void ReceiveEasyChatPairsData(struct EasyChatPair *, size_t, u8);
// Static type declarations // Static type declarations
struct UnknownRecMixingStruct struct RecordMixingHallRecords
{ {
u32 field_0; struct RankingHall1P hallRecords1P[HALL_FACILITIES_COUNT][2][6];
u16 field_4; struct RankingHall2P hallRecords2P[2][6];
u8 field_6[9];
};
struct UnknownRecMixingStruct2
{
u32 field_0;
u16 field_4;
u16 field_6;
u16 field_8;
u8 field_A[16];
};
struct UnknownRecMixingStruct3
{
u8 field_0[0x810];
}; };
struct PlayerRecordsRS struct PlayerRecordsRS
@@ -85,7 +71,7 @@ struct PlayerRecordsEmerald
/* 0x1210 */ u16 giftItem; /* 0x1210 */ u16 giftItem;
/* 0x1214 */ LilycoveLady lilycoveLady; /* 0x1214 */ LilycoveLady lilycoveLady;
/* 0x1254 */ struct Apprentice apprentice[2]; /* 0x1254 */ struct Apprentice apprentice[2];
/* 0x12dc */ struct UnkRecordMixingStruct2 unk_12dc; /* 0x12dc */ struct PlayerHallRecords hallRecords;
/* 0x1434 */ u8 field_1434[0x10]; /* 0x1434 */ u8 field_1434[0x10];
}; // 0x1444 }; // 0x1444
@@ -106,12 +92,12 @@ static IWRAM_DATA struct EasyChatPair *sEasyChatPairsSave;
static IWRAM_DATA struct RecordMixingDayCareMail *gUnknown_03001148; static IWRAM_DATA struct RecordMixingDayCareMail *gUnknown_03001148;
static IWRAM_DATA void *sBattleTowerSave; static IWRAM_DATA void *sBattleTowerSave;
static IWRAM_DATA LilycoveLady *sLilycoveLadySave; static IWRAM_DATA LilycoveLady *sLilycoveLadySave;
static IWRAM_DATA void *gUnknown_03001154; // gSaveBlock2Ptr->field_0DC; static IWRAM_DATA void *sApprenticesSave;
static IWRAM_DATA void *sBattleTowerSave_Duplicate; static IWRAM_DATA void *sBattleTowerSave_Duplicate;
static IWRAM_DATA u32 sRecordStructSize; static IWRAM_DATA u32 sRecordStructSize;
static IWRAM_DATA u8 gUnknown_03001160; static IWRAM_DATA u8 gUnknown_03001160;
static IWRAM_DATA u32 filler_03001164; static IWRAM_DATA u32 filler_03001164;
static IWRAM_DATA u32 gUnknown_03001168[3]; static IWRAM_DATA struct PlayerHallRecords *gUnknown_03001168[3];
static EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02039F9C = {0}; static EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02039F9C = {0};
static EWRAM_DATA union PlayerRecords *sReceivedRecords = NULL; static EWRAM_DATA union PlayerRecords *sReceivedRecords = NULL;
@@ -137,7 +123,7 @@ static void ReceiveGiftItem(u16 *item, u8 which);
static void sub_80E7FF8(u8 taskId); static void sub_80E7FF8(u8 taskId);
static void sub_80E8110(struct Apprentice *arg0, struct Apprentice *arg1); static void sub_80E8110(struct Apprentice *arg0, struct Apprentice *arg1);
static void ReceiveApprenticeData(struct Apprentice *arg0, size_t arg1, u32 arg2); static void ReceiveApprenticeData(struct Apprentice *arg0, size_t arg1, u32 arg2);
static void sub_80E89AC(struct UnkRecordMixingStruct2 *arg0, size_t arg1, u32 arg2); static void ReceiveRankingHallRecords(struct PlayerHallRecords *hallRecords, size_t arg1, u32 arg2);
static void sub_80E89F8(struct RecordMixingDayCareMail *dst); static void sub_80E89F8(struct RecordMixingDayCareMail *dst);
static void SanitizeDayCareMailForRuby(struct RecordMixingDayCareMail *src); static void SanitizeDayCareMailForRuby(struct RecordMixingDayCareMail *src);
static void SanitizeEmeraldBattleTowerRecord(struct EmeraldBattleTowerRecord *arg0); static void SanitizeEmeraldBattleTowerRecord(struct EmeraldBattleTowerRecord *arg0);
@@ -200,7 +186,7 @@ static void SetSrcLookupPointers(void)
gUnknown_03001148 = &gUnknown_02039F9C; gUnknown_03001148 = &gUnknown_02039F9C;
sBattleTowerSave = &gSaveBlock2Ptr->frontier.towerPlayer; sBattleTowerSave = &gSaveBlock2Ptr->frontier.towerPlayer;
sLilycoveLadySave = &gSaveBlock1Ptr->lilycoveLady; sLilycoveLadySave = &gSaveBlock1Ptr->lilycoveLady;
gUnknown_03001154 = gSaveBlock2Ptr->apprentices; sApprenticesSave = gSaveBlock2Ptr->apprentices;
sBattleTowerSave_Duplicate = &gSaveBlock2Ptr->frontier.towerPlayer; sBattleTowerSave_Duplicate = &gSaveBlock2Ptr->frontier.towerPlayer;
} }
@@ -266,8 +252,8 @@ static void PrepareExchangePacket(void)
if (GetMultiplayerId() == 0) if (GetMultiplayerId() == 0)
sSentRecord->emerald.giftItem = GetRecordMixingGift(); sSentRecord->emerald.giftItem = GetRecordMixingGift();
sub_80E8110(sSentRecord->emerald.apprentice, gUnknown_03001154); sub_80E8110(sSentRecord->emerald.apprentice, sApprenticesSave);
sub_80E8260(&sSentRecord->emerald.unk_12dc); GetPlayerHallRecords(&sSentRecord->emerald.hallRecords);
} }
} }
@@ -300,7 +286,7 @@ static void ReceiveExchangePacket(u32 which)
ReceiveGiftItem(&sReceivedRecords->emerald.giftItem, which); ReceiveGiftItem(&sReceivedRecords->emerald.giftItem, which);
ReceiveLilycoveLadyData(&sReceivedRecords->emerald.lilycoveLady, sizeof(struct PlayerRecordsEmerald), which); ReceiveLilycoveLadyData(&sReceivedRecords->emerald.lilycoveLady, sizeof(struct PlayerRecordsEmerald), which);
ReceiveApprenticeData(sReceivedRecords->emerald.apprentice, sizeof(struct PlayerRecordsEmerald), (u8) which); ReceiveApprenticeData(sReceivedRecords->emerald.apprentice, sizeof(struct PlayerRecordsEmerald), (u8) which);
sub_80E89AC(&sReceivedRecords->emerald.unk_12dc, sizeof(struct PlayerRecordsEmerald), (u8) which); ReceiveRankingHallRecords(&sReceivedRecords->emerald.hallRecords, sizeof(struct PlayerRecordsEmerald), (u8) which);
} }
} }
@@ -1571,12 +1557,12 @@ static void sub_80E8110(struct Apprentice *dst, struct Apprentice *src)
id = ((i + gSaveBlock2Ptr->playerApprentice.field_B2_1) % 3) + 1; id = ((i + gSaveBlock2Ptr->playerApprentice.field_B2_1) % 3) + 1;
if (src[id].playerName[0] != EOS) if (src[id].playerName[0] != EOS)
{ {
if (ReadUnalignedWord(src[id].playerId) != ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId)) if (GetTrainerId(src[id].playerId) != GetTrainerId(gSaveBlock2Ptr->playerTrainerId))
{ {
r8++; r8++;
var_2C = id; var_2C = id;
} }
if (ReadUnalignedWord(src[id].playerId) == ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId)) if (GetTrainerId(src[id].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId))
{ {
var_24++; var_24++;
var_28 = id; var_28 = id;
@@ -1608,42 +1594,42 @@ static void sub_80E8110(struct Apprentice *dst, struct Apprentice *src)
} }
} }
void sub_80E8260(struct UnkRecordMixingStruct2 *dst) void GetPlayerHallRecords(struct PlayerHallRecords *dst)
{ {
s32 i, j; s32 i, j;
for (i = 0; i < 9; i++) for (i = 0; i < HALL_FACILITIES_COUNT; i++)
{ {
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
{ {
CopyUnalignedWord(dst->field_0[i][j].playerId, gSaveBlock2Ptr->playerTrainerId); CopyTrainerId(dst->onePlayer[i][j].id, gSaveBlock2Ptr->playerTrainerId);
dst->field_0[i][j].language = GAME_LANGUAGE; dst->onePlayer[i][j].language = GAME_LANGUAGE;
StringCopy(dst->field_0[i][j].playerName, gSaveBlock2Ptr->playerName); StringCopy(dst->onePlayer[i][j].name, gSaveBlock2Ptr->playerName);
} }
} }
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
{ {
dst->field_120[j].language = GAME_LANGUAGE; dst->twoPlayers[j].language = GAME_LANGUAGE;
CopyUnalignedWord(dst->field_120[j].playerId1, gSaveBlock2Ptr->playerTrainerId); CopyTrainerId(dst->twoPlayers[j].id1, gSaveBlock2Ptr->playerTrainerId);
CopyUnalignedWord(dst->field_120[j].playerId2, gSaveBlock2Ptr->frontier.field_EF1[j]); CopyTrainerId(dst->twoPlayers[j].id2, gSaveBlock2Ptr->frontier.field_EF1[j]);
StringCopy(dst->field_120[j].playerName1, gSaveBlock2Ptr->playerName); StringCopy(dst->twoPlayers[j].name1, gSaveBlock2Ptr->playerName);
StringCopy(dst->field_120[j].playerName2, gSaveBlock2Ptr->frontier.field_EE1[j]); StringCopy(dst->twoPlayers[j].name2, gSaveBlock2Ptr->frontier.field_EE1[j]);
} }
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
dst->field_0[0][i].field_4 = gSaveBlock2Ptr->frontier.field_CF0[i]; dst->onePlayer[0][i].winStreak = gSaveBlock2Ptr->frontier.towerRecordWinStreaks[FRONTIER_MODE_SINGLES][i];
dst->field_0[1][i].field_4 = gSaveBlock2Ptr->frontier.field_CF4[i]; dst->onePlayer[1][i].winStreak = gSaveBlock2Ptr->frontier.towerRecordWinStreaks[FRONTIER_MODE_DOUBLES][i];
dst->field_0[2][i].field_4 = gSaveBlock2Ptr->frontier.field_CF8[i]; dst->onePlayer[2][i].winStreak = gSaveBlock2Ptr->frontier.towerRecordWinStreaks[FRONTIER_MODE_MULTIS][i];
dst->field_0[3][i].field_4 = gSaveBlock2Ptr->frontier.field_D14[0][i]; dst->onePlayer[3][i].winStreak = gSaveBlock2Ptr->frontier.domeRecordWinStreaks[FRONTIER_MODE_SINGLES][i];
dst->field_0[4][i].field_4 = gSaveBlock2Ptr->frontier.field_DD0[0][i]; dst->onePlayer[4][i].winStreak = gSaveBlock2Ptr->frontier.palaceRecordWinStreaks[FRONTIER_MODE_SINGLES][i];
dst->field_0[5][i].field_4 = gSaveBlock2Ptr->frontier.field_DDE[i]; dst->onePlayer[5][i].winStreak = gSaveBlock2Ptr->frontier.arenaRecordStreaks[i];
dst->field_0[6][i].field_4 = gSaveBlock2Ptr->frontier.field_DEA[i]; dst->onePlayer[6][i].winStreak = gSaveBlock2Ptr->frontier.factoryRecordWinStreaks[FRONTIER_MODE_SINGLES][i];
dst->field_0[7][i].field_4 = gSaveBlock2Ptr->frontier.field_E08[i]; dst->onePlayer[7][i].winStreak = gSaveBlock2Ptr->frontier.pikeRecordStreaks[i];
dst->field_0[8][i].field_4 = gSaveBlock2Ptr->frontier.field_E1E[i]; dst->onePlayer[8][i].winStreak = gSaveBlock2Ptr->frontier.pyramidRecordStreaks[i];
dst->field_120[i].field_8 = gSaveBlock2Ptr->frontier.field_CFC[i]; dst->twoPlayers[i].winStreak = gSaveBlock2Ptr->frontier.towerRecordWinStreaks[FRONTIER_MODE_LINK_MULTIS][i];
} }
} }
@@ -1653,7 +1639,7 @@ static bool32 sub_80E841C(struct Apprentice *arg0, struct Apprentice *arg1)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (ReadUnalignedWord(arg0->playerId) == ReadUnalignedWord(arg1[i].playerId) if (GetTrainerId(arg0->playerId) == GetTrainerId(arg1[i].playerId)
&& arg0->number == arg1[i].number) && arg0->number == arg1[i].number)
{ {
return TRUE; return TRUE;
@@ -1701,538 +1687,144 @@ static void ReceiveApprenticeData(struct Apprentice *arg0, size_t arg1, u32 arg2
} }
} }
NAKED static void sub_80E8578(struct RecordMixingHallRecords *dst, void *hallRecords, size_t recordSize, u32 arg3, s32 linkPlayerCount)
static void sub_80E8578(struct UnknownRecMixingStruct3 *arg0, struct UnkRecordMixingStruct2 *arg1, size_t arg2, u32 arg3, u32 arg4)
{ {
asm_unified(" push {r4-r7,lr}\n\ s32 i, j, k, l;
mov r7, r10\n\ s32 var_68;
mov r6, r9\n\
mov r5, r8\n\ k = 0;
push {r5-r7}\n\ i = 0;
sub sp, 0x54\n\ while (1)
str r0, [sp]\n\ {
ldr r0, [sp, 0x74]\n\ if (i >= linkPlayerCount)
movs r4, 0\n\ break;
mov r8, r4\n\ if (i != arg3)
movs r5, 0\n\ gUnknown_03001168[k++] = hallRecords;
str r5, [sp, 0x4]\n\
ldr r4, =gUnknown_03001168\n\ if (k == 3)
b _080E85A0\n\ break;
.pool\n\ hallRecords += recordSize;
_080E8598:\n\ i++;
adds r1, r2\n\ }
ldr r6, [sp, 0x4]\n\
adds r6, 0x1\n\ for (i = 0; i < HALL_FACILITIES_COUNT; i++)
str r6, [sp, 0x4]\n\ {
_080E85A0:\n\ for (j = 0; j < 2; j++)
ldr r5, [sp, 0x4]\n\ {
cmp r5, r0\n\ for (k = 0; k < 3; k++)
bge _080E85B6\n\ dst->hallRecords1P[i][j][k] = gSaveBlock2Ptr->hallRecords1P[i][j][k];
cmp r5, r3\n\
beq _080E85B0\n\ for (k = 0; k < linkPlayerCount - 1; k++)
stm r4!, {r1}\n\ {
movs r6, 0x1\n\ var_68 = 0;
add r8, r6\n\ for (l = 0; l < 3; l++)
_080E85B0:\n\ {
mov r5, r8\n\ if (GetTrainerId(dst->hallRecords1P[i][j][l].id) == GetTrainerId(gUnknown_03001168[k]->onePlayer[i][j].id))
cmp r5, 0x3\n\ {
bne _080E8598\n\ var_68++;
_080E85B6:\n\ if (dst->hallRecords1P[i][j][l].winStreak < gUnknown_03001168[k]->onePlayer[i][j].winStreak)
movs r6, 0\n\ dst->hallRecords1P[i][j][l] = gUnknown_03001168[k]->onePlayer[i][j];
str r6, [sp, 0x4]\n\ }
subs r0, 0x1\n\ }
str r0, [sp, 0x24]\n\ if (var_68 == 0)
_080E85BE:\n\ dst->hallRecords1P[i][j][k + 3] = gUnknown_03001168[k]->onePlayer[i][j];
movs r0, 0\n\ }
str r0, [sp, 0x8]\n\ }
ldr r1, [sp, 0x4]\n\ }
adds r1, 0x1\n\
str r1, [sp, 0x28]\n\ for (j = 0; j < 2; j++)
ldr r2, [sp, 0x4]\n\ {
lsls r2, 1\n\ for (k = 0; k < 3; k++)
str r2, [sp, 0x34]\n\ dst->hallRecords2P[j][k] = gSaveBlock2Ptr->hallRecords2P[j][k];
ldr r3, [sp, 0x4]\n\
adds r3, r2, r3\n\ for (k = 0; k < linkPlayerCount - 1; k++)
str r3, [sp, 0x10]\n\ {
movs r4, 0\n\ var_68 = 0;
str r4, [sp, 0x44]\n\ for (l = 0; l < 3; l++)
movs r5, 0\n\ {
str r5, [sp, 0x48]\n\ if (GetTrainerId(dst->hallRecords2P[j][l].id1) == GetTrainerId(gUnknown_03001168[k]->twoPlayers[j].id1)
_080E85DC:\n\ && GetTrainerId(dst->hallRecords2P[j][l].id2) == GetTrainerId(gUnknown_03001168[k]->twoPlayers[j].id2))
movs r6, 0\n\ {
mov r8, r6\n\ var_68++;
ldr r0, =gSaveBlock2Ptr\n\ if (dst->hallRecords2P[j][l].winStreak < gUnknown_03001168[k]->twoPlayers[j].winStreak)
ldr r1, [r0]\n\ dst->hallRecords2P[j][l] = gUnknown_03001168[k]->twoPlayers[j];
ldr r2, [sp, 0x10]\n\ }
lsls r0, r2, 5\n\ }
ldr r3, [sp, 0x48]\n\ if (var_68 == 0)
adds r0, r3, r0\n\ dst->hallRecords2P[j][k + 3] = gUnknown_03001168[k]->twoPlayers[j];
adds r3, r0, r1\n\ }
lsls r0, r2, 6\n\ }
ldr r4, [sp, 0x44]\n\
adds r0, r4, r0\n\
ldr r5, [sp]\n\
adds r2, r0, r5\n\
_080E85F8:\n\
adds r0, r2, 0\n\
movs r6, 0x87\n\
lsls r6, 2\n\
adds r1, r3, r6\n\
ldm r1!, {r4-r6}\n\
stm r0!, {r4-r6}\n\
ldr r1, [r1]\n\
str r1, [r0]\n\
adds r3, 0x10\n\
adds r2, 0x10\n\
movs r0, 0x1\n\
add r8, r0\n\
mov r1, r8\n\
cmp r1, 0x2\n\
ble _080E85F8\n\
movs r2, 0\n\
mov r8, r2\n\
ldr r3, [sp, 0x24]\n\
cmp r8, r3\n\
bge _080E86DC\n\
ldr r4, [sp, 0x4]\n\
lsls r4, 5\n\
mov r9, r4\n\
ldr r5, [sp, 0x8]\n\
lsls r7, r5, 4\n\
ldr r6, [sp, 0x34]\n\
ldr r1, [sp, 0x4]\n\
adds r0, r6, r1\n\
lsls r0, 6\n\
str r0, [sp, 0x14]\n\
ldr r2, [sp]\n\
adds r0, r2, r0\n\
ldr r3, [sp, 0x44]\n\
str r3, [sp, 0x18]\n\
adds r0, r3\n\
str r0, [sp, 0x1C]\n\
ldr r4, [sp, 0x14]\n\
adds r0, r3, r4\n\
adds r0, r2\n\
adds r0, 0x30\n\
mov r10, r0\n\
_080E864A:\n\
movs r5, 0\n\
str r5, [sp, 0xC]\n\
movs r3, 0\n\
mov r6, r8\n\
lsls r6, 2\n\
str r6, [sp, 0x38]\n\
ldr r1, [sp, 0x18]\n\
ldr r2, [sp, 0x14]\n\
adds r0, r1, r2\n\
ldr r4, [sp]\n\
adds r5, r0, r4\n\
ldr r0, =gUnknown_03001168\n\
adds r0, r6, r0\n\
str r0, [sp, 0x50]\n\
_080E8666:\n\
lsls r0, r3, 4\n\
ldr r6, [sp, 0x1C]\n\
adds r0, r6, r0\n\
str r3, [sp, 0x4C]\n\
bl ReadUnalignedWord\n\
adds r4, r0, 0\n\
ldr r1, [sp, 0x50]\n\
ldr r0, [r1]\n\
add r0, r9\n\
adds r0, r7\n\
bl ReadUnalignedWord\n\
ldr r3, [sp, 0x4C]\n\
cmp r4, r0\n\
bne _080E86A8\n\
ldr r2, [sp, 0xC]\n\
adds r2, 0x1\n\
str r2, [sp, 0xC]\n\
ldr r4, [sp, 0x50]\n\
ldr r0, [r4]\n\
mov r6, r9\n\
adds r1, r7, r6\n\
adds r1, r0, r1\n\
ldrh r0, [r5, 0x4]\n\
ldrh r2, [r1, 0x4]\n\
cmp r0, r2\n\
bcs _080E86A8\n\
adds r0, r5, 0\n\
ldm r1!, {r2,r4,r6}\n\
stm r0!, {r2,r4,r6}\n\
ldr r1, [r1]\n\
str r1, [r0]\n\
_080E86A8:\n\
adds r5, 0x10\n\
adds r3, 0x1\n\
cmp r3, 0x2\n\
ble _080E8666\n\
ldr r3, [sp, 0xC]\n\
cmp r3, 0\n\
bne _080E86CE\n\
ldr r0, =gUnknown_03001168\n\
ldr r4, [sp, 0x38]\n\
adds r0, r4, r0\n\
ldr r0, [r0]\n\
mov r5, r9\n\
adds r2, r7, r5\n\
mov r1, r10\n\
adds r0, r2\n\
ldm r0!, {r2,r3,r6}\n\
stm r1!, {r2,r3,r6}\n\
ldr r0, [r0]\n\
str r0, [r1]\n\
_080E86CE:\n\
movs r4, 0x10\n\
add r10, r4\n\
movs r5, 0x1\n\
add r8, r5\n\
ldr r6, [sp, 0x24]\n\
cmp r8, r6\n\
blt _080E864A\n\
_080E86DC:\n\
ldr r0, [sp, 0x44]\n\
adds r0, 0x60\n\
str r0, [sp, 0x44]\n\
ldr r1, [sp, 0x48]\n\
adds r1, 0x30\n\
str r1, [sp, 0x48]\n\
ldr r2, [sp, 0x8]\n\
adds r2, 0x1\n\
str r2, [sp, 0x8]\n\
cmp r2, 0x1\n\
bgt _080E86F4\n\
b _080E85DC\n\
_080E86F4:\n\
ldr r3, [sp, 0x28]\n\
str r3, [sp, 0x4]\n\
cmp r3, 0x8\n\
bgt _080E86FE\n\
b _080E85BE\n\
_080E86FE:\n\
movs r4, 0\n\
str r4, [sp, 0x8]\n\
_080E8702:\n\
ldr r5, [sp, 0x8]\n\
adds r5, 0x1\n\
str r5, [sp, 0x2C]\n\
ldr r0, =gSaveBlock2Ptr\n\
ldr r1, [r0]\n\
movs r0, 0x54\n\
ldr r6, [sp, 0x8]\n\
muls r0, r6\n\
adds r3, r0, r1\n\
movs r0, 0xA8\n\
muls r0, r6\n\
ldr r1, [sp]\n\
adds r2, r0, r1\n\
movs r4, 0x2\n\
mov r8, r4\n\
_080E8720:\n\
movs r5, 0xD8\n\
lsls r5, 3\n\
adds r0, r2, r5\n\
ldr r6, =0x0000057c\n\
adds r1, r3, r6\n\
ldm r1!, {r4-r6}\n\
stm r0!, {r4-r6}\n\
ldm r1!, {r4-r6}\n\
stm r0!, {r4-r6}\n\
ldr r1, [r1]\n\
str r1, [r0]\n\
adds r3, 0x1C\n\
adds r2, 0x1C\n\
movs r0, 0x1\n\
negs r0, r0\n\
add r8, r0\n\
mov r1, r8\n\
cmp r1, 0\n\
bge _080E8720\n\
movs r2, 0\n\
mov r8, r2\n\
ldr r3, [sp, 0x24]\n\
cmp r8, r3\n\
blt _080E8752\n\
b _080E885A\n\
_080E8752:\n\
ldr r4, [sp, 0x8]\n\
lsls r1, r4, 3\n\
movs r0, 0xA8\n\
adds r5, r4, 0\n\
muls r5, r0\n\
str r5, [sp, 0x20]\n\
str r5, [sp, 0x3C]\n\
subs r1, r4\n\
lsls r1, 2\n\
mov r10, r1\n\
_080E8766:\n\
movs r6, 0\n\
str r6, [sp, 0xC]\n\
mov r0, r8\n\
lsls r0, 2\n\
str r0, [sp, 0x38]\n\
mov r1, r8\n\
adds r1, 0x1\n\
str r1, [sp, 0x30]\n\
ldr r0, =gUnknown_03001168\n\
ldr r2, [sp, 0x38]\n\
adds r2, r0\n\
mov r9, r2\n\
ldr r3, [sp]\n\
movs r4, 0xD8\n\
lsls r4, 3\n\
adds r0, r3, r4\n\
ldr r5, [sp, 0x3C]\n\
adds r7, r5, r0\n\
str r6, [sp, 0x40]\n\
movs r3, 0x2\n\
_080E878E:\n\
ldr r1, [sp, 0x20]\n\
movs r2, 0xD8\n\
lsls r2, 3\n\
adds r0, r1, r2\n\
ldr r4, [sp]\n\
adds r0, r4, r0\n\
ldr r6, [sp, 0x40]\n\
adds r5, r0, r6\n\
adds r0, r5, 0\n\
str r3, [sp, 0x4C]\n\
bl ReadUnalignedWord\n\
adds r4, r0, 0\n\
movs r6, 0x90\n\
lsls r6, 1\n\
add r6, r10\n\
mov r1, r9\n\
ldr r0, [r1]\n\
adds r0, r6\n\
bl ReadUnalignedWord\n\
ldr r3, [sp, 0x4C]\n\
cmp r4, r0\n\
bne _080E8808\n\
adds r0, r5, 0x4\n\
bl ReadUnalignedWord\n\
adds r4, r0, 0\n\
mov r2, r9\n\
ldr r0, [r2]\n\
adds r0, r6\n\
adds r0, 0x4\n\
bl ReadUnalignedWord\n\
ldr r3, [sp, 0x4C]\n\
cmp r4, r0\n\
bne _080E8808\n\
ldr r4, [sp, 0xC]\n\
adds r4, 0x1\n\
str r4, [sp, 0xC]\n\
mov r5, r9\n\
ldr r0, [r5]\n\
mov r6, r10\n\
adds r2, r0, r6\n\
movs r0, 0x94\n\
lsls r0, 1\n\
adds r1, r2, r0\n\
ldrh r0, [r7, 0x8]\n\
ldrh r1, [r1]\n\
cmp r0, r1\n\
bcs _080E8808\n\
adds r0, r7, 0\n\
movs r4, 0x90\n\
lsls r4, 1\n\
adds r1, r2, r4\n\
ldm r1!, {r2,r5,r6}\n\
stm r0!, {r2,r5,r6}\n\
ldm r1!, {r4-r6}\n\
stm r0!, {r4-r6}\n\
ldr r1, [r1]\n\
str r1, [r0]\n\
_080E8808:\n\
adds r7, 0x1C\n\
ldr r0, [sp, 0x40]\n\
adds r0, 0x1C\n\
str r0, [sp, 0x40]\n\
subs r3, 0x1\n\
cmp r3, 0\n\
bge _080E878E\n\
ldr r1, [sp, 0xC]\n\
cmp r1, 0\n\
bne _080E8850\n\
mov r0, r8\n\
adds r0, 0x3\n\
lsls r1, r0, 3\n\
subs r1, r0\n\
lsls r1, 2\n\
ldr r2, [sp, 0x20]\n\
adds r1, r2\n\
ldr r3, [sp]\n\
adds r1, r3, r1\n\
ldr r0, =gUnknown_03001168\n\
ldr r4, [sp, 0x38]\n\
adds r0, r4, r0\n\
ldr r0, [r0]\n\
add r0, r10\n\
movs r5, 0xD8\n\
lsls r5, 3\n\
adds r1, r5\n\
movs r6, 0x90\n\
lsls r6, 1\n\
adds r0, r6\n\
ldm r0!, {r2-r4}\n\
stm r1!, {r2-r4}\n\
ldm r0!, {r2,r5,r6}\n\
stm r1!, {r2,r5,r6}\n\
ldr r0, [r0]\n\
str r0, [r1]\n\
_080E8850:\n\
ldr r3, [sp, 0x30]\n\
mov r8, r3\n\
ldr r4, [sp, 0x24]\n\
cmp r8, r4\n\
blt _080E8766\n\
_080E885A:\n\
ldr r5, [sp, 0x2C]\n\
str r5, [sp, 0x8]\n\
cmp r5, 0x1\n\
bgt _080E8864\n\
b _080E8702\n\
_080E8864:\n\
add sp, 0x54\n\
pop {r3-r5}\n\
mov r8, r3\n\
mov r9, r4\n\
mov r10, r5\n\
pop {r4-r7}\n\
pop {r0}\n\
bx r0\n\
.pool\n\
");
} }
static void sub_80E8880(struct UnknownRecMixingStruct *arg0, struct UnknownRecMixingStruct *arg1) static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1)
{ {
s32 i, j; s32 i, j;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
s32 r2 = 0; s32 highestWinStreak = 0;
s32 r4 = -1; s32 highestId = -1;
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
{ {
if (arg1[j].field_4 > r2) if (arg1[j].winStreak > highestWinStreak)
{ {
r4 = j; highestId = j;
r2 = arg1[j].field_4; highestWinStreak = arg1[j].winStreak;
} }
} }
if (r4 >= 0) if (highestId >= 0)
{ {
arg0[i] = arg1[r4]; arg0[i] = arg1[highestId];
arg1[r4].field_4 = 0; arg1[highestId].winStreak = 0;
} }
} }
} }
static void sub_80E88CC(struct UnknownRecMixingStruct2 *arg0, struct UnknownRecMixingStruct2 *arg1) static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1)
{ {
s32 i, j; s32 i, j;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
s32 r2 = 0; s32 highestWinStreak = 0;
s32 r4 = -1; s32 highestId = -1;
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
{ {
if (arg1[j].field_8 > r2) if (arg1[j].winStreak > highestWinStreak)
{ {
r4 = j; highestId = j;
r2 = arg1[j].field_8; highestWinStreak = arg1[j].winStreak;
} }
} }
if (r4 >= 0) if (highestId >= 0)
{ {
arg0[i] = arg1[r4]; arg0[i] = arg1[highestId];
arg1[r4].field_8 = 0; arg1[highestId].winStreak = 0;
} }
} }
} }
NAKED static void sub_80E8924(struct RecordMixingHallRecords *arg0)
static void sub_80E8924(struct UnknownRecMixingStruct3 *arg0)
{ {
asm_unified("push {r4-r7,lr}\n\ s32 i, j;
mov r7, r10\n\
mov r6, r9\n\ for (i = 0; i < HALL_FACILITIES_COUNT; i++)
mov r5, r8\n\ {
push {r5-r7}\n\ for (j = 0; j < 2; j++)
mov r9, r0\n\ sub_80E8880(gSaveBlock2Ptr->hallRecords1P[i][j], arg0->hallRecords1P[i][j]);
movs r0, 0\n\ }
ldr r1, =gSaveBlock2Ptr\n\ for (j = 0; j < 2; j++)
mov r10, r1\n\ sub_80E88CC(gSaveBlock2Ptr->hallRecords2P[j], arg0->hallRecords2P[j]);
_080E8936:\n\
lsls r1, r0, 1\n\
adds r2, r0, 0x1\n\
mov r8, r2\n\
adds r1, r0\n\
lsls r0, r1, 5\n\
movs r2, 0x87\n\
lsls r2, 2\n\
adds r7, r0, r2\n\
lsls r1, 6\n\
mov r0, r9\n\
adds r4, r0, r1\n\
movs r6, 0\n\
movs r5, 0x1\n\
_080E8950:\n\
mov r1, r10\n\
ldr r0, [r1]\n\
adds r0, r7\n\
adds r0, r6\n\
adds r1, r4, 0\n\
bl sub_80E8880\n\
adds r4, 0x60\n\
adds r6, 0x30\n\
subs r5, 0x1\n\
cmp r5, 0\n\
bge _080E8950\n\
mov r0, r8\n\
cmp r0, 0x8\n\
ble _080E8936\n\
movs r5, 0\n\
ldr r4, =gSaveBlock2Ptr\n\
_080E8972:\n\
movs r0, 0x54\n\
adds r1, r5, 0\n\
muls r1, r0\n\
ldr r2, =0x0000057c\n\
adds r1, r2\n\
ldr r0, [r4]\n\
adds r0, r1\n\
movs r1, 0xA8\n\
muls r1, r5\n\
movs r2, 0xD8\n\
lsls r2, 3\n\
adds r1, r2\n\
add r1, r9\n\
bl sub_80E88CC\n\
adds r5, 0x1\n\
cmp r5, 0x1\n\
ble _080E8972\n\
pop {r3-r5}\n\
mov r8, r3\n\
mov r9, r4\n\
mov r10, r5\n\
pop {r4-r7}\n\
pop {r0}\n\
bx r0\n\
.pool");
} }
static void sub_80E89AC(struct UnkRecordMixingStruct2 *arg0, size_t arg1, u32 arg2) static void ReceiveRankingHallRecords(struct PlayerHallRecords *hallRecords, size_t recordSize, u32 arg2)
{ {
u8 linkPlayerCount = GetLinkPlayerCount(); u8 linkPlayerCount = GetLinkPlayerCount();
struct UnknownRecMixingStruct3 *largeStructPtr = AllocZeroed(sizeof(struct UnknownRecMixingStruct3)); struct RecordMixingHallRecords *largeStructPtr = AllocZeroed(sizeof(struct RecordMixingHallRecords));
sub_80E8578(largeStructPtr, arg0, arg1, arg2, linkPlayerCount); sub_80E8578(largeStructPtr, hallRecords, recordSize, arg2, linkPlayerCount);
sub_80E8924(largeStructPtr); sub_80E8924(largeStructPtr);
Free(largeStructPtr); Free(largeStructPtr);
src/recorded_battle.c
+143 -924
View File
File diff suppressed because it is too large Load Diff
src/save.c
+20 -16
View File
@@ -712,30 +712,34 @@ u8 HandleSavingData(u8 saveType)
u8 TrySavingData(u8 saveType) // TrySave u8 TrySavingData(u8 saveType) // TrySave
{ {
if(gFlashMemoryPresent == TRUE) if (gFlashMemoryPresent != TRUE)
{ {
HandleSavingData(saveType); gUnknown_03006294 = 0xFF;
if(gDamagedSaveSectors) return 0xFF;
DoSaveFailedScreen(saveType);
else
goto OK; // really?
} }
gUnknown_03006294 = 0xFF;
return 0xFF;
OK: HandleSavingData(saveType);
gUnknown_03006294 = 1; if (!gDamagedSaveSectors)
return 1; {
gUnknown_03006294 = 1;
return 1;
}
else
{
DoSaveFailedScreen(saveType);
gUnknown_03006294 = 0xFF;
return 0xFF;
}
} }
u8 sub_8153380(void) // trade.s save bool8 sub_8153380(void) // trade.s save
{ {
if (gFlashMemoryPresent != TRUE) if (gFlashMemoryPresent != TRUE)
return 1; return TRUE;
UpdateSaveAddresses(); UpdateSaveAddresses();
SaveSerializedGame(); SaveSerializedGame();
RestoreSaveBackupVarsAndIncrement(gRamSaveSectionLocations); RestoreSaveBackupVarsAndIncrement(gRamSaveSectionLocations);
return 0; return FALSE;
} }
bool8 sub_81533AC(void) // trade.s save bool8 sub_81533AC(void) // trade.s save
@@ -744,9 +748,9 @@ bool8 sub_81533AC(void) // trade.s save
if (gDamagedSaveSectors) if (gDamagedSaveSectors)
DoSaveFailedScreen(0); DoSaveFailedScreen(0);
if (retVal == 0xFF) if (retVal == 0xFF)
return 1; return TRUE;
else else
return 0; return FALSE;
} }
u8 sub_81533E0(void) // trade.s save u8 sub_81533E0(void) // trade.s save
src/scrcmd.c
+6 -1
View File
@@ -1,5 +1,5 @@
#include "global.h" #include "global.h"
#include "battle_frontier_2.h" #include "frontier_util.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "berry.h" #include "berry.h"
#include "clock.h" #include "clock.h"
@@ -49,6 +49,11 @@
#include "tv.h" #include "tv.h"
#include "window.h" #include "window.h"
extern u16 sub_81A89A0(u8);
extern void sub_81A8AF8(void);
extern void sub_81A895C(void);
extern void sub_81A8934(u8);
typedef u16 (*SpecialFunc)(void); typedef u16 (*SpecialFunc)(void);
typedef void (*NativeFunc)(void); typedef void (*NativeFunc)(void);
src/start_menu.c
+3 -1
View File
@@ -12,7 +12,7 @@
#include "task.h" #include "task.h"
#include "overworld.h" #include "overworld.h"
#include "link.h" #include "link.h"
#include "battle_frontier_2.h" #include "frontier_util.h"
#include "rom_818CFC8.h" #include "rom_818CFC8.h"
#include "field_specials.h" #include "field_specials.h"
#include "event_object_movement.h" #include "event_object_movement.h"
@@ -35,6 +35,8 @@
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "battle_pyramid_bag.h" #include "battle_pyramid_bag.h"
extern bool8 InBattlePike(void);
// Menu actions // Menu actions
enum enum
{ {
src/strings.c
+1 -3
View File
@@ -1569,9 +1569,7 @@ asm(".align 2");
const u8 gUnknown_085EE410[] = _("Floors cleared: {STR_VAR_2}"); const u8 gUnknown_085EE410[] = _("Floors cleared: {STR_VAR_2}");
asm(".align 2"); asm(".align 2");
const u8 gText_1Dot[] = _("1."); const u8 gText_123Dot[][3] = {_("1."), _("2."), _("3.")};
const u8 gUnknown_085EE427[] = _("2.");
const u8 gUnknown_085EE42A[] = _("3.");
const u8 gText_SavingDontTurnOff2[] = _("SAVING…\nDON’T TURN OFF THE POWER."); const u8 gText_SavingDontTurnOff2[] = _("SAVING…\nDON’T TURN OFF THE POWER.");
const u8 gText_BlenderMaxSpeedRecord[] = _("BERRY BLENDER\nMAXIMUM SPEED RECORD!"); const u8 gText_BlenderMaxSpeedRecord[] = _("BERRY BLENDER\nMAXIMUM SPEED RECORD!");
const u8 gText_234Players[] = _("2 PLAYERS\n3 PLAYERS\n4 PLAYERS"); const u8 gText_234Players[] = _("2 PLAYERS\n3 PLAYERS\n4 PLAYERS");
src/tv.c
+4 -4
View File
@@ -1972,7 +1972,7 @@ void sub_80EDB44(void)
show->rivalTrainer.nGoldSymbols ++; show->rivalTrainer.nGoldSymbols ++;
} }
} }
show->rivalTrainer.battlePoints = gSaveBlock2Ptr->frontier.frontierBattlePoints; show->rivalTrainer.battlePoints = gSaveBlock2Ptr->frontier.battlePoints;
StringCopy(show->rivalTrainer.playerName, gSaveBlock2Ptr->playerName); StringCopy(show->rivalTrainer.playerName, gSaveBlock2Ptr->playerName);
tv_store_id_3x(show); tv_store_id_3x(show);
show->rivalTrainer.language = gGameLanguage; show->rivalTrainer.language = gGameLanguage;
@@ -2500,7 +2500,7 @@ bool8 sub_80EE818(void)
return TRUE; return TRUE;
} }
void sub_80EE8C8(u16 winStreak, u8 facility) void sub_80EE8C8(u16 winStreak, u8 facilityAndMode)
{ {
TVShow *show; TVShow *show;
@@ -2512,8 +2512,8 @@ void sub_80EE8C8(u16 winStreak, u8 facility)
show->frontier.active = FALSE; show->frontier.active = FALSE;
StringCopy(show->frontier.playerName, gSaveBlock2Ptr->playerName); StringCopy(show->frontier.playerName, gSaveBlock2Ptr->playerName);
show->frontier.winStreak = winStreak; show->frontier.winStreak = winStreak;
show->frontier.facility = facility; show->frontier.facility = facilityAndMode;
switch (facility) switch (facilityAndMode)
{ {
case 1: case 1:
case 5: case 5:
src/walda_phrase.c
+1 -1
View File
@@ -95,7 +95,7 @@ u16 TryGetWallpaperWithWaldaPhrase(void)
{ {
u16 backgroundClr, foregroundClr; u16 backgroundClr, foregroundClr;
u8 patternId, iconId; u8 patternId, iconId;
u16 trainerId = ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId); u16 trainerId = GetTrainerId(gSaveBlock2Ptr->playerTrainerId);
gSpecialVar_Result = TryCalculateWallpaper(&backgroundClr, &foregroundClr, &iconId, &patternId, trainerId, GetWaldaPhrasePtr()); gSpecialVar_Result = TryCalculateWallpaper(&backgroundClr, &foregroundClr, &iconId, &patternId, trainerId, GetWaldaPhrasePtr());
if (gSpecialVar_Result) if (gSpecialVar_Result)
sym_bss.txt
+1 -7
View File
@@ -69,13 +69,7 @@ gUnknown_03001204: @ 3001204
.include "src/battle_transition.o" .include "src/battle_transition.o"
.include "src/pokemon_animation.o" .include "src/pokemon_animation.o"
.include "src/recorded_battle.o"
gUnknown_03001278: @ 3001278
.space 0x1
gUnknown_03001279: @ 3001279
.space 0x3
.include "src/battle_factory.o" .include "src/battle_factory.o"
gUnknown_03001288: @ 3001288 gUnknown_03001288: @ 3001288