mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-27 04:04:17 +01:00
Fix merge conflicts
This commit is contained in:
Tetrable
commit
30e7ac0dca
File diff suppressed because it is too large
Load Diff
@ -8173,7 +8173,7 @@ _081CAFA4:
|
|||||||
ldrh r0, [r1, 0x1E]
|
ldrh r0, [r1, 0x1E]
|
||||||
bl GetTrainerIdxByRematchIdx
|
bl GetTrainerIdxByRematchIdx
|
||||||
ldr r1, =gStringVar4
|
ldr r1, =gStringVar4
|
||||||
bl sub_81967AC
|
bl SelectMatchCallMessage
|
||||||
strb r0, [r6]
|
strb r0, [r6]
|
||||||
b _081CAFCC
|
b _081CAFCC
|
||||||
.pool
|
.pool
|
||||||
|
|||||||
9634
asm/roulette.s
9634
asm/roulette.s
File diff suppressed because it is too large
Load Diff
@ -1,434 +0,0 @@
|
|||||||
#include "constants/flags.h"
|
|
||||||
|
|
||||||
.include "asm/macros.inc"
|
|
||||||
.include "constants/constants.inc"
|
|
||||||
|
|
||||||
.section .rodata
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860DEB8:: @ 860DEB8 //struct
|
|
||||||
.2byte 0x0025, 0x0000, 0x0108, 0x0208, 0x0308, 0x0103, 0x0008, 0x0108, 0x0208, 0x0000
|
|
||||||
.2byte 0x02e1, 0x0000, 0x010c, 0x020c, 0x030c, 0x013e, 0x000c, 0x010c, 0x020c, 0x0000
|
|
||||||
.2byte 0x002c, 0x0000, 0x010c, 0x020c, 0x030c, 0x0104, 0x000c, 0x010c, 0x020c, 0x0000
|
|
||||||
.2byte 0x0039, 0x0000, 0x0102, 0x0202, 0x0302, 0x0105, 0x0002, 0x0102, 0x0202, 0x0000
|
|
||||||
.2byte 0x0040, 0x0000, 0x0101, 0x0201, 0x0301, 0x0106, 0x0001, 0x0101, 0x0201, 0x0000
|
|
||||||
.2byte 0x02af, 0x0004, 0x0101, 0x0201, 0x0301, 0x013d, 0x0001, 0x0101, 0x0201, 0x0000
|
|
||||||
.2byte 0x02ff, 0x0000, 0x010a, 0x020a, 0x030a, 0x0140, 0x000a, 0x010a, 0x020a, 0x0000
|
|
||||||
.2byte 0x005e, 0x0000, 0x0109, 0x0209, 0x0309, 0x0108, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
.2byte 0x004e, 0x0000, 0x0106, 0x0206, 0x0306, 0x0107, 0x0006, 0x0106, 0x0206, 0x0000
|
|
||||||
.2byte 0x006c, 0x0000, 0x0108, 0x0208, 0x0308, 0x0109, 0x0008, 0x0108, 0x0208, 0x0000
|
|
||||||
.2byte 0x0072, 0x0000, 0x0108, 0x0208, 0x0308, 0x010a, 0x0008, 0x0108, 0x0208, 0x0000
|
|
||||||
.2byte 0x0090, 0x0000, 0x0108, 0x020a, 0x030a, 0x010e, 0x000a, 0x0108, 0x020a, 0x0000
|
|
||||||
.2byte 0x007f, 0x0000, 0x010a, 0x020a, 0x030a, 0x010b, 0x000a, 0x0108, 0x020a, 0x0000
|
|
||||||
.2byte 0x0088, 0x0000, 0x0104, 0x0204, 0x0304, 0x010c, 0x0004, 0x0104, 0x0204, 0x0000
|
|
||||||
.2byte 0x008f, 0x0000, 0x0107, 0x0207, 0x0307, 0x010d, 0x0007, 0x0107, 0x0207, 0x0000
|
|
||||||
.2byte 0x009b, 0x0000, 0x0105, 0x0205, 0x0305, 0x010f, 0x0005, 0x0105, 0x0205, 0x0000
|
|
||||||
.2byte 0x00b7, 0x0000, 0x0103, 0x0203, 0x0303, 0x0110, 0x0003, 0x0103, 0x0203, 0x0000
|
|
||||||
.2byte 0x02a0, 0x0000, 0x0103, 0x0203, 0x0303, 0x013b, 0x0003, 0x0103, 0x0203, 0x0000
|
|
||||||
.2byte 0x00c3, 0x0000, 0x0106, 0x0206, 0x0306, 0x0111, 0x0006, 0x0106, 0x0206, 0x0000
|
|
||||||
.2byte 0x00c4, 0x0000, 0x0104, 0x0204, 0x0304, 0x0112, 0x0004, 0x0104, 0x0204, 0x0000
|
|
||||||
.2byte 0x00ce, 0x0000, 0x010b, 0x020b, 0x030b, 0x0113, 0x000b, 0x010b, 0x020b, 0x0000
|
|
||||||
.2byte 0x00d8, 0x0000, 0x0101, 0x0201, 0x0301, 0x0114, 0x0001, 0x0101, 0x0201, 0x0000
|
|
||||||
.2byte 0x02a9, 0x0003, 0x010c, 0x020c, 0x030c, 0x013c, 0x000c, 0x010c, 0x020c, 0x0000
|
|
||||||
.2byte 0x00e2, 0x0000, 0x0107, 0x0207, 0x0307, 0x0115, 0x0007, 0x0107, 0x0207, 0x0000
|
|
||||||
.2byte 0x00ee, 0x0000, 0x0104, 0x0204, 0x0304, 0x0116, 0x0001, 0x0104, 0x0204, 0x0000
|
|
||||||
.2byte 0x00f9, 0x0000, 0x0108, 0x0208, 0x0308, 0x0117, 0x0008, 0x0108, 0x0208, 0x0000
|
|
||||||
.2byte 0x00fe, 0x0000, 0x010c, 0x020c, 0x030c, 0x0118, 0x000c, 0x010c, 0x020c, 0x0000
|
|
||||||
.2byte 0x0118, 0x0000, 0x0102, 0x0202, 0x0302, 0x011a, 0x0002, 0x0102, 0x0202, 0x0000
|
|
||||||
.2byte 0x0111, 0x0000, 0x0101, 0x0201, 0x0301, 0x0119, 0x0001, 0x0101, 0x0201, 0x0000
|
|
||||||
.2byte 0x011f, 0x0006, 0x0109, 0x0209, 0x0309, 0x011b, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
.2byte 0x012e, 0x0000, 0x010e, 0x020e, 0x030e, 0x011d, 0x000e, 0x010e, 0x020e, 0x0000
|
|
||||||
.2byte 0x0125, 0x0000, 0x010b, 0x020b, 0x030b, 0x011c, 0x000b, 0x010b, 0x020b, 0x0000
|
|
||||||
.2byte 0x0133, 0x0000, 0x010c, 0x020c, 0x030c, 0x011e, 0x000c, 0x010c, 0x020c, 0x0000
|
|
||||||
.2byte 0x0139, 0x0000, 0x010d, 0x020d, 0x030d, 0x011f, 0x000d, 0x010d, 0x020d, 0x0000
|
|
||||||
.2byte 0x013e, 0x0000, 0x0101, 0x0201, 0x0301, 0x0120, 0x0001, 0x0101, 0x0201, 0x0000
|
|
||||||
.2byte 0x0153, 0x0000, 0x0103, 0x0203, 0x0303, 0x0121, 0x0003, 0x0103, 0x0203, 0x0000
|
|
||||||
.2byte 0x0178, 0x0000, 0x0105, 0x0205, 0x0305, 0x0126, 0x0005, 0x0105, 0x0205, 0x0000
|
|
||||||
.2byte 0x0171, 0x0000, 0x0109, 0x0209, 0x0309, 0x0125, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
.2byte 0x0166, 0x0000, 0x0109, 0x0209, 0x0309, 0x0123, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
.2byte 0x016c, 0x0000, 0x0105, 0x0205, 0x0305, 0x0124, 0x0005, 0x0105, 0x0205, 0x0000
|
|
||||||
.2byte 0x0182, 0x0000, 0x0109, 0x0209, 0x0309, 0x0128, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
.2byte 0x0161, 0x0000, 0x0105, 0x0205, 0x0305, 0x0122, 0x0005, 0x0105, 0x0205, 0x0000
|
|
||||||
.2byte 0x0179, 0x0000, 0x0105, 0x0205, 0x0305, 0x0127, 0x0005, 0x0105, 0x0205, 0x0000
|
|
||||||
.2byte 0x0188, 0x0000, 0x0104, 0x0204, 0x0304, 0x0129, 0x0004, 0x0104, 0x0204, 0x0000
|
|
||||||
.2byte 0x0196, 0x0000, 0x0106, 0x0206, 0x0306, 0x012a, 0x0006, 0x0106, 0x0206, 0x0000
|
|
||||||
.2byte 0x01a3, 0x0000, 0x0101, 0x0201, 0x0301, 0x012b, 0x0001, 0x0101, 0x0201, 0x0000
|
|
||||||
.2byte 0x01ab, 0x0000, 0x0109, 0x0209, 0x0309, 0x012c, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
.2byte 0x01b2, 0x0000, 0x0108, 0x0208, 0x0308, 0x012d, 0x0008, 0x0108, 0x0208, 0x0000
|
|
||||||
.2byte 0x01c1, 0x0000, 0x0109, 0x0209, 0x0309, 0x012e, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
.2byte 0x01da, 0x0000, 0x0102, 0x0202, 0x0302, 0x012f, 0x0002, 0x0102, 0x0202, 0x0000
|
|
||||||
.2byte 0x01e1, 0x0002, 0x0102, 0x0202, 0x0302, 0x0130, 0x0001, 0x0102, 0x0202, 0x0000
|
|
||||||
.2byte 0x01ec, 0x0000, 0x0103, 0x0203, 0x0303, 0x0131, 0x0003, 0x0103, 0x0203, 0x0000
|
|
||||||
.2byte 0x02e4, 0x0000, 0x0103, 0x0203, 0x0303, 0x013f, 0x0003, 0x0103, 0x0203, 0x0000
|
|
||||||
.2byte 0x0200, 0x0000, 0x0107, 0x0207, 0x0307, 0x0132, 0x0007, 0x0107, 0x0207, 0x0000
|
|
||||||
.2byte 0x0221, 0x0000, 0x0108, 0x0208, 0x0308, 0x0134, 0x0008, 0x0108, 0x0208, 0x0000
|
|
||||||
.2byte 0x021a, 0x0000, 0x0105, 0x0205, 0x0305, 0x0133, 0x0005, 0x0105, 0x0205, 0x0000
|
|
||||||
.2byte 0x0009, 0x0000, 0x0108, 0x0208, 0x0308, 0x0102, 0x0008, 0x0108, 0x0208, 0x0000
|
|
||||||
.2byte 0x022f, 0x0000, 0x0109, 0x0209, 0x0309, 0x0136, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
.2byte 0x0228, 0x0000, 0x0105, 0x0205, 0x0305, 0x0135, 0x0005, 0x0105, 0x0205, 0x0000
|
|
||||||
.2byte 0x025c, 0x0000, 0x0102, 0x0202, 0x0302, 0x0137, 0x0002, 0x0102, 0x0202, 0x0000
|
|
||||||
.2byte 0x026d, 0x0000, 0x0101, 0x0201, 0x0301, 0x0138, 0x0001, 0x0101, 0x0201, 0x0000
|
|
||||||
.2byte 0x0273, 0x0000, 0x0103, 0x0203, 0x0303, 0x0139, 0x0003, 0x0103, 0x0203, 0x0000
|
|
||||||
.2byte 0x0001, 0x0000, 0x010f, 0x0203, 0x0303, 0x0101, 0x0003, 0x0103, 0x0203, 0x0000
|
|
||||||
.2byte 0x0282, 0x0001, 0x0109, 0x0209, 0x0309, 0x013a, 0x0009, 0x0109, 0x0209, 0x0000
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E3B8:: @ 860E3B8
|
|
||||||
.4byte BattleFrontier_PokeNav_2A971C, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9798, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9813, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A98A8, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9977, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A99FD, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9A78, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9AE8, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9BA7, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9C36, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9CC8, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9D44, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9DD7, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9E70, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9EFD, 0x00ff0200
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E430:: @ 860E430
|
|
||||||
.4byte BattleFrontier_PokeNav_2A9FAB, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA028, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA099, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA100, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA188, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA214, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA2A1, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA31B, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA3A8, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA442, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA4C5, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA520, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA5AD, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA64D, 0x00ffff00
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E4A0:: @ 860E4A0
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA6AF, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA730, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA77A, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA81C, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA88C, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA934, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AA9D3, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAA40, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAAE4, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAB8C, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAC25, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAC9D, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAD41, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAE00, 0x00ff0300
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E510:: @ 860E510
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAE7F, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAEF1, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AAF69, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB010, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB076, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB11A, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB1B4, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB23D, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB2E9, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB382, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB410, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB4B0, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB538, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB5E4, 0x00ff0100
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E580:: @ 860E580
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB670, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB6CD, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB73C, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB808, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB8B7, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AB95D, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2ABA03, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2ABA9F, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2ABB62, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2ABC26, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2ABCE9, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2ABDA2, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2ABE5E, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2ABF36, 0x00ff0100
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E5F0:: @ 860E5F0
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC009, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC0BD, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC18C, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC228, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC30C, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC3B6, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC446, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC5C7, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC682, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC755, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC82C, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AC914, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ACA59, 0x00ff0200
|
|
||||||
.4byte BattleFrontier_PokeNav_2ACB02, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ACC3F, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ACD2F, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ACE1E, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ACF32, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2ACFBE, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD0AC, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD194, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD1DF, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD2A8, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD34F, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD44E, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD53A, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD642, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD801, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AD92E, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2ADA8F, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ADB9B, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ADC92, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ADE08, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2ADF07, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE0D9, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE1FD, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE327, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE3DA, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE489, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE5CD, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE698, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE704, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE78F, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE859, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE8E6, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AE998, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AEA8F, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AEB77, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AEBFA, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AECC1, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AED52, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AEE35, 0x00ff0300
|
|
||||||
.4byte BattleFrontier_PokeNav_2AEEF4, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AEFDA, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AF0E7, 0x00ff0100
|
|
||||||
.4byte BattleFrontier_PokeNav_2AF1B8, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AF2C4, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AF371, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AF480, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AF671, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AF7D8, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AF8F7, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFA39, 0x00ffff00
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFB26, 0x00ffff00
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E7F0:: @860E7F0
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFC07, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFC78, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFCFF, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFDA7, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFE3D, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFECA, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFF64, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2AFFF0, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B00B5, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0129, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B01A5, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0232, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B02D9, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0366, 0x00050400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E860:: @860E860
|
|
||||||
.4byte BattleFrontier_PokeNav_2B03E6, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0457, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B04DE, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0586, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B061C, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B06A3, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B073B, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B07C7, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0894, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0908, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0984, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0A11, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0AB8, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0B45, 0x00050400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E8D0:: @860E8D0
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0BC5, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0C4A, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0CC7, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0D4A, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0DC8, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0E35, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0ED1, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B0F72, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B102A, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B10A7, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1121, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B11D3, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B124D, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B12D0, 0x00050400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E940:: @860E940
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1347, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B13B1, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B142B, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B14B4, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1525, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B158E, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1622, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B169D, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1775, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B17F8, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1877, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1946, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B19C7, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1A4C, 0x00050400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860E9B0:: @860E9B0
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1ACA, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1B50, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1BE4, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1C6A, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1CCF, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1D38, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1DCD, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1E4B, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1F24, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B1FA8, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B2022, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B20F3, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B2175, 0x00050400
|
|
||||||
.4byte BattleFrontier_PokeNav_2B21FC, 0x00050400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EA20:: @ 860EA20
|
|
||||||
.4byte gUnknown_0860E3B8
|
|
||||||
.4byte gUnknown_0860E430
|
|
||||||
.4byte gUnknown_0860E4A0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EA2C:: @ 860EA2C
|
|
||||||
.4byte gUnknown_0860E510
|
|
||||||
.4byte gUnknown_0860E580
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EA34:: @ 860EA34
|
|
||||||
.4byte gUnknown_0860E5F0
|
|
||||||
.4byte gUnknown_0860E7F0
|
|
||||||
.4byte gUnknown_0860E860
|
|
||||||
.4byte gUnknown_0860E8D0
|
|
||||||
.4byte gUnknown_0860E940
|
|
||||||
.4byte gUnknown_0860E9B0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EA4C:: @ 860EA4C
|
|
||||||
.incbin "graphics/unknown/unknown_60EA4C.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EA6C:: @ 860EA6C
|
|
||||||
.incbin "graphics/interface/menu_border.4bpp"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EB6C:: @ 860EB6C
|
|
||||||
.incbin "graphics/pokenav/icon.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EB8C:: @ 860EB8C
|
|
||||||
.incbin "graphics/pokenav/icon.4bpp.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gText_PokenavCallEllipsis:: @ 860EF70
|
|
||||||
.string "………………\p$"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EF78:: @ 860EF78
|
|
||||||
.4byte sub_819612C
|
|
||||||
.4byte sub_81961F0
|
|
||||||
.4byte sub_8196274
|
|
||||||
.4byte sub_81962B0
|
|
||||||
.4byte sub_81962D8
|
|
||||||
.4byte sub_8196330
|
|
||||||
.4byte sub_8196390
|
|
||||||
.4byte sub_81963F0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EF98:: @ 860EF98
|
|
||||||
window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0f, 0x0200
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EFA0:: @ 860EFA0
|
|
||||||
.4byte gStringVar1
|
|
||||||
.4byte gStringVar2
|
|
||||||
.4byte gStringVar3
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EFAC:: @ 860EFAC
|
|
||||||
.4byte sub_8196A44
|
|
||||||
.4byte sub_8196A9C
|
|
||||||
.4byte sub_8196B98
|
|
||||||
.4byte sub_8196C70
|
|
||||||
.4byte sub_8196CF4
|
|
||||||
.4byte sub_8196D14
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EFC4:: @ 860EFC4
|
|
||||||
.4byte 0x00000282, gText_Kira
|
|
||||||
.4byte 0x000001e1, gText_Amy
|
|
||||||
.4byte 0x000002a9, gText_John
|
|
||||||
.4byte 0x000002af, gText_Roy
|
|
||||||
.4byte 0x00000033, gText_Gabby
|
|
||||||
.4byte 0x0000011f, gText_Anna
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860EFF4:: @ 860EFF4
|
|
||||||
.4byte gText_BattleTower2
|
|
||||||
.4byte gText_BattleDome
|
|
||||||
.4byte gText_BattlePalace
|
|
||||||
.4byte gText_BattleArena
|
|
||||||
.4byte gText_BattlePike
|
|
||||||
.4byte gText_BattleFactory
|
|
||||||
.4byte gText_BattlePyramid
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_0860F010:: @ 860F010
|
|
||||||
.2byte FLAG_BADGE01_GET
|
|
||||||
.2byte FLAG_BADGE02_GET
|
|
||||||
.2byte FLAG_BADGE03_GET
|
|
||||||
.2byte FLAG_BADGE04_GET
|
|
||||||
.2byte FLAG_BADGE05_GET
|
|
||||||
.2byte FLAG_BADGE06_GET
|
|
||||||
.2byte FLAG_BADGE07_GET
|
|
||||||
.2byte FLAG_BADGE08_GET
|
|
||||||
|
|
||||||
gUnknown_0860F020:: @ 860F020
|
|
||||||
.4byte gBirchDexRatingText_LessThan10
|
|
||||||
.4byte gBirchDexRatingText_LessThan20
|
|
||||||
.4byte gBirchDexRatingText_LessThan30
|
|
||||||
.4byte gBirchDexRatingText_LessThan40
|
|
||||||
.4byte gBirchDexRatingText_LessThan50
|
|
||||||
.4byte gBirchDexRatingText_LessThan60
|
|
||||||
.4byte gBirchDexRatingText_LessThan70
|
|
||||||
.4byte gBirchDexRatingText_LessThan80
|
|
||||||
.4byte gBirchDexRatingText_LessThan90
|
|
||||||
.4byte gBirchDexRatingText_LessThan100
|
|
||||||
.4byte gBirchDexRatingText_LessThan110
|
|
||||||
.4byte gBirchDexRatingText_LessThan120
|
|
||||||
.4byte gBirchDexRatingText_LessThan130
|
|
||||||
.4byte gBirchDexRatingText_LessThan140
|
|
||||||
.4byte gBirchDexRatingText_LessThan150
|
|
||||||
.4byte gBirchDexRatingText_LessThan160
|
|
||||||
.4byte gBirchDexRatingText_LessThan170
|
|
||||||
.4byte gBirchDexRatingText_LessThan180
|
|
||||||
.4byte gBirchDexRatingText_LessThan190
|
|
||||||
.4byte gBirchDexRatingText_LessThan200
|
|
||||||
.4byte gBirchDexRatingText_DexCompleted
|
|
||||||
2957
data/event_scripts.s
2957
data/event_scripts.s
File diff suppressed because it is too large
Load Diff
928
data/roulette.s
928
data/roulette.s
@ -1,928 +0,0 @@
|
|||||||
|
|
||||||
.include "asm/macros.inc"
|
|
||||||
.include "constants/constants.inc"
|
|
||||||
|
|
||||||
.section .rodata
|
|
||||||
|
|
||||||
.align 1
|
|
||||||
gUnknown_085B5BFC:: @ 85B5BFC
|
|
||||||
.incbin "graphics/roulette/85B5BFC.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B5DFC:: @ 85B5DFC
|
|
||||||
.incbin "graphics/roulette/85B5DFC.bin.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B5FA0:: @ 85B5FA0
|
|
||||||
.incbin "graphics/roulette/wheel_map.bin.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B6140:: @ 85B6140
|
|
||||||
.4byte 0x000001f8, 0x00001241, 0x00002a66
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B614C:: @ 85B614C
|
|
||||||
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x00c5
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B6154:: @ 85B6154
|
|
||||||
.byte 0xFF, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
|
||||||
.byte 0x0C, 0x14, 0x00, 0x11, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x42, 0x08, 0x01, 0x00, 0x00, 0xE0, 0x00, 0x00
|
|
||||||
.byte 0x0D, 0x24, 0x00, 0x14, 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84, 0x10, 0x02, 0x00, 0x00, 0xE0, 0x00, 0x00
|
|
||||||
.byte 0x0E, 0x34, 0x00, 0x17, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x21, 0x04, 0x00, 0x00, 0xE0, 0x00, 0x00
|
|
||||||
.byte 0x0F, 0x44, 0x00, 0x1A, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x42, 0x08, 0x00, 0x00, 0xE0, 0x00, 0x00
|
|
||||||
.byte 0x10, 0x03, 0x01, 0x0E, 0x0A, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0xE0, 0x03, 0x00, 0x00, 0x49, 0x02, 0x00, 0x00
|
|
||||||
.byte 0x00, 0x1C, 0x01, 0x11, 0x0A, 0x03, 0x03, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00
|
|
||||||
.byte 0x09, 0x2C, 0x01, 0x14, 0x0A, 0x03, 0x03, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00
|
|
||||||
.byte 0x06, 0x3C, 0x01, 0x17, 0x0A, 0x03, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00
|
|
||||||
.byte 0x03, 0x4C, 0x01, 0x1A, 0x0A, 0x03, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00
|
|
||||||
.byte 0x11, 0x03, 0x02, 0x0E, 0x0D, 0x03, 0x0F, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x92, 0x04, 0x00, 0x00
|
|
||||||
.byte 0x04, 0x1C, 0x02, 0x11, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00
|
|
||||||
.byte 0x01, 0x2C, 0x02, 0x14, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00
|
|
||||||
.byte 0x0A, 0x3C, 0x02, 0x17, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00
|
|
||||||
.byte 0x07, 0x4C, 0x02, 0x1A, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0x20, 0x00, 0x00
|
|
||||||
.byte 0x12, 0x03, 0x03, 0x0E, 0x10, 0x06, 0x12, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x0F, 0x00, 0x24, 0x09, 0x00, 0x00
|
|
||||||
.byte 0x08, 0x1C, 0x03, 0x11, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00
|
|
||||||
.byte 0x05, 0x2C, 0x03, 0x14, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x20, 0x20, 0x00, 0x00
|
|
||||||
.byte 0x02, 0x3C, 0x03, 0x17, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x20, 0x00, 0x00
|
|
||||||
.byte 0x0B, 0x4C, 0x03, 0x1A, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x28, 0x00, 0x00
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B62E4:: @ 85B62E4
|
|
||||||
.byte 0, 1, 6, 0, 64, 0, 0, 0
|
|
||||||
.byte 1, 3, 12, 0, 0, 16, 0, 0
|
|
||||||
.byte 2, 5, 18, 0, 0, 0, 4, 0
|
|
||||||
.byte 3, 7, 9, 0, 0, 2, 0, 0
|
|
||||||
.byte 4, 9, 11, 0, 0, 8, 0, 0
|
|
||||||
.byte 5, 11, 17, 0, 0, 0, 2, 0
|
|
||||||
.byte 6, 13, 8, 0, 0, 1, 0, 0
|
|
||||||
.byte 7, 15, 14, 0, 0, 64, 0, 0
|
|
||||||
.byte 8, 17, 16, 0, 0, 0, 1, 0
|
|
||||||
.byte 9, 19, 7, 0, 128, 0, 0, 0
|
|
||||||
.byte 10, 21, 13, 0, 0, 32, 0, 0
|
|
||||||
.byte 11, 23, 19, 0, 0, 0, 8, 0
|
|
||||||
|
|
||||||
gUnknown_085B6344:: @ 85B6344
|
|
||||||
.byte 1, 3
|
|
||||||
.byte 1, 6
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B6348:: @ 85B6348
|
|
||||||
.byte 0x01, 0x3C, 0x1E, 0x01, 0x01, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x1E, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x1B, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x68, 0x01, 0x00, 0x00, 0x00, 0xBF
|
|
||||||
.byte 0x03, 0x1E, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x3C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0E, 0x01, 0x00, 0x00, 0x80, 0xBF
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B6388:: @ 85B6388
|
|
||||||
.byte 0x00, 0x80, 0x05, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x0A, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x15, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x55, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x5A, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x65, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x75, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x7A, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x85, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x95, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0x9A, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0x00, 0x80, 0xA5, 0x00, 0x01, 0x01, 0xFF, 0x48
|
|
||||||
.byte 0xD6, 0x77, 0x28, 0x00, 0x02, 0x0A, 0xFF, 0x4E
|
|
||||||
|
|
||||||
.align 1
|
|
||||||
gUnknown_085B63F0:: @ 85B63F0
|
|
||||||
.2byte 0x53FF
|
|
||||||
.2byte 0x0101
|
|
||||||
.2byte 0x1E05
|
|
||||||
.2byte 0x4EFF
|
|
||||||
.2byte 0x7FFB
|
|
||||||
.2byte 0x0106
|
|
||||||
.2byte 0x1E05
|
|
||||||
.2byte 0x4EFF
|
|
||||||
.2byte 0x7F7F
|
|
||||||
.2byte 0x010B
|
|
||||||
.2byte 0x1E05
|
|
||||||
.2byte 0x4EFF
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B6408:: @ 85B6408
|
|
||||||
.4byte sub_8142918
|
|
||||||
.4byte sub_814297C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B6410:: @ 85B6410
|
|
||||||
.4byte sub_8140968
|
|
||||||
.4byte sub_8140994
|
|
||||||
|
|
||||||
.align 1
|
|
||||||
gUnknown_085B6418:: @ 85B6418
|
|
||||||
.2byte 0x2898
|
|
||||||
.2byte 0x1A6A
|
|
||||||
.2byte 0x2898
|
|
||||||
|
|
||||||
gUnknown_085B641E:: @ 85B641E
|
|
||||||
.byte 0xFB, 0x05, 0xFF, 0x01
|
|
||||||
|
|
||||||
.align 1
|
|
||||||
gUnknown_085B6422:: @ 85B6422
|
|
||||||
.2byte 0, 180
|
|
||||||
.2byte 90, 270
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B642C:: @ 85B642C
|
|
||||||
.4byte 0x10842
|
|
||||||
.4byte 0x21084
|
|
||||||
.4byte 0x42108
|
|
||||||
.4byte 0x84210
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B643C:: @ 85B643C
|
|
||||||
.4byte 0x3E0
|
|
||||||
.4byte 0x7C00
|
|
||||||
.4byte 0xF8000
|
|
||||||
|
|
||||||
gUnknown_085B6448:: @ 85B6448
|
|
||||||
.byte 0, 3, 4, 6, 12
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_01: @ 85B6450
|
|
||||||
.incbin "graphics/roulette/shadow.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_02: @ 85B6470
|
|
||||||
.incbin "graphics/roulette/ball.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_03: @ 85B6490
|
|
||||||
.incbin "graphics/roulette/ball_counter.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_04: @ 85B64B0
|
|
||||||
.incbin "graphics/roulette/cursor.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_05: @ 85B64D0
|
|
||||||
.incbin "graphics/roulette/credit.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_06: @ 85B64F0
|
|
||||||
.incbin "graphics/roulette/shroomish.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_07: @ 85B6510
|
|
||||||
.incbin "graphics/roulette/tailow.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_08: @ 85B6530
|
|
||||||
.incbin "graphics/roulette/poke_icons.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_09: @ 85B6550
|
|
||||||
.incbin "graphics/roulette/wynaut.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_10: @ 85B6570
|
|
||||||
.incbin "graphics/roulette/azurill.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_11: @ 85B6590
|
|
||||||
.incbin "graphics/roulette/skitty.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_12: @ 85B65B0
|
|
||||||
.incbin "graphics/roulette/makuhita.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_13: @ 85B65D0
|
|
||||||
.incbin "graphics/roulette/85B65D0.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_14: @ 85B65F0
|
|
||||||
.incbin "graphics/roulette/85B65F0.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_15: @ 85B6610
|
|
||||||
.incbin "graphics/roulette/85B6610.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteSpritePalette_16: @ 85B6630
|
|
||||||
.incbin "graphics/roulette/85B6630.gbapal"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B6650:: @ 85B6650
|
|
||||||
.incbin "graphics/roulette/ball.4bpp.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteBallCounterTiles: @ 85B6798
|
|
||||||
.incbin "graphics/roulette/ball_counter.4bpp.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B67FC:: @ 85B67FC
|
|
||||||
.incbin "graphics/roulette/roulette_tilt.4bpp.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RoulettePokeIconsTiles: @ 85B6BEC
|
|
||||||
.incbin "graphics/roulette/poke_icons.4bpp.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RoulettePokeIcons2Tiles: @ 85B6D90
|
|
||||||
.incbin "graphics/roulette/poke_icons2.4bpp.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7290:: @ 85B7290
|
|
||||||
.incbin "graphics/roulette/shadow.4bpp.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
RouletteCursorTiles: @ 85B7328
|
|
||||||
.incbin "graphics/roulette/cursor.4bpp.lz"
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7384:: @ 85B7384
|
|
||||||
obj_pal RouletteSpritePalette_01, 1
|
|
||||||
obj_pal RouletteSpritePalette_02, 2
|
|
||||||
obj_pal RouletteSpritePalette_03, 3
|
|
||||||
obj_pal RouletteSpritePalette_04, 4
|
|
||||||
obj_pal RouletteSpritePalette_05, 5
|
|
||||||
obj_pal RouletteSpritePalette_06, 6
|
|
||||||
obj_pal RouletteSpritePalette_07, 7
|
|
||||||
obj_pal RouletteSpritePalette_08, 8
|
|
||||||
obj_pal RouletteSpritePalette_09, 9
|
|
||||||
obj_pal RouletteSpritePalette_10, 10
|
|
||||||
obj_pal RouletteSpritePalette_11, 11
|
|
||||||
obj_pal RouletteSpritePalette_12, 12
|
|
||||||
null_obj_pal
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B73EC:: @ 85B73EC
|
|
||||||
.2byte 0x0000
|
|
||||||
.2byte 0x8000
|
|
||||||
.2byte 0x0400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B73F4:: @ 85B73F4
|
|
||||||
.2byte 0x0000
|
|
||||||
.2byte 0x4000
|
|
||||||
.2byte 0x0400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B73FC:: @ 85B73FC
|
|
||||||
.2byte 0x833C
|
|
||||||
.2byte 0x8000
|
|
||||||
.2byte 0x0800
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7404:: @ 85B7404
|
|
||||||
obj_image_anim_frame 0, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B740C:: @ 85B740C
|
|
||||||
.4byte gSpriteAnim_85B7404
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAffineAnim_85B7410:: @ 85B7410
|
|
||||||
obj_rot_scal_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAffineAnimTable_85B7418:: @ 85B7418
|
|
||||||
.4byte gSpriteAffineAnim_85B7410
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B741C:: @ 85B741C
|
|
||||||
obj_tiles RoulettePokeIcons2Tiles, 0xC00, 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7420:: @ 85B7420
|
|
||||||
obj_image_anim_frame 0, 0
|
|
||||||
obj_image_anim_frame 32, 0
|
|
||||||
obj_image_anim_frame 64, 0
|
|
||||||
obj_image_anim_frame 72, 0
|
|
||||||
obj_image_anim_frame 8, 0
|
|
||||||
obj_image_anim_frame 40, 0
|
|
||||||
obj_image_anim_frame 48, 0
|
|
||||||
obj_image_anim_frame 80, 0
|
|
||||||
obj_image_anim_frame 16, 0
|
|
||||||
obj_image_anim_frame 24, 0
|
|
||||||
obj_image_anim_frame 56, 0
|
|
||||||
obj_image_anim_frame 88, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7458:: @ 85B7458
|
|
||||||
.4byte gSpriteAnim_85B7420
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B745C:: @ 85B745C
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x4
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7460:: @ 85B7460
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x8
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7464:: @ 85B7464
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0xC
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7468:: @ 85B7468
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x10
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B746C:: @ 85B746C
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x14
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7470:: @ 85B7470
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x18
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7474:: @ 85B7474
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x1C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7478:: @ 85B7478
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x20
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B747C:: @ 85B747C
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x24
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7480:: @ 85B7480
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x28
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7484:: @ 85B7484
|
|
||||||
.4byte gSpriteAnim_85B7420 + 0x2C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7488:: @ 85B7488
|
|
||||||
obj_tiles gRouletteHeadersTiles, 0x1600, 4
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7490:: @ 85B7490
|
|
||||||
obj_tiles RoulettePokeIconsTiles, 0x400, 5
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7498:: @ 85B7498
|
|
||||||
obj_image_anim_frame 0, 0
|
|
||||||
obj_image_anim_frame 16, 0
|
|
||||||
obj_image_anim_frame 32, 0
|
|
||||||
obj_image_anim_frame 48, 0
|
|
||||||
obj_image_anim_frame 64, 0
|
|
||||||
obj_image_anim_frame 80, 0
|
|
||||||
obj_image_anim_frame 96, 0
|
|
||||||
obj_image_anim_frame 112, 0
|
|
||||||
obj_image_anim_frame 128, 0
|
|
||||||
obj_image_anim_frame 144, 0
|
|
||||||
obj_image_anim_frame 160, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B74C8:: @ 85B74C8
|
|
||||||
obj_image_anim_frame 0, 0
|
|
||||||
obj_image_anim_frame 4, 0
|
|
||||||
obj_image_anim_frame 8, 0
|
|
||||||
obj_image_anim_frame 12, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74DC:: @ 85B74DC
|
|
||||||
.4byte gSpriteAnim_85B7498
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74E0:: @ 85B74E0
|
|
||||||
.4byte gSpriteAnim_85B7498 + 0x8
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74E4:: @ 85B74E4
|
|
||||||
.4byte gSpriteAnim_85B7498 + 0x10
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74E8:: @ 85B74E8
|
|
||||||
.4byte gSpriteAnim_85B7498 + 0x18
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74EC:: @ 85B74EC
|
|
||||||
.4byte gSpriteAnim_85B7498 + 0x20
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74F0:: @ 85B74F0
|
|
||||||
.4byte gSpriteAnim_85B7498 + 0x24
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74F4:: @ 85B74F4
|
|
||||||
.4byte gSpriteAnim_85B7498 + 0x28
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74F8:: @ 85B74F8
|
|
||||||
.4byte gSpriteAnim_85B74C8
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B74FC:: @ 85B74FC
|
|
||||||
.4byte gSpriteAnim_85B74C8 + 0x4
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7500:: @ 85B7500
|
|
||||||
.4byte gSpriteAnim_85B74C8 + 0x8
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7504:: @ 85B7504
|
|
||||||
.4byte gSpriteAnim_85B74C8 + 0xC
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7508:: @ 85B7508
|
|
||||||
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74DC, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7520:: @ 85B7520
|
|
||||||
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E0, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7538:: @ 85B7538
|
|
||||||
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E4, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7550:: @ 85B7550
|
|
||||||
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E8, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7568:: @ 85B7568
|
|
||||||
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74EC, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7580:: @ 85B7580
|
|
||||||
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74F0, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7598:: @ 85B7598
|
|
||||||
spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74F4, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B75B0:: @ 85B75B0
|
|
||||||
spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B74F8, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B75C8:: @ 85B75C8
|
|
||||||
spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B74FC, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B75E0:: @ 85B75E0
|
|
||||||
spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B7500, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B75F8:: @ 85B75F8
|
|
||||||
spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B7504, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7610:: @ 85B7610
|
|
||||||
spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7458, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7628:: @ 85B7628
|
|
||||||
spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B745C, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7640:: @ 85B7640
|
|
||||||
spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7460, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7658:: @ 85B7658
|
|
||||||
spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7464, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7670:: @ 85B7670
|
|
||||||
spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7468, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7688:: @ 85B7688
|
|
||||||
spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B746C, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B76A0:: @ 85B76A0
|
|
||||||
spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7470, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B76B8:: @ 85B76B8
|
|
||||||
spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7474, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B76D0:: @ 85B76D0
|
|
||||||
spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7478, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B76E8:: @ 85B76E8
|
|
||||||
spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B747C, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7700:: @ 85B7700
|
|
||||||
spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7480, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7718:: @ 85B7718
|
|
||||||
spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7484, NULL, gDummySpriteAffineAnimTable, sub_8143280
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7730:: @ 85B7730
|
|
||||||
.2byte 0x4000
|
|
||||||
.2byte 0xC000
|
|
||||||
.2byte 0x0400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7738:: @ 85B7738
|
|
||||||
.2byte 0x8000
|
|
||||||
.2byte 0x0000
|
|
||||||
.2byte 0x0400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7740:: @ 85B7740
|
|
||||||
.2byte 0x4000
|
|
||||||
.2byte 0x8000
|
|
||||||
.2byte 0x0400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7748:: @ 85B7748
|
|
||||||
.2byte 0x4000
|
|
||||||
.2byte 0x0000
|
|
||||||
.2byte 0x0400
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7750:: @ 85B7750
|
|
||||||
obj_tiles gRouletteCreditTiles, 0x400, 7
|
|
||||||
obj_tiles gRouletteNumbersTiles, 0x280, 8
|
|
||||||
obj_tiles gRouletteMultiplierTiles, 0x500, 9
|
|
||||||
obj_tiles RouletteBallCounterTiles, 0x140, 10
|
|
||||||
obj_tiles RouletteCursorTiles, 0x200, 11
|
|
||||||
null_obj_tiles
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7780:: @ 85B7780
|
|
||||||
obj_image_anim_frame 0, 0
|
|
||||||
obj_image_anim_frame 2, 0
|
|
||||||
obj_image_anim_frame 4, 0
|
|
||||||
obj_image_anim_frame 6, 0
|
|
||||||
obj_image_anim_frame 8, 0
|
|
||||||
obj_image_anim_frame 10, 0
|
|
||||||
obj_image_anim_frame 12, 0
|
|
||||||
obj_image_anim_frame 14, 0
|
|
||||||
obj_image_anim_frame 16, 0
|
|
||||||
obj_image_anim_frame 18, 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B77A8:: @ 85B77A8
|
|
||||||
.4byte gSpriteAnim_85B7780
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B77AC:: @ 85B77AC
|
|
||||||
obj_image_anim_frame 0, 0
|
|
||||||
obj_image_anim_frame 8, 0
|
|
||||||
obj_image_anim_frame 16, 0
|
|
||||||
obj_image_anim_frame 24, 0
|
|
||||||
obj_image_anim_frame 32, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B77C4:: @ 85B77C4
|
|
||||||
.4byte gSpriteAnim_85B77AC
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B77C8:: @ 85B77C8
|
|
||||||
obj_image_anim_frame 0, 0
|
|
||||||
obj_image_anim_frame 2, 0
|
|
||||||
obj_image_anim_frame 4, 0
|
|
||||||
obj_image_anim_frame 6, 0
|
|
||||||
obj_image_anim_frame 8, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B77E0:: @ 85B77E0
|
|
||||||
.4byte gSpriteAnim_85B77C8
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B77E4:: @ 85B77E4
|
|
||||||
spr_template 7, 5, gOamData_85B7730, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B77FC:: @ 85B77FC
|
|
||||||
spr_template 8, 5, gOamData_85B7738, gSpriteAnimTable_85B77A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7814:: @ 85B7814
|
|
||||||
spr_template 9, 5, gOamData_85B7740, gSpriteAnimTable_85B77C4, NULL, gDummySpriteAffineAnimTable, sub_814390C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B782C:: @ 85B782C
|
|
||||||
spr_template 10, 3, gOamData_85B7748, gSpriteAnimTable_85B77E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7844:: @ 85B7844
|
|
||||||
spr_template 11, 5, gOamData_85B73EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B785C:: @ 85B785C
|
|
||||||
.2byte 0x0000
|
|
||||||
.2byte 0x4000
|
|
||||||
.2byte 0x0800
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7864:: @ 85B7864
|
|
||||||
obj_tiles gUnknown_085B6650, 0x200, 0xC
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B786C:: @ 85B786C
|
|
||||||
obj_image_anim_frame 0, 5
|
|
||||||
obj_image_anim_frame 4, 5
|
|
||||||
obj_image_anim_frame 8, 5
|
|
||||||
obj_image_anim_frame 4, 5
|
|
||||||
obj_image_anim_jump 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7880:: @ 85B7880
|
|
||||||
obj_image_anim_frame 0, 10
|
|
||||||
obj_image_anim_frame 4, 10
|
|
||||||
obj_image_anim_frame 8, 10
|
|
||||||
obj_image_anim_frame 4, 10
|
|
||||||
obj_image_anim_jump 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7894:: @ 85B7894
|
|
||||||
obj_image_anim_frame 0, 15
|
|
||||||
obj_image_anim_frame 4, 15
|
|
||||||
obj_image_anim_frame 8, 15
|
|
||||||
obj_image_anim_frame 4, 15
|
|
||||||
obj_image_anim_jump 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B78A8:: @ 85B78A8
|
|
||||||
obj_image_anim_frame 4, 2
|
|
||||||
obj_image_anim_frame 8, 5
|
|
||||||
obj_image_anim_frame 4, 5
|
|
||||||
obj_image_anim_frame 12, 5
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B78BC:: @ 85B78BC
|
|
||||||
obj_image_anim_frame 4, 2
|
|
||||||
obj_image_anim_frame 0, 4
|
|
||||||
obj_image_anim_frame 4, 4
|
|
||||||
obj_image_anim_frame 8, 4
|
|
||||||
obj_image_anim_frame 12, 4
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B78D4:: @ 85B78D4
|
|
||||||
obj_image_anim_frame 0, 2
|
|
||||||
obj_image_anim_frame 4, 5
|
|
||||||
obj_image_anim_frame 8, 5
|
|
||||||
obj_image_anim_frame 12, 5
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B78E8:: @ 85B78E8
|
|
||||||
obj_image_anim_frame 12, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B78F0:: @ 85B78F0
|
|
||||||
obj_image_anim_frame 8, 2
|
|
||||||
obj_image_anim_frame 4, 5
|
|
||||||
obj_image_anim_frame 0, 5
|
|
||||||
obj_image_anim_frame 12, 5
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7904:: @ 85B7904
|
|
||||||
.4byte gSpriteAnim_85B786C
|
|
||||||
.4byte gSpriteAnim_85B7880
|
|
||||||
.4byte gSpriteAnim_85B7894
|
|
||||||
.4byte gSpriteAnim_85B78A8
|
|
||||||
.4byte gSpriteAnim_85B78F0
|
|
||||||
.4byte gSpriteAnim_85B78BC
|
|
||||||
.4byte gSpriteAnim_85B78D4
|
|
||||||
.4byte gSpriteAnim_85B78D4
|
|
||||||
.4byte gSpriteAnim_85B78E8
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7928:: @ 85B7928
|
|
||||||
spr_template 12, 2, gOamData_85B785C, gSpriteAnimTable_85B7904, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7940:: @ 85B7940
|
|
||||||
.2byte 0x0351
|
|
||||||
.2byte 0xC000
|
|
||||||
.2byte 0x0800
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7948:: @ 85B7948
|
|
||||||
obj_tiles gRouletteCenter_Gfx, 2048, 0x0006
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7950:: @ 85B7950
|
|
||||||
spr_template 6, 2, gOamData_85B7940, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_814399C
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7968:: @ 85B7968
|
|
||||||
.2byte 0x0000
|
|
||||||
.2byte 0x8000
|
|
||||||
.2byte 0x0800
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7970:: @ 85B7970
|
|
||||||
.2byte 0x0000
|
|
||||||
.2byte 0x8000
|
|
||||||
.2byte 0x0800
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7978:: @ 85B7978
|
|
||||||
obj_tiles gUnknown_085B67FC, 0xE00, 0x000D
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7980:: @ 85B7980
|
|
||||||
obj_image_anim_frame 0x00, 6
|
|
||||||
obj_image_anim_frame 0x10, 6
|
|
||||||
obj_image_anim_frame 0x20, 6
|
|
||||||
obj_image_anim_frame 0x30, 6
|
|
||||||
obj_image_anim_frame 0x20, 6
|
|
||||||
obj_image_anim_frame 0x40, 6
|
|
||||||
obj_image_anim_jump 2
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B799C:: @ 85B799C
|
|
||||||
obj_image_anim_frame 0x50, 10
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B79A4:: @ 85B79A4
|
|
||||||
obj_image_anim_frame 0x50, 10, OBJ_IMAGE_ANIM_H_FLIP
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B79AC:: @ 85B79AC
|
|
||||||
obj_image_anim_frame 0x50, 20
|
|
||||||
obj_image_anim_frame 0x60, 20
|
|
||||||
obj_image_anim_jump 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B79B8:: @ 85B79B8
|
|
||||||
obj_image_anim_frame 0x50, 20, OBJ_IMAGE_ANIM_H_FLIP
|
|
||||||
obj_image_anim_frame 0x60, 20, OBJ_IMAGE_ANIM_H_FLIP
|
|
||||||
obj_image_anim_jump 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B79C4:: @ 85B79C4
|
|
||||||
obj_image_anim_frame 0x50, 10
|
|
||||||
obj_image_anim_frame 0x60, 10
|
|
||||||
obj_image_anim_jump 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B79D0:: @ 85B79D0
|
|
||||||
obj_image_anim_frame 0x50, 10, OBJ_IMAGE_ANIM_H_FLIP
|
|
||||||
obj_image_anim_frame 0x60, 10, OBJ_IMAGE_ANIM_H_FLIP
|
|
||||||
obj_image_anim_jump 0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B79DC:: @ 85B79DC
|
|
||||||
.4byte gSpriteAnim_85B7980
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B79E0:: @ 85B79E0
|
|
||||||
.4byte gSpriteAnim_85B799C
|
|
||||||
.4byte gSpriteAnim_85B79A4
|
|
||||||
.4byte gSpriteAnim_85B79AC
|
|
||||||
.4byte gSpriteAnim_85B79B8
|
|
||||||
.4byte gSpriteAnim_85B79C4
|
|
||||||
.4byte gSpriteAnim_85B79D0
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B79F8:: @ 85B79F8
|
|
||||||
spr_template 13, 6, gOamData_85B7968, gSpriteAnimTable_85B79DC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7A10:: @ 85B7A10
|
|
||||||
spr_template 13, 7, gOamData_85B7970, gSpriteAnimTable_85B79E0, NULL, gDummySpriteAffineAnimTable, sub_8145294
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7A28:: @ 85B7A28
|
|
||||||
.2byte 0x0000
|
|
||||||
.2byte 0x4000
|
|
||||||
.2byte 0x0800
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7A30:: @ 85B7A30
|
|
||||||
.2byte 0x4000
|
|
||||||
.2byte 0x8000
|
|
||||||
.2byte 0x0800
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gOamData_85B7A38:: @ 85B7A38
|
|
||||||
.2byte 0x4100
|
|
||||||
.2byte 0x8000
|
|
||||||
.2byte 0x0800
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7A40:: @ 85B7A40
|
|
||||||
obj_tiles gUnknown_085B7290, 0x180, 0x000E
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAffineAnim_85B7A48:: @ 85B7A48
|
|
||||||
obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
|
|
||||||
obj_rot_scal_anim_frame 0x2, 0x2, 0, 60
|
|
||||||
obj_rot_scal_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAffineAnim_85B7A60:: @ 85B7A60
|
|
||||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
|
||||||
obj_rot_scal_anim_frame 0xFFFE, 0x0, 0, 15
|
|
||||||
obj_rot_scal_anim_frame 0xFFFF, 0xFFFE, 0, 15
|
|
||||||
obj_rot_scal_anim_frame 0xFFFF, 0xFFFB, 0, 24
|
|
||||||
obj_rot_scal_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAffineAnimTable_85B7A88:: @ 85B7A88
|
|
||||||
.4byte gSpriteAffineAnim_85B7A48
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAffineAnimTable_85B7A8C:: @ 85B7A8C
|
|
||||||
.4byte gSpriteAffineAnim_85B7A60
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAffineAnim_85B7A90:: @ 85B7A90
|
|
||||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
|
||||||
obj_rot_scal_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAffineAnimTable_85B7AA0:: @ 85B7AA0
|
|
||||||
.4byte gSpriteAffineAnim_85B7A90
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7AA4:: @ 85B7AA4
|
|
||||||
obj_image_anim_frame 0, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnim_85B7AAC:: @ 85B7AAC
|
|
||||||
obj_image_anim_frame 4, 0
|
|
||||||
obj_image_anim_end
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7AB4:: @ 85B7AB4
|
|
||||||
.4byte gSpriteAnim_85B7AA4
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteAnimTable_85B7AB8:: @ 85B7AB8
|
|
||||||
.4byte gSpriteAnim_85B7AAC
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_85B7ABC:: @ 85B7ABC
|
|
||||||
spr_template 14, 1, gOamData_85B7A28, gSpriteAnimTable_85B7AB4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gSpriteTemplate_83FA5D8:: @ 83FA5D8
|
|
||||||
spr_template 14, 1, gOamData_85B7A30, gSpriteAnimTable_85B7AB8, NULL, gDummySpriteAffineAnimTable, sub_8144E60
|
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_085B7AEC:: @ 85B7AEC
|
|
||||||
spr_template 14, 1, gOamData_85B7A38, gSpriteAnimTable_85B7AB8, NULL, gSpriteAffineAnimTable_85B7A8C, sub_8145294
|
|
||||||
|
|
||||||
gUnknown_085B7B04:: @ 85B7B04
|
|
||||||
.byte 0, 1, 2, 3, 4
|
|
||||||
|
|
||||||
.align 1
|
|
||||||
gUnknown_085B7B0A:: @ 85B7B0A
|
|
||||||
.2byte 0x74, 0x2C
|
|
||||||
.2byte 0x74, 0x70
|
|
||||||
|
|
||||||
.align 1
|
|
||||||
gUnknown_085B7B12:: @ 85B7B12
|
|
||||||
.2byte 256, 84
|
|
||||||
.2byte -16, 84
|
|
||||||
|
|
||||||
.align 1
|
|
||||||
gUnknown_085B7B1A:: @ 85B7B1A
|
|
||||||
.2byte 0x907
|
|
||||||
.2byte 0x808
|
|
||||||
.2byte 0x709
|
|
||||||
.2byte 0x60A
|
|
||||||
.2byte 0x50B
|
|
||||||
.2byte 0x40C
|
|
||||||
.2byte 0x30D
|
|
||||||
.2byte 0x20E
|
|
||||||
.2byte 0x10F
|
|
||||||
.2byte 0x10
|
|
||||||
|
|
||||||
.align 1
|
|
||||||
gUnknown_085B7B2E:: @ 85B7B2E
|
|
||||||
.2byte -1, 0, 1, 0
|
|
||||||
.2byte -2, 0, 2, 0
|
|
||||||
.2byte -3, 0, 3, 0
|
|
||||||
|
|
||||||
gUnknown_085B7B46:: @ 85B7B46
|
|
||||||
.byte -1, 1
|
|
||||||
|
|
||||||
gUnknown_085B7B48:: @ 85B7B48
|
|
||||||
.byte 2, 0
|
|
||||||
.byte 2, 0
|
|
||||||
.byte 2, -1
|
|
||||||
.byte 2, -1
|
|
||||||
.byte 2, -1
|
|
||||||
.byte 2, -1
|
|
||||||
.byte 2, -2
|
|
||||||
.byte 2, -2
|
|
||||||
@ -173,7 +173,7 @@ gSpecials:: @ 81DBA64
|
|||||||
def_special sub_81B94B0
|
def_special sub_81B94B0
|
||||||
def_special GetFirstFreePokeblockSlot
|
def_special GetFirstFreePokeblockSlot
|
||||||
def_special DoBerryBlending
|
def_special DoBerryBlending
|
||||||
def_special sub_8142BC8
|
def_special PlayRoulette
|
||||||
def_special ShouldMoveLilycoveFanClubMember
|
def_special ShouldMoveLilycoveFanClubMember
|
||||||
def_special GetNumMovedLilycoveFanClubMembers
|
def_special GetNumMovedLilycoveFanClubMembers
|
||||||
def_special BufferStreakTrainerText
|
def_special BufferStreakTrainerText
|
||||||
|
|||||||
2953
data/text/match_call.inc
Executable file
2953
data/text/match_call.inc
Executable file
File diff suppressed because it is too large
Load Diff
@ -9,6 +9,7 @@
|
|||||||
#define FRONTIER_FACILITY_FACTORY 4
|
#define FRONTIER_FACILITY_FACTORY 4
|
||||||
#define FRONTIER_FACILITY_PIKE 5
|
#define FRONTIER_FACILITY_PIKE 5
|
||||||
#define FRONTIER_FACILITY_PYRAMID 6
|
#define FRONTIER_FACILITY_PYRAMID 6
|
||||||
|
#define NUM_FRONTIER_FACILITIES 7
|
||||||
|
|
||||||
#define TENT_VERDANTURF 2
|
#define TENT_VERDANTURF 2
|
||||||
#define TENT_FALLARBOR 3
|
#define TENT_FALLARBOR 3
|
||||||
|
|||||||
@ -60,7 +60,7 @@ struct OamData
|
|||||||
|
|
||||||
/*0x02*/ u32 x:9;
|
/*0x02*/ u32 x:9;
|
||||||
u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
|
u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
|
||||||
u32 size:2;
|
u32 size:2; // 0x4000, 0x8000 -> 0xC000
|
||||||
|
|
||||||
/*0x04*/ u16 tileNum:10; // 0x3FF
|
/*0x04*/ u16 tileNum:10; // 0x3FF
|
||||||
u16 priority:2; // 0x400, 0x800 -> 0xC00
|
u16 priority:2; // 0x400, 0x800 -> 0xC00
|
||||||
|
|||||||
@ -4818,4 +4818,13 @@ extern const u32 gStatusPal_Icons[];
|
|||||||
extern const u32 gPartyMenuPokeball_Pal[];
|
extern const u32 gPartyMenuPokeball_Pal[];
|
||||||
extern const u32 gStatusPal_Icons[];
|
extern const u32 gStatusPal_Icons[];
|
||||||
|
|
||||||
|
// Roulette
|
||||||
|
extern const u32 gRouletteMenuTiles[];
|
||||||
|
extern const u32 gRouletteWheelTiles[];
|
||||||
|
extern const u32 gRouletteCenter_Gfx[];
|
||||||
|
extern const u32 gRouletteHeadersTiles[];
|
||||||
|
extern const u32 gRouletteCreditTiles[];
|
||||||
|
extern const u32 gRouletteNumbersTiles[];
|
||||||
|
extern const u32 gRouletteMultiplierTiles[];
|
||||||
|
|
||||||
#endif //GUARD_GRAPHICS_H
|
#endif //GUARD_GRAPHICS_H
|
||||||
|
|||||||
@ -8,7 +8,8 @@ void m4aSoundVSyncOn(void);
|
|||||||
|
|
||||||
void m4aSoundInit(void);
|
void m4aSoundInit(void);
|
||||||
void m4aSoundMain(void);
|
void m4aSoundMain(void);
|
||||||
void m4aSongNumStart(u16);
|
void m4aSongNumStart(u16 n);
|
||||||
|
void m4aSongNumStartOrChange(u16 n);
|
||||||
void m4aSongNumStop(u16 n);
|
void m4aSongNumStop(u16 n);
|
||||||
void m4aMPlayAllStop(void);
|
void m4aMPlayAllStop(void);
|
||||||
void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
|
void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
|
||||||
|
|||||||
@ -20,7 +20,7 @@ void ResetAllBgsCoordinates(void);
|
|||||||
void SetVBlankHBlankCallbacksToNull(void);
|
void SetVBlankHBlankCallbacksToNull(void);
|
||||||
void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
|
void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
|
||||||
bool16 RunTextPrintersRetIsActive(u8 textPrinterId);
|
bool16 RunTextPrintersRetIsActive(u8 textPrinterId);
|
||||||
void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
|
void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data);
|
||||||
void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
|
void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
|
||||||
bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
|
bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
|
||||||
u8 GetLRKeysState(void);
|
u8 GetLRKeysState(void);
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
#ifndef GUARD_ROULETTE_UTIL_H
|
#ifndef GUARD_ROULETTE_UTIL_H
|
||||||
#define GUARD_ROULETTE_UTIL_H
|
#define GUARD_ROULETTE_UTIL_H
|
||||||
|
|
||||||
|
#include "roulette.h"
|
||||||
|
|
||||||
struct PulseBlendSettings
|
struct PulseBlendSettings
|
||||||
{
|
{
|
||||||
u16 blendColor;
|
u16 blendColor;
|
||||||
@ -41,5 +43,10 @@ void UnmarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8);
|
|||||||
void UpdatePulseBlend(struct PulseBlend *);
|
void UpdatePulseBlend(struct PulseBlend *);
|
||||||
void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height);
|
void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height);
|
||||||
void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height);
|
void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height);
|
||||||
|
void task_tutorial_controls_fadein(struct UnkStruct0 *r0);
|
||||||
|
void sub_8151678(struct UnkStruct0 *r0);
|
||||||
|
u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2);
|
||||||
|
void sub_8151A9C(struct UnkStruct0 *r0, u16 r1);
|
||||||
|
void sub_8151A48(struct UnkStruct0 *r0, u16 r1);
|
||||||
|
|
||||||
#endif // GUARD_ROULETTE_UTIL_H
|
#endif // GUARD_ROULETTE_UTIL_H
|
||||||
|
|||||||
@ -44,5 +44,6 @@ void RtcInitLocalTimeOffset(s32 hour, s32 minute);
|
|||||||
void RtcCalcLocalTimeOffset(s32 days, s32 hours, s32 minutes, s32 seconds);
|
void RtcCalcLocalTimeOffset(s32 days, s32 hours, s32 minutes, s32 seconds);
|
||||||
void CalcTimeDifference(struct Time *result, struct Time *t1, struct Time *t2);
|
void CalcTimeDifference(struct Time *result, struct Time *t1, struct Time *t2);
|
||||||
u32 RtcGetMinuteCount(void);
|
u32 RtcGetMinuteCount(void);
|
||||||
|
u32 RtcGetLocalDayCount(void);
|
||||||
|
|
||||||
#endif // GUARD_RTC_UTIL_H
|
#endif // GUARD_RTC_UTIL_H
|
||||||
|
|||||||
@ -869,6 +869,13 @@ extern const u8 gText_TeachWhichMoveToPkmn[];
|
|||||||
extern const u8 gText_GiveUpTeachingNewMove[];
|
extern const u8 gText_GiveUpTeachingNewMove[];
|
||||||
extern const u8 gText_TeachX[];
|
extern const u8 gText_TeachX[];
|
||||||
|
|
||||||
|
extern const u8 gText_Kira[];
|
||||||
|
extern const u8 gText_Amy[];
|
||||||
|
extern const u8 gText_John[];
|
||||||
|
extern const u8 gText_Roy[];
|
||||||
|
extern const u8 gText_Gabby[];
|
||||||
|
extern const u8 gText_Anna[];
|
||||||
|
|
||||||
extern const u8 gText_DadsAdvice[];
|
extern const u8 gText_DadsAdvice[];
|
||||||
extern const u8 gText_CantDismountBike[];
|
extern const u8 gText_CantDismountBike[];
|
||||||
extern const u8 gText_ItemFinderNothing[];
|
extern const u8 gText_ItemFinderNothing[];
|
||||||
@ -1990,4 +1997,214 @@ extern const u8 gText_XSentOverY[];
|
|||||||
extern const u8 gText_TakeGoodCareOfX[];
|
extern const u8 gText_TakeGoodCareOfX[];
|
||||||
extern const u8 gText_CommunicationStandby5[];
|
extern const u8 gText_CommunicationStandby5[];
|
||||||
|
|
||||||
|
// roulette
|
||||||
|
extern const u8 gUnknown_082A5B89[];
|
||||||
|
|
||||||
|
// match call
|
||||||
|
extern const u8 MatchCall_WildBattleText1[];
|
||||||
|
extern const u8 MatchCall_WildBattleText2[];
|
||||||
|
extern const u8 MatchCall_WildBattleText3[];
|
||||||
|
extern const u8 MatchCall_WildBattleText4[];
|
||||||
|
extern const u8 MatchCall_WildBattleText5[];
|
||||||
|
extern const u8 MatchCall_WildBattleText6[];
|
||||||
|
extern const u8 MatchCall_WildBattleText7[];
|
||||||
|
extern const u8 MatchCall_WildBattleText8[];
|
||||||
|
extern const u8 MatchCall_WildBattleText9[];
|
||||||
|
extern const u8 MatchCall_WildBattleText10[];
|
||||||
|
extern const u8 MatchCall_WildBattleText11[];
|
||||||
|
extern const u8 MatchCall_WildBattleText12[];
|
||||||
|
extern const u8 MatchCall_WildBattleText13[];
|
||||||
|
extern const u8 MatchCall_WildBattleText14[];
|
||||||
|
extern const u8 MatchCall_WildBattleText15[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText1[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText2[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText3[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText4[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText5[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText6[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText7[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText8[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText9[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText10[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText11[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText12[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText13[];
|
||||||
|
extern const u8 MatchCall_NegativeBattleText14[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText1[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText2[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText3[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText4[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText5[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText6[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText7[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText8[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText9[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText10[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText11[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText12[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText13[];
|
||||||
|
extern const u8 MatchCall_PositiveBattleText14[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText1[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText2[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText3[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText4[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText5[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText6[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText7[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText8[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText9[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText10[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText11[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText12[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText13[];
|
||||||
|
extern const u8 MatchCall_SameRouteBattleRequestText14[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText1[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText2[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText3[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText4[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText5[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText6[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText7[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText8[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText9[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText10[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText11[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText12[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText13[];
|
||||||
|
extern const u8 MatchCall_DifferentRouteBattleRequestText14[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText1[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText2[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText3[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText4[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText5[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText6[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText7[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText8[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText9[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText10[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText11[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText12[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText13[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText14[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText15[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText16[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText17[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText18[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText19[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText20[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText21[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText22[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText23[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText24[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText25[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText26[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText27[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText28[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText29[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText30[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText31[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText32[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText33[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText34[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText35[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText36[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText37[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText38[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText39[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText40[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText41[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText42[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText43[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText44[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText45[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText46[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText47[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText48[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText49[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText50[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText51[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText52[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText53[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText54[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText55[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText56[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText57[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText58[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText59[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText60[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText61[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText62[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText63[];
|
||||||
|
extern const u8 MatchCall_PersonalizedText64[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText1[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText2[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText3[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText4[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText5[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText6[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText7[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText8[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText9[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText10[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText11[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText12[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText13[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierStreakText14[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText1[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText2[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText3[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText4[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText5[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText6[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText7[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText8[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText9[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText10[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText11[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText12[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText13[];
|
||||||
|
extern const u8 MatchCall_BattleFrontierRecordStreakText14[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText1[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText2[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText3[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText4[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText5[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText6[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText7[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText8[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText9[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText10[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText11[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText12[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText13[];
|
||||||
|
extern const u8 MatchCall_BattleDomeText14[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText1[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText2[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText3[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText4[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText5[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText6[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText7[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText8[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText9[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText10[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText11[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText12[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText13[];
|
||||||
|
extern const u8 MatchCall_BattlePikeText14[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText1[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText2[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText3[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText4[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText5[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText6[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText7[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText8[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText9[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText10[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText11[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText12[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText13[];
|
||||||
|
extern const u8 MatchCall_BattlePyramidText14[];
|
||||||
|
|
||||||
#endif //GUARD_STRINGS_H
|
#endif //GUARD_STRINGS_H
|
||||||
|
|||||||
@ -206,7 +206,7 @@ SECTIONS {
|
|||||||
src/battle_records.o(.text);
|
src/battle_records.o(.text);
|
||||||
src/pokedex_area_screen.o(.text);
|
src/pokedex_area_screen.o(.text);
|
||||||
src/evolution_scene.o(.text);
|
src/evolution_scene.o(.text);
|
||||||
asm/roulette.o(.text);
|
src/roulette.o(.text);
|
||||||
src/pokedex_cry_screen.o(.text);
|
src/pokedex_cry_screen.o(.text);
|
||||||
src/coins.o(.text);
|
src/coins.o(.text);
|
||||||
src/landmark.o(.text);
|
src/landmark.o(.text);
|
||||||
@ -262,7 +262,7 @@ SECTIONS {
|
|||||||
src/lilycove_lady.o(.text);
|
src/lilycove_lady.o(.text);
|
||||||
src/battle_dome.o(.text);
|
src/battle_dome.o(.text);
|
||||||
src/battle_palace.o(.text);
|
src/battle_palace.o(.text);
|
||||||
asm/battle_frontier_1.o(.text);
|
src/match_call.o(.text);
|
||||||
src/menu.o(.text);
|
src/menu.o(.text);
|
||||||
src/battle_factory_screen.o(.text);
|
src/battle_factory_screen.o(.text);
|
||||||
src/apprentice.o(.text);
|
src/apprentice.o(.text);
|
||||||
@ -289,7 +289,7 @@ SECTIONS {
|
|||||||
src/unk_pokedex_area_screen_helper.o(.text);
|
src/unk_pokedex_area_screen_helper.o(.text);
|
||||||
src/battle_pyramid_bag.o(.text);
|
src/battle_pyramid_bag.o(.text);
|
||||||
asm/pokenav.o(.text);
|
asm/pokenav.o(.text);
|
||||||
src/match_call.o(.text);
|
src/pokenav_match_call.o(.text);
|
||||||
asm/pokenav.o(.text.after.match.call);
|
asm/pokenav.o(.text.after.match.call);
|
||||||
src/rayquaza_scene.o(.text);
|
src/rayquaza_scene.o(.text);
|
||||||
src/walda_phrase.o(.text);
|
src/walda_phrase.o(.text);
|
||||||
@ -524,7 +524,7 @@ SECTIONS {
|
|||||||
src/battle_records.o(.rodata);
|
src/battle_records.o(.rodata);
|
||||||
src/pokedex_area_screen.o(.rodata);
|
src/pokedex_area_screen.o(.rodata);
|
||||||
src/evolution_scene.o(.rodata);
|
src/evolution_scene.o(.rodata);
|
||||||
data/roulette.o(.rodata);
|
src/roulette.o(.rodata);
|
||||||
src/pokedex_cry_screen.o(.rodata);
|
src/pokedex_cry_screen.o(.rodata);
|
||||||
src/landmark.o(.rodata);
|
src/landmark.o(.rodata);
|
||||||
src/battle_transition.o(.rodata);
|
src/battle_transition.o(.rodata);
|
||||||
@ -568,7 +568,7 @@ SECTIONS {
|
|||||||
src/lilycove_lady.o(.rodata);
|
src/lilycove_lady.o(.rodata);
|
||||||
src/battle_dome.o(.rodata);
|
src/battle_dome.o(.rodata);
|
||||||
src/battle_palace.o(.rodata);
|
src/battle_palace.o(.rodata);
|
||||||
data/battle_frontier_1.o(.rodata);
|
src/match_call.o(.rodata);
|
||||||
src/menu.o(.rodata);
|
src/menu.o(.rodata);
|
||||||
src/battle_factory_screen.o(.rodata);
|
src/battle_factory_screen.o(.rodata);
|
||||||
src/apprentice.o(.rodata);
|
src/apprentice.o(.rodata);
|
||||||
@ -593,7 +593,7 @@ SECTIONS {
|
|||||||
src/unk_pokedex_area_screen_helper.o(.rodata);
|
src/unk_pokedex_area_screen_helper.o(.rodata);
|
||||||
src/battle_pyramid_bag.o(.rodata);
|
src/battle_pyramid_bag.o(.rodata);
|
||||||
data/pokenav.o(.rodata);
|
data/pokenav.o(.rodata);
|
||||||
src/match_call.o(.rodata);
|
src/pokenav_match_call.o(.rodata);
|
||||||
data/pokenav.o(.rodata.after.match.call);
|
data/pokenav.o(.rodata.after.match.call);
|
||||||
src/rayquaza_scene.o(.rodata);
|
src/rayquaza_scene.o(.rodata);
|
||||||
src/walda_phrase.o(.rodata);
|
src/walda_phrase.o(.rodata);
|
||||||
|
|||||||
@ -1629,7 +1629,7 @@ void sub_8128950(u8 taskId)
|
|||||||
void sub_81289D0(u8 taskId)
|
void sub_81289D0(u8 taskId)
|
||||||
{
|
{
|
||||||
DisplayYesNoMenu();
|
DisplayYesNoMenu();
|
||||||
sub_8121F68(taskId, &gUnknown_085A72C4);
|
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_81289F0(u8 taskId)
|
void sub_81289F0(u8 taskId)
|
||||||
@ -1694,7 +1694,7 @@ void sub_8128AAC(u8 taskId)
|
|||||||
void sub_8128B80(u8 taskId)
|
void sub_8128B80(u8 taskId)
|
||||||
{
|
{
|
||||||
DisplayYesNoMenu();
|
DisplayYesNoMenu();
|
||||||
sub_8121F68(taskId, &gUnknown_085A72CC);
|
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8128BA0(u8 taskId)
|
void sub_8128BA0(u8 taskId)
|
||||||
@ -2589,7 +2589,7 @@ void sub_812A0E8(u8 taskId)
|
|||||||
void sub_812A1A0(u8 taskId)
|
void sub_812A1A0(u8 taskId)
|
||||||
{
|
{
|
||||||
DisplayYesNoMenu();
|
DisplayYesNoMenu();
|
||||||
sub_8121F68(taskId, &gUnknown_085A7348);
|
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_812A1C0(u8 taskId)
|
void sub_812A1C0(u8 taskId)
|
||||||
@ -2602,7 +2602,7 @@ void sub_812A1C0(u8 taskId)
|
|||||||
void sub_812A1F0(u8 taskId)
|
void sub_812A1F0(u8 taskId)
|
||||||
{
|
{
|
||||||
DisplayYesNoMenu();
|
DisplayYesNoMenu();
|
||||||
sub_8121F68(taskId, &gUnknown_085A7350);
|
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_812A210(u8 taskId)
|
void sub_812A210(u8 taskId)
|
||||||
@ -2726,7 +2726,7 @@ void sub_812A3D4(u8 taskId)
|
|||||||
void sub_812A458(u8 taskId)
|
void sub_812A458(u8 taskId)
|
||||||
{
|
{
|
||||||
DisplayYesNoMenu();
|
DisplayYesNoMenu();
|
||||||
sub_8121F68(taskId, &gUnknown_085A741C);
|
DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_812A478(u8 taskId)
|
void sub_812A478(u8 taskId)
|
||||||
|
|||||||
@ -32,7 +32,7 @@
|
|||||||
#include "constants/maps.h"
|
#include "constants/maps.h"
|
||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
|
|
||||||
extern bool32 sub_8196034(void);
|
extern bool32 TryStartMatchCall(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;
|
||||||
@ -600,7 +600,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
|
|||||||
ScriptContext1_SetupScript(SSTidalCorridor_EventScript_23C050);
|
ScriptContext1_SetupScript(SSTidalCorridor_EventScript_23C050);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
if (sub_8196034())
|
if (TryStartMatchCall())
|
||||||
return TRUE;
|
return TRUE;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,8 +5,8 @@
|
|||||||
#include "task.h"
|
#include "task.h"
|
||||||
#include "text.h"
|
#include "text.h"
|
||||||
|
|
||||||
extern bool32 sub_8196094(void);
|
extern bool32 IsMatchCallTaskActive(void);
|
||||||
extern void sub_8196080(u8*);
|
extern void StartMatchCallFromScript(u8*);
|
||||||
|
|
||||||
static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
|
static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ bool8 ShowFieldMessage(u8 *str)
|
|||||||
|
|
||||||
void sub_8098214(u8 taskId)
|
void sub_8098214(u8 taskId)
|
||||||
{
|
{
|
||||||
if (!sub_8196094())
|
if (!IsMatchCallTaskActive())
|
||||||
{
|
{
|
||||||
sFieldMessageBoxMode = 0;
|
sFieldMessageBoxMode = 0;
|
||||||
DestroyTask(taskId);
|
DestroyTask(taskId);
|
||||||
@ -81,7 +81,7 @@ bool8 sub_8098238(u8 *str)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
StringExpandPlaceholders(gStringVar4, str);
|
StringExpandPlaceholders(gStringVar4, str);
|
||||||
CreateTask(sub_8098214, 0);
|
CreateTask(sub_8098214, 0);
|
||||||
sub_8196080(str);
|
StartMatchCallFromScript(str);
|
||||||
sFieldMessageBoxMode = 2;
|
sFieldMessageBoxMode = 2;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|||||||
3220
src/match_call.c
3220
src/match_call.c
File diff suppressed because it is too large
Load Diff
472
src/menu.c
472
src/menu.c
@ -1,24 +1,24 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "bg.h"
|
|
||||||
#include "window.h"
|
|
||||||
#include "palette.h"
|
|
||||||
#include "menu.h"
|
|
||||||
#include "constants/songs.h"
|
|
||||||
#include "main.h"
|
|
||||||
#include "sound.h"
|
|
||||||
#include "menu_helpers.h"
|
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "task.h"
|
#include "bg.h"
|
||||||
#include "dma3.h"
|
#include "dma3.h"
|
||||||
#include "string_util.h"
|
|
||||||
#include "pokemon_icon.h"
|
|
||||||
#include "constants/flags.h"
|
|
||||||
#include "event_data.h"
|
#include "event_data.h"
|
||||||
#include "pokedex.h"
|
|
||||||
#include "region_map.h"
|
|
||||||
#include "text_window.h"
|
|
||||||
#include "strings.h"
|
|
||||||
#include "graphics.h"
|
#include "graphics.h"
|
||||||
|
#include "main.h"
|
||||||
|
#include "menu.h"
|
||||||
|
#include "menu_helpers.h"
|
||||||
|
#include "palette.h"
|
||||||
|
#include "pokedex.h"
|
||||||
|
#include "pokemon_icon.h"
|
||||||
|
#include "region_map.h"
|
||||||
|
#include "sound.h"
|
||||||
|
#include "string_util.h"
|
||||||
|
#include "strings.h"
|
||||||
|
#include "task.h"
|
||||||
|
#include "text_window.h"
|
||||||
|
#include "window.h"
|
||||||
|
#include "constants/flags.h"
|
||||||
|
#include "constants/songs.h"
|
||||||
|
|
||||||
#define DLG_WINDOW_PALETTE_NUM 15
|
#define DLG_WINDOW_PALETTE_NUM 15
|
||||||
#define DLG_WINDOW_BASE_TILE_NUM 0x200
|
#define DLG_WINDOW_BASE_TILE_NUM 0x200
|
||||||
@ -50,11 +50,11 @@ struct Menu
|
|||||||
|
|
||||||
static EWRAM_DATA u8 sStartMenuWindowId = 0;
|
static EWRAM_DATA u8 sStartMenuWindowId = 0;
|
||||||
static EWRAM_DATA u8 sMapNamePopupWindowId = 0;
|
static EWRAM_DATA u8 sMapNamePopupWindowId = 0;
|
||||||
static EWRAM_DATA struct Menu gUnknown_0203CD90 = {0};
|
static EWRAM_DATA struct Menu sMenu = {0};
|
||||||
static EWRAM_DATA u16 gUnknown_0203CD9C = 0;
|
static EWRAM_DATA u16 sTileNum = 0;
|
||||||
static EWRAM_DATA u8 gUnknown_0203CD9E = 0;
|
static EWRAM_DATA u8 sPaletteNum = 0;
|
||||||
static EWRAM_DATA u8 gUnknown_0203CD9F = 0;
|
static EWRAM_DATA u8 sYesNoWindowId = 0;
|
||||||
static EWRAM_DATA u8 gUnknown_0203CDA0 = 0;
|
static EWRAM_DATA u8 sWindowId = 0;
|
||||||
static EWRAM_DATA u16 sFiller = 0; // needed to align
|
static EWRAM_DATA u16 sFiller = 0; // needed to align
|
||||||
static EWRAM_DATA bool8 gUnknown_0203CDA4[4] = {FALSE};
|
static EWRAM_DATA bool8 gUnknown_0203CDA4[4] = {FALSE};
|
||||||
static EWRAM_DATA u16 gUnknown_0203CDA8 = 0;
|
static EWRAM_DATA u16 gUnknown_0203CDA8 = 0;
|
||||||
@ -549,10 +549,10 @@ void sub_8197AE8(bool8 copyToVram)
|
|||||||
CopyBgTilemapBufferToVram(0);
|
CopyBgTilemapBufferToVram(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a3, u8 a4)
|
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD9C = a3;
|
sTileNum = tileNum;
|
||||||
gUnknown_0203CD9E = a4;
|
sPaletteNum = paletteNum;
|
||||||
CallWindowFunction(windowId, sub_8197BB4);
|
CallWindowFunction(windowId, sub_8197BB4);
|
||||||
FillWindowPixelBuffer(windowId, 0x11);
|
FillWindowPixelBuffer(windowId, 0x11);
|
||||||
PutWindowTilemap(windowId);
|
PutWindowTilemap(windowId);
|
||||||
@ -560,10 +560,10 @@ void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a3, u8 a4)
|
|||||||
CopyWindowToVram(windowId, 3);
|
CopyWindowToVram(windowId, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8197B64(u8 windowId, bool8 copyToVram, u16 a3)
|
void sub_8197B64(u8 windowId, bool8 copyToVram, u16 tileNum)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD9C = a3;
|
sTileNum = tileNum;
|
||||||
gUnknown_0203CD9E = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM);
|
sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM);
|
||||||
CallWindowFunction(windowId, sub_8197BB4);
|
CallWindowFunction(windowId, sub_8197BB4);
|
||||||
FillWindowPixelBuffer(windowId, 0x11);
|
FillWindowPixelBuffer(windowId, 0x11);
|
||||||
PutWindowTilemap(windowId);
|
PutWindowTilemap(windowId);
|
||||||
@ -574,96 +574,96 @@ void sub_8197B64(u8 windowId, bool8 copyToVram, u16 a3)
|
|||||||
void sub_8197BB4(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
|
void sub_8197BB4(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
|
||||||
{
|
{
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 1,
|
sTileNum + 1,
|
||||||
tilemapLeft - 2,
|
tilemapLeft - 2,
|
||||||
tilemapTop - 1,
|
tilemapTop - 1,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 3,
|
sTileNum + 3,
|
||||||
tilemapLeft - 1,
|
tilemapLeft - 1,
|
||||||
tilemapTop - 1,
|
tilemapTop - 1,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 4,
|
sTileNum + 4,
|
||||||
tilemapLeft,
|
tilemapLeft,
|
||||||
tilemapTop - 1,
|
tilemapTop - 1,
|
||||||
width - 1,
|
width - 1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 5,
|
sTileNum + 5,
|
||||||
tilemapLeft + width - 1,
|
tilemapLeft + width - 1,
|
||||||
tilemapTop - 1,
|
tilemapTop - 1,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 6,
|
sTileNum + 6,
|
||||||
tilemapLeft + width,
|
tilemapLeft + width,
|
||||||
tilemapTop - 1,
|
tilemapTop - 1,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 7,
|
sTileNum + 7,
|
||||||
tilemapLeft - 2,
|
tilemapLeft - 2,
|
||||||
tilemapTop,
|
tilemapTop,
|
||||||
1,
|
1,
|
||||||
5,
|
5,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 9,
|
sTileNum + 9,
|
||||||
tilemapLeft - 1,
|
tilemapLeft - 1,
|
||||||
tilemapTop,
|
tilemapTop,
|
||||||
width + 1,
|
width + 1,
|
||||||
5,
|
5,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 10,
|
sTileNum + 10,
|
||||||
tilemapLeft + width,
|
tilemapLeft + width,
|
||||||
tilemapTop,
|
tilemapTop,
|
||||||
1,
|
1,
|
||||||
5,
|
5,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
BG_TILE_V_FLIP(gUnknown_0203CD9C + 1),
|
BG_TILE_V_FLIP(sTileNum + 1),
|
||||||
tilemapLeft - 2,
|
tilemapLeft - 2,
|
||||||
tilemapTop + height,
|
tilemapTop + height,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
BG_TILE_V_FLIP(gUnknown_0203CD9C + 3),
|
BG_TILE_V_FLIP(sTileNum + 3),
|
||||||
tilemapLeft - 1,
|
tilemapLeft - 1,
|
||||||
tilemapTop + height,
|
tilemapTop + height,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
BG_TILE_V_FLIP(gUnknown_0203CD9C + 4),
|
BG_TILE_V_FLIP(sTileNum + 4),
|
||||||
tilemapLeft,
|
tilemapLeft,
|
||||||
tilemapTop + height,
|
tilemapTop + height,
|
||||||
width - 1,
|
width - 1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
BG_TILE_V_FLIP(gUnknown_0203CD9C + 5),
|
BG_TILE_V_FLIP(sTileNum + 5),
|
||||||
tilemapLeft + width - 1,
|
tilemapLeft + width - 1,
|
||||||
tilemapTop + height,
|
tilemapTop + height,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
BG_TILE_V_FLIP(gUnknown_0203CD9C + 6),
|
BG_TILE_V_FLIP(sTileNum + 6),
|
||||||
tilemapLeft + width,
|
tilemapLeft + width,
|
||||||
tilemapTop + height,
|
tilemapTop + height,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8197DF8(u8 windowId, bool8 copyToVram)
|
void sub_8197DF8(u8 windowId, bool8 copyToVram)
|
||||||
@ -682,8 +682,8 @@ void sub_8197E30(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 p
|
|||||||
|
|
||||||
void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum)
|
void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD9C = baseTileNum;
|
sTileNum = baseTileNum;
|
||||||
gUnknown_0203CD9E = paletteNum;
|
sPaletteNum = paletteNum;
|
||||||
CallWindowFunction(windowId, DrawWindowBorder);
|
CallWindowFunction(windowId, DrawWindowBorder);
|
||||||
FillWindowPixelBuffer(windowId, 0x11);
|
FillWindowPixelBuffer(windowId, 0x11);
|
||||||
PutWindowTilemap(windowId);
|
PutWindowTilemap(windowId);
|
||||||
@ -693,8 +693,8 @@ void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 pal
|
|||||||
|
|
||||||
void sub_8197EC8(u8 windowId, bool8 copyToVram, u16 baseTileNum)
|
void sub_8197EC8(u8 windowId, bool8 copyToVram, u16 baseTileNum)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD9C = baseTileNum;
|
sTileNum = baseTileNum;
|
||||||
gUnknown_0203CD9E = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM);
|
sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM);
|
||||||
CallWindowFunction(windowId, DrawWindowBorder);
|
CallWindowFunction(windowId, DrawWindowBorder);
|
||||||
FillWindowPixelBuffer(windowId, 0x11);
|
FillWindowPixelBuffer(windowId, 0x11);
|
||||||
PutWindowTilemap(windowId);
|
PutWindowTilemap(windowId);
|
||||||
@ -705,61 +705,61 @@ void sub_8197EC8(u8 windowId, bool8 copyToVram, u16 baseTileNum)
|
|||||||
void DrawWindowBorder(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
|
void DrawWindowBorder(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
|
||||||
{
|
{
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 0,
|
sTileNum + 0,
|
||||||
tilemapLeft - 1,
|
tilemapLeft - 1,
|
||||||
tilemapTop - 1,
|
tilemapTop - 1,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 1,
|
sTileNum + 1,
|
||||||
tilemapLeft,
|
tilemapLeft,
|
||||||
tilemapTop - 1,
|
tilemapTop - 1,
|
||||||
width,
|
width,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 2,
|
sTileNum + 2,
|
||||||
tilemapLeft + width,
|
tilemapLeft + width,
|
||||||
tilemapTop - 1,
|
tilemapTop - 1,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 3,
|
sTileNum + 3,
|
||||||
tilemapLeft - 1,
|
tilemapLeft - 1,
|
||||||
tilemapTop,
|
tilemapTop,
|
||||||
1,
|
1,
|
||||||
height,
|
height,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 5,
|
sTileNum + 5,
|
||||||
tilemapLeft + width,
|
tilemapLeft + width,
|
||||||
tilemapTop,
|
tilemapTop,
|
||||||
1,
|
1,
|
||||||
height,
|
height,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 6,
|
sTileNum + 6,
|
||||||
tilemapLeft - 1,
|
tilemapLeft - 1,
|
||||||
tilemapTop + height,
|
tilemapTop + height,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 7,
|
sTileNum + 7,
|
||||||
tilemapLeft,
|
tilemapLeft,
|
||||||
tilemapTop + height,
|
tilemapTop + height,
|
||||||
width,
|
width,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
FillBgTilemapBufferRect(bg,
|
FillBgTilemapBufferRect(bg,
|
||||||
gUnknown_0203CD9C + 8,
|
sTileNum + 8,
|
||||||
tilemapLeft + width,
|
tilemapLeft + width,
|
||||||
tilemapTop + height,
|
tilemapTop + height,
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
gUnknown_0203CD9E);
|
sPaletteNum);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8198070(u8 windowId, bool8 copyToVram)
|
void sub_8198070(u8 windowId, bool8 copyToVram)
|
||||||
@ -793,7 +793,7 @@ u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile)
|
|||||||
window.paletteNum = palette;
|
window.paletteNum = palette;
|
||||||
window.baseBlock = baseTile;
|
window.baseBlock = baseTile;
|
||||||
|
|
||||||
gUnknown_0203CDA0 = AddWindow(&window);
|
sWindowId = AddWindow(&window);
|
||||||
|
|
||||||
if (palette > 15)
|
if (palette > 15)
|
||||||
palette = 15 * 16;
|
palette = 15 * 16;
|
||||||
@ -801,27 +801,27 @@ u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile)
|
|||||||
palette *= 16;
|
palette *= 16;
|
||||||
|
|
||||||
LoadPalette(gUnknown_0860F0B0, palette, sizeof(gUnknown_0860F0B0));
|
LoadPalette(gUnknown_0860F0B0, palette, sizeof(gUnknown_0860F0B0));
|
||||||
return gUnknown_0203CDA0;
|
return sWindowId;
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram)
|
void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram)
|
||||||
{
|
{
|
||||||
u16 width = 0;
|
u16 width = 0;
|
||||||
|
|
||||||
if (gUnknown_0203CDA0 != 0xFF)
|
if (sWindowId != 0xFF)
|
||||||
{
|
{
|
||||||
PutWindowTilemap(gUnknown_0203CDA0);
|
PutWindowTilemap(sWindowId);
|
||||||
FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
|
FillWindowPixelBuffer(sWindowId, 0xFF);
|
||||||
width = GetStringWidth(0, string, 0);
|
width = GetStringWidth(0, string, 0);
|
||||||
AddTextPrinterParameterized3(gUnknown_0203CDA0,
|
AddTextPrinterParameterized3(sWindowId,
|
||||||
0,
|
0,
|
||||||
0xEC - (GetWindowAttribute(gUnknown_0203CDA0, WINDOW_TILEMAP_LEFT) * 8) - a2 - width,
|
0xEC - (GetWindowAttribute(sWindowId, WINDOW_TILEMAP_LEFT) * 8) - a2 - width,
|
||||||
1,
|
1,
|
||||||
gUnknown_0860F0D0,
|
gUnknown_0860F0D0,
|
||||||
0,
|
0,
|
||||||
string);
|
string);
|
||||||
if (copyToVram)
|
if (copyToVram)
|
||||||
CopyWindowToVram(gUnknown_0203CDA0, 3);
|
CopyWindowToVram(sWindowId, 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -830,7 +830,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
|
|||||||
u8 color[3];
|
u8 color[3];
|
||||||
u16 width = 0;
|
u16 width = 0;
|
||||||
|
|
||||||
if (gUnknown_0203CDA0 != 0xFF)
|
if (sWindowId != 0xFF)
|
||||||
{
|
{
|
||||||
if (a3 != 0)
|
if (a3 != 0)
|
||||||
{
|
{
|
||||||
@ -844,49 +844,49 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
|
|||||||
color[1] = 1;
|
color[1] = 1;
|
||||||
color[2] = 2;
|
color[2] = 2;
|
||||||
}
|
}
|
||||||
PutWindowTilemap(gUnknown_0203CDA0);
|
PutWindowTilemap(sWindowId);
|
||||||
FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
|
FillWindowPixelBuffer(sWindowId, 0xFF);
|
||||||
if (string2 != NULL)
|
if (string2 != NULL)
|
||||||
{
|
{
|
||||||
width = GetStringWidth(0, string2, 0);
|
width = GetStringWidth(0, string2, 0);
|
||||||
AddTextPrinterParameterized3(gUnknown_0203CDA0,
|
AddTextPrinterParameterized3(sWindowId,
|
||||||
0,
|
0,
|
||||||
0xEC - (GetWindowAttribute(gUnknown_0203CDA0, WINDOW_TILEMAP_LEFT) * 8) - a4 - width,
|
0xEC - (GetWindowAttribute(sWindowId, WINDOW_TILEMAP_LEFT) * 8) - a4 - width,
|
||||||
1,
|
1,
|
||||||
color,
|
color,
|
||||||
0,
|
0,
|
||||||
string2);
|
string2);
|
||||||
}
|
}
|
||||||
AddTextPrinterParameterized4(gUnknown_0203CDA0, 1, 4, 1, 0, 0, color, 0, string);
|
AddTextPrinterParameterized4(sWindowId, 1, 4, 1, 0, 0, color, 0, string);
|
||||||
if (copyToVram)
|
if (copyToVram)
|
||||||
CopyWindowToVram(gUnknown_0203CDA0, 3);
|
CopyWindowToVram(sWindowId, 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_81982D8(void)
|
void sub_81982D8(void)
|
||||||
{
|
{
|
||||||
if (gUnknown_0203CDA0 != 0xFF)
|
if (sWindowId != 0xFF)
|
||||||
CopyWindowToVram(gUnknown_0203CDA0, 3);
|
CopyWindowToVram(sWindowId, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_81982F0(void)
|
void sub_81982F0(void)
|
||||||
{
|
{
|
||||||
if (gUnknown_0203CDA0 != 0xFF)
|
if (sWindowId != 0xFF)
|
||||||
{
|
{
|
||||||
FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
|
FillWindowPixelBuffer(sWindowId, 0xFF);
|
||||||
CopyWindowToVram(gUnknown_0203CDA0, 3);
|
CopyWindowToVram(sWindowId, 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8198314(void)
|
void sub_8198314(void)
|
||||||
{
|
{
|
||||||
if (gUnknown_0203CDA0 != 0xFF)
|
if (sWindowId != 0xFF)
|
||||||
{
|
{
|
||||||
FillWindowPixelBuffer(gUnknown_0203CDA0, 0);
|
FillWindowPixelBuffer(sWindowId, 0);
|
||||||
ClearWindowTilemap(gUnknown_0203CDA0);
|
ClearWindowTilemap(sWindowId);
|
||||||
CopyWindowToVram(gUnknown_0203CDA0, 3);
|
CopyWindowToVram(sWindowId, 3);
|
||||||
RemoveWindow(gUnknown_0203CDA0);
|
RemoveWindow(sWindowId);
|
||||||
gUnknown_0203CDA0 = 0xFF;
|
sWindowId = 0xFF;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -894,24 +894,24 @@ u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numC
|
|||||||
{
|
{
|
||||||
s32 pos;
|
s32 pos;
|
||||||
|
|
||||||
gUnknown_0203CD90.left = left;
|
sMenu.left = left;
|
||||||
gUnknown_0203CD90.top = top;
|
sMenu.top = top;
|
||||||
gUnknown_0203CD90.minCursorPos = 0;
|
sMenu.minCursorPos = 0;
|
||||||
gUnknown_0203CD90.maxCursorPos = numChoices - 1;
|
sMenu.maxCursorPos = numChoices - 1;
|
||||||
gUnknown_0203CD90.windowId = windowId;
|
sMenu.windowId = windowId;
|
||||||
gUnknown_0203CD90.fontId = fontId;
|
sMenu.fontId = fontId;
|
||||||
gUnknown_0203CD90.optionHeight = cursorHeight;
|
sMenu.optionHeight = cursorHeight;
|
||||||
gUnknown_0203CD90.APressMuted = a7;
|
sMenu.APressMuted = a7;
|
||||||
|
|
||||||
pos = initialCursorPos;
|
pos = initialCursorPos;
|
||||||
|
|
||||||
if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
|
if (pos < 0 || pos > sMenu.maxCursorPos)
|
||||||
gUnknown_0203CD90.cursorPos = 0;
|
sMenu.cursorPos = 0;
|
||||||
else
|
else
|
||||||
gUnknown_0203CD90.cursorPos = pos;
|
sMenu.cursorPos = pos;
|
||||||
|
|
||||||
Menu_MoveCursor(0);
|
Menu_MoveCursor(0);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos)
|
u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos)
|
||||||
@ -929,56 +929,56 @@ void RedrawMenuCursor(u8 oldPos, u8 newPos)
|
|||||||
{
|
{
|
||||||
u8 width, height;
|
u8 width, height;
|
||||||
|
|
||||||
width = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 0);
|
width = GetMenuCursorDimensionByFont(sMenu.fontId, 0);
|
||||||
height = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 1);
|
height = GetMenuCursorDimensionByFont(sMenu.fontId, 1);
|
||||||
FillWindowPixelRect(gUnknown_0203CD90.windowId, 0x11, gUnknown_0203CD90.left, gUnknown_0203CD90.optionHeight * oldPos + gUnknown_0203CD90.top, width, height);
|
FillWindowPixelRect(sMenu.windowId, 0x11, sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height);
|
||||||
AddTextPrinterParameterized(gUnknown_0203CD90.windowId, gUnknown_0203CD90.fontId, gText_SelectorArrow3, gUnknown_0203CD90.left, gUnknown_0203CD90.optionHeight * newPos + gUnknown_0203CD90.top, 0, 0);
|
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow3, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 Menu_MoveCursor(s8 cursorDelta)
|
u8 Menu_MoveCursor(s8 cursorDelta)
|
||||||
{
|
{
|
||||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
u8 oldPos = sMenu.cursorPos;
|
||||||
int newPos = gUnknown_0203CD90.cursorPos + cursorDelta;
|
int newPos = sMenu.cursorPos + cursorDelta;
|
||||||
|
|
||||||
if (newPos < gUnknown_0203CD90.minCursorPos)
|
if (newPos < sMenu.minCursorPos)
|
||||||
gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.maxCursorPos;
|
sMenu.cursorPos = sMenu.maxCursorPos;
|
||||||
else if (newPos > gUnknown_0203CD90.maxCursorPos)
|
else if (newPos > sMenu.maxCursorPos)
|
||||||
gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.minCursorPos;
|
sMenu.cursorPos = sMenu.minCursorPos;
|
||||||
else
|
else
|
||||||
gUnknown_0203CD90.cursorPos += cursorDelta;
|
sMenu.cursorPos += cursorDelta;
|
||||||
|
|
||||||
RedrawMenuCursor(oldPos, gUnknown_0203CD90.cursorPos);
|
RedrawMenuCursor(oldPos, sMenu.cursorPos);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta)
|
u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta)
|
||||||
{
|
{
|
||||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
u8 oldPos = sMenu.cursorPos;
|
||||||
int newPos = gUnknown_0203CD90.cursorPos + cursorDelta;
|
int newPos = sMenu.cursorPos + cursorDelta;
|
||||||
|
|
||||||
if (newPos < gUnknown_0203CD90.minCursorPos)
|
if (newPos < sMenu.minCursorPos)
|
||||||
gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.minCursorPos;
|
sMenu.cursorPos = sMenu.minCursorPos;
|
||||||
else if (newPos > gUnknown_0203CD90.maxCursorPos)
|
else if (newPos > sMenu.maxCursorPos)
|
||||||
gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.maxCursorPos;
|
sMenu.cursorPos = sMenu.maxCursorPos;
|
||||||
else
|
else
|
||||||
gUnknown_0203CD90.cursorPos += cursorDelta;
|
sMenu.cursorPos += cursorDelta;
|
||||||
|
|
||||||
RedrawMenuCursor(oldPos, gUnknown_0203CD90.cursorPos);
|
RedrawMenuCursor(oldPos, sMenu.cursorPos);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 Menu_GetCursorPos(void)
|
u8 Menu_GetCursorPos(void)
|
||||||
{
|
{
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
s8 Menu_ProcessInput(void)
|
s8 Menu_ProcessInput(void)
|
||||||
{
|
{
|
||||||
if (gMain.newKeys & A_BUTTON)
|
if (gMain.newKeys & A_BUTTON)
|
||||||
{
|
{
|
||||||
if (!gUnknown_0203CD90.APressMuted)
|
if (!sMenu.APressMuted)
|
||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else if (gMain.newKeys & B_BUTTON)
|
else if (gMain.newKeys & B_BUTTON)
|
||||||
{
|
{
|
||||||
@ -1002,13 +1002,13 @@ s8 Menu_ProcessInput(void)
|
|||||||
|
|
||||||
s8 Menu_ProcessInputNoWrap(void)
|
s8 Menu_ProcessInputNoWrap(void)
|
||||||
{
|
{
|
||||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
u8 oldPos = sMenu.cursorPos;
|
||||||
|
|
||||||
if (gMain.newKeys & A_BUTTON)
|
if (gMain.newKeys & A_BUTTON)
|
||||||
{
|
{
|
||||||
if (!gUnknown_0203CD90.APressMuted)
|
if (!sMenu.APressMuted)
|
||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else if (gMain.newKeys & B_BUTTON)
|
else if (gMain.newKeys & B_BUTTON)
|
||||||
{
|
{
|
||||||
@ -1034,9 +1034,9 @@ s8 ProcessMenuInput_other(void)
|
|||||||
{
|
{
|
||||||
if (gMain.newKeys & A_BUTTON)
|
if (gMain.newKeys & A_BUTTON)
|
||||||
{
|
{
|
||||||
if (!gUnknown_0203CD90.APressMuted)
|
if (!sMenu.APressMuted)
|
||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else if (gMain.newKeys & B_BUTTON)
|
else if (gMain.newKeys & B_BUTTON)
|
||||||
{
|
{
|
||||||
@ -1060,13 +1060,13 @@ s8 ProcessMenuInput_other(void)
|
|||||||
|
|
||||||
s8 Menu_ProcessInputNoWrapAround_other(void)
|
s8 Menu_ProcessInputNoWrapAround_other(void)
|
||||||
{
|
{
|
||||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
u8 oldPos = sMenu.cursorPos;
|
||||||
|
|
||||||
if (gMain.newKeys & A_BUTTON)
|
if (gMain.newKeys & A_BUTTON)
|
||||||
{
|
{
|
||||||
if (!gUnknown_0203CD90.APressMuted)
|
if (!sMenu.APressMuted)
|
||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else if (gMain.newKeys & B_BUTTON)
|
else if (gMain.newKeys & B_BUTTON)
|
||||||
{
|
{
|
||||||
@ -1174,11 +1174,11 @@ void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top
|
|||||||
{
|
{
|
||||||
struct TextPrinterTemplate printer;
|
struct TextPrinterTemplate printer;
|
||||||
|
|
||||||
gUnknown_0203CD9F = AddWindow(window);
|
sYesNoWindowId = AddWindow(window);
|
||||||
SetWindowBorderStyle(gUnknown_0203CD9F, TRUE, baseTileNum, paletteNum);
|
SetWindowBorderStyle(sYesNoWindowId, TRUE, baseTileNum, paletteNum);
|
||||||
|
|
||||||
printer.currentChar = gText_YesNo;
|
printer.currentChar = gText_YesNo;
|
||||||
printer.windowId = gUnknown_0203CD9F;
|
printer.windowId = sYesNoWindowId;
|
||||||
printer.fontId = fontId;
|
printer.fontId = fontId;
|
||||||
printer.x = GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH) + left;
|
printer.x = GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH) + left;
|
||||||
printer.y = top;
|
printer.y = top;
|
||||||
@ -1193,7 +1193,7 @@ void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top
|
|||||||
|
|
||||||
AddTextPrinter(&printer, 0xFF, NULL);
|
AddTextPrinter(&printer, 0xFF, NULL);
|
||||||
|
|
||||||
sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_HEIGHT), 2, initialCursorPos);
|
sub_81983AC(sYesNoWindowId, fontId, left, top, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_HEIGHT), 2, initialCursorPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8198C34(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 paletteNum)
|
void sub_8198C34(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 paletteNum)
|
||||||
@ -1211,8 +1211,8 @@ s8 Menu_ProcessInputNoWrapClearOnChoose(void)
|
|||||||
|
|
||||||
void sub_8198C78(void)
|
void sub_8198C78(void)
|
||||||
{
|
{
|
||||||
sub_8198070(gUnknown_0203CD9F, TRUE);
|
sub_8198070(sYesNoWindowId, TRUE);
|
||||||
RemoveWindow(gUnknown_0203CD9F);
|
RemoveWindow(sYesNoWindowId);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8198C94(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7, const struct MenuAction *strs)
|
void sub_8198C94(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7, const struct MenuAction *strs)
|
||||||
@ -1274,26 +1274,26 @@ u8 sub_8198F58(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 cursorHeight,
|
|||||||
{
|
{
|
||||||
s32 pos;
|
s32 pos;
|
||||||
|
|
||||||
gUnknown_0203CD90.left = left;
|
sMenu.left = left;
|
||||||
gUnknown_0203CD90.top = top;
|
sMenu.top = top;
|
||||||
gUnknown_0203CD90.minCursorPos = 0;
|
sMenu.minCursorPos = 0;
|
||||||
gUnknown_0203CD90.maxCursorPos = numChoices - 1;
|
sMenu.maxCursorPos = numChoices - 1;
|
||||||
gUnknown_0203CD90.windowId = windowId;
|
sMenu.windowId = windowId;
|
||||||
gUnknown_0203CD90.fontId = fontId;
|
sMenu.fontId = fontId;
|
||||||
gUnknown_0203CD90.optionWidth = a4;
|
sMenu.optionWidth = a4;
|
||||||
gUnknown_0203CD90.optionHeight = cursorHeight;
|
sMenu.optionHeight = cursorHeight;
|
||||||
gUnknown_0203CD90.horizontalCount = a6;
|
sMenu.horizontalCount = a6;
|
||||||
gUnknown_0203CD90.verticalCount = a7;
|
sMenu.verticalCount = a7;
|
||||||
|
|
||||||
pos = a9;
|
pos = a9;
|
||||||
|
|
||||||
if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
|
if (pos < 0 || pos > sMenu.maxCursorPos)
|
||||||
gUnknown_0203CD90.cursorPos = 0;
|
sMenu.cursorPos = 0;
|
||||||
else
|
else
|
||||||
gUnknown_0203CD90.cursorPos = pos;
|
sMenu.cursorPos = pos;
|
||||||
|
|
||||||
sub_8199134(0, 0);
|
sub_8199134(0, 0);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 sub_8198FD4(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7)
|
u8 sub_8198FD4(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7)
|
||||||
@ -1305,20 +1305,20 @@ u8 sub_8198FD4(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8
|
|||||||
|
|
||||||
void sub_8199060(u8 oldCursorPos, u8 newCursorPos)
|
void sub_8199060(u8 oldCursorPos, u8 newCursorPos)
|
||||||
{
|
{
|
||||||
u8 cursorWidth = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 0);
|
u8 cursorWidth = GetMenuCursorDimensionByFont(sMenu.fontId, 0);
|
||||||
u8 cursorHeight = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 1);
|
u8 cursorHeight = GetMenuCursorDimensionByFont(sMenu.fontId, 1);
|
||||||
u8 xPos = (oldCursorPos % gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.optionWidth + gUnknown_0203CD90.left;
|
u8 xPos = (oldCursorPos % sMenu.horizontalCount) * sMenu.optionWidth + sMenu.left;
|
||||||
u8 yPos = (oldCursorPos / gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.optionHeight + gUnknown_0203CD90.top;
|
u8 yPos = (oldCursorPos / sMenu.horizontalCount) * sMenu.optionHeight + sMenu.top;
|
||||||
FillWindowPixelRect(gUnknown_0203CD90.windowId,
|
FillWindowPixelRect(sMenu.windowId,
|
||||||
0x11,
|
0x11,
|
||||||
xPos,
|
xPos,
|
||||||
yPos,
|
yPos,
|
||||||
cursorWidth,
|
cursorWidth,
|
||||||
cursorHeight);
|
cursorHeight);
|
||||||
xPos = (newCursorPos % gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.optionWidth + gUnknown_0203CD90.left;
|
xPos = (newCursorPos % sMenu.horizontalCount) * sMenu.optionWidth + sMenu.left;
|
||||||
yPos = (newCursorPos / gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.optionHeight + gUnknown_0203CD90.top;
|
yPos = (newCursorPos / sMenu.horizontalCount) * sMenu.optionHeight + sMenu.top;
|
||||||
AddTextPrinterParameterized(gUnknown_0203CD90.windowId,
|
AddTextPrinterParameterized(sMenu.windowId,
|
||||||
gUnknown_0203CD90.fontId,
|
sMenu.fontId,
|
||||||
gText_SelectorArrow3,
|
gText_SelectorArrow3,
|
||||||
xPos,
|
xPos,
|
||||||
yPos,
|
yPos,
|
||||||
@ -1328,83 +1328,83 @@ void sub_8199060(u8 oldCursorPos, u8 newCursorPos)
|
|||||||
|
|
||||||
u8 sub_8199134(s8 deltaX, s8 deltaY)
|
u8 sub_8199134(s8 deltaX, s8 deltaY)
|
||||||
{
|
{
|
||||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
u8 oldPos = sMenu.cursorPos;
|
||||||
|
|
||||||
if (deltaX != 0)
|
if (deltaX != 0)
|
||||||
{
|
{
|
||||||
if ((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX < 0)
|
if ((sMenu.cursorPos % sMenu.horizontalCount) + deltaX < 0)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos += gUnknown_0203CD90.horizontalCount - 1;
|
sMenu.cursorPos += sMenu.horizontalCount - 1;
|
||||||
}
|
}
|
||||||
else if ((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX >= gUnknown_0203CD90.horizontalCount)
|
else if ((sMenu.cursorPos % sMenu.horizontalCount) + deltaX >= sMenu.horizontalCount)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos = (gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.horizontalCount;
|
sMenu.cursorPos = (sMenu.cursorPos / sMenu.horizontalCount) * sMenu.horizontalCount;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos += deltaX;
|
sMenu.cursorPos += deltaX;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deltaY != 0)
|
if (deltaY != 0)
|
||||||
{
|
{
|
||||||
if ((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY < 0)
|
if ((sMenu.cursorPos / sMenu.horizontalCount) + deltaY < 0)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos += gUnknown_0203CD90.horizontalCount * (gUnknown_0203CD90.verticalCount - 1);
|
sMenu.cursorPos += sMenu.horizontalCount * (sMenu.verticalCount - 1);
|
||||||
}
|
}
|
||||||
else if ((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY >= gUnknown_0203CD90.verticalCount)
|
else if ((sMenu.cursorPos / sMenu.horizontalCount) + deltaY >= sMenu.verticalCount)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos -= gUnknown_0203CD90.horizontalCount * (gUnknown_0203CD90.verticalCount - 1);
|
sMenu.cursorPos -= sMenu.horizontalCount * (sMenu.verticalCount - 1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos += (gUnknown_0203CD90.horizontalCount * deltaY);
|
sMenu.cursorPos += (sMenu.horizontalCount * deltaY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gUnknown_0203CD90.cursorPos > gUnknown_0203CD90.maxCursorPos)
|
if (sMenu.cursorPos > sMenu.maxCursorPos)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos = oldPos;
|
sMenu.cursorPos = oldPos;
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sub_8199060(oldPos, gUnknown_0203CD90.cursorPos);
|
sub_8199060(oldPos, sMenu.cursorPos);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 sub_81991F8(s8 deltaX, s8 deltaY)
|
u8 sub_81991F8(s8 deltaX, s8 deltaY)
|
||||||
{
|
{
|
||||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
u8 oldPos = sMenu.cursorPos;
|
||||||
|
|
||||||
if (deltaX != 0)
|
if (deltaX != 0)
|
||||||
{
|
{
|
||||||
if (((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX >= 0) &&
|
if (((sMenu.cursorPos % sMenu.horizontalCount) + deltaX >= 0) &&
|
||||||
((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX < gUnknown_0203CD90.horizontalCount))
|
((sMenu.cursorPos % sMenu.horizontalCount) + deltaX < sMenu.horizontalCount))
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos += deltaX;
|
sMenu.cursorPos += deltaX;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deltaY != 0)
|
if (deltaY != 0)
|
||||||
{
|
{
|
||||||
if (((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY >= 0) &&
|
if (((sMenu.cursorPos / sMenu.horizontalCount) + deltaY >= 0) &&
|
||||||
((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY < gUnknown_0203CD90.verticalCount))
|
((sMenu.cursorPos / sMenu.horizontalCount) + deltaY < sMenu.verticalCount))
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos += (gUnknown_0203CD90.horizontalCount * deltaY);
|
sMenu.cursorPos += (sMenu.horizontalCount * deltaY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gUnknown_0203CD90.cursorPos > gUnknown_0203CD90.maxCursorPos)
|
if (sMenu.cursorPos > sMenu.maxCursorPos)
|
||||||
{
|
{
|
||||||
gUnknown_0203CD90.cursorPos = oldPos;
|
sMenu.cursorPos = oldPos;
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sub_8199060(oldPos, gUnknown_0203CD90.cursorPos);
|
sub_8199060(oldPos, sMenu.cursorPos);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1413,7 +1413,7 @@ s8 sub_8199284(void)
|
|||||||
if (gMain.newKeys & A_BUTTON)
|
if (gMain.newKeys & A_BUTTON)
|
||||||
{
|
{
|
||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else if (gMain.newKeys & B_BUTTON)
|
else if (gMain.newKeys & B_BUTTON)
|
||||||
{
|
{
|
||||||
@ -1449,12 +1449,12 @@ s8 sub_8199284(void)
|
|||||||
|
|
||||||
s8 Menu_ProcessInputGridLayout(void)
|
s8 Menu_ProcessInputGridLayout(void)
|
||||||
{
|
{
|
||||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
u8 oldPos = sMenu.cursorPos;
|
||||||
|
|
||||||
if (gMain.newKeys & A_BUTTON)
|
if (gMain.newKeys & A_BUTTON)
|
||||||
{
|
{
|
||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else if (gMain.newKeys & B_BUTTON)
|
else if (gMain.newKeys & B_BUTTON)
|
||||||
{
|
{
|
||||||
@ -1493,7 +1493,7 @@ s8 sub_81993D8(void)
|
|||||||
if (gMain.newKeys & A_BUTTON)
|
if (gMain.newKeys & A_BUTTON)
|
||||||
{
|
{
|
||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else if (gMain.newKeys & B_BUTTON)
|
else if (gMain.newKeys & B_BUTTON)
|
||||||
{
|
{
|
||||||
@ -1529,12 +1529,12 @@ s8 sub_81993D8(void)
|
|||||||
|
|
||||||
s8 sub_8199484(void)
|
s8 sub_8199484(void)
|
||||||
{
|
{
|
||||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
u8 oldPos = sMenu.cursorPos;
|
||||||
|
|
||||||
if (gMain.newKeys & A_BUTTON)
|
if (gMain.newKeys & A_BUTTON)
|
||||||
{
|
{
|
||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
else if (gMain.newKeys & B_BUTTON)
|
else if (gMain.newKeys & B_BUTTON)
|
||||||
{
|
{
|
||||||
@ -1572,21 +1572,21 @@ u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, boo
|
|||||||
{
|
{
|
||||||
s32 pos;
|
s32 pos;
|
||||||
|
|
||||||
gUnknown_0203CD90.left = 0;
|
sMenu.left = 0;
|
||||||
gUnknown_0203CD90.top = 1;
|
sMenu.top = 1;
|
||||||
gUnknown_0203CD90.minCursorPos = 0;
|
sMenu.minCursorPos = 0;
|
||||||
gUnknown_0203CD90.maxCursorPos = itemCount - 1;
|
sMenu.maxCursorPos = itemCount - 1;
|
||||||
gUnknown_0203CD90.windowId = windowId;
|
sMenu.windowId = windowId;
|
||||||
gUnknown_0203CD90.fontId = 1;
|
sMenu.fontId = 1;
|
||||||
gUnknown_0203CD90.optionHeight = 16;
|
sMenu.optionHeight = 16;
|
||||||
gUnknown_0203CD90.APressMuted = APressMuted;
|
sMenu.APressMuted = APressMuted;
|
||||||
|
|
||||||
pos = initialCursorPos;
|
pos = initialCursorPos;
|
||||||
|
|
||||||
if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
|
if (pos < 0 || pos > sMenu.maxCursorPos)
|
||||||
gUnknown_0203CD90.cursorPos = 0;
|
sMenu.cursorPos = 0;
|
||||||
else
|
else
|
||||||
gUnknown_0203CD90.cursorPos = pos;
|
sMenu.cursorPos = pos;
|
||||||
|
|
||||||
return Menu_MoveCursor(0);
|
return Menu_MoveCursor(0);
|
||||||
}
|
}
|
||||||
@ -1639,11 +1639,11 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 pa
|
|||||||
{
|
{
|
||||||
struct TextPrinterTemplate printer;
|
struct TextPrinterTemplate printer;
|
||||||
|
|
||||||
gUnknown_0203CD9F = AddWindow(window);
|
sYesNoWindowId = AddWindow(window);
|
||||||
SetWindowBorderStyle(gUnknown_0203CD9F, TRUE, baseTileNum, paletteNum);
|
SetWindowBorderStyle(sYesNoWindowId, TRUE, baseTileNum, paletteNum);
|
||||||
|
|
||||||
printer.currentChar = gText_YesNo;
|
printer.currentChar = gText_YesNo;
|
||||||
printer.windowId = gUnknown_0203CD9F;
|
printer.windowId = sYesNoWindowId;
|
||||||
printer.fontId = 1;
|
printer.fontId = 1;
|
||||||
printer.x = 8;
|
printer.x = 8;
|
||||||
printer.y = 1;
|
printer.y = 1;
|
||||||
@ -1657,7 +1657,7 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 pa
|
|||||||
printer.lineSpacing = 0;
|
printer.lineSpacing = 0;
|
||||||
|
|
||||||
AddTextPrinter(&printer, 0xFF, NULL);
|
AddTextPrinter(&printer, 0xFF, NULL);
|
||||||
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(gUnknown_0203CD9F, 2, initialCursorPos);
|
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sYesNoWindowId, 2, initialCursorPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs)
|
void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs)
|
||||||
@ -1709,26 +1709,26 @@ u8 sub_8199944(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount
|
|||||||
{
|
{
|
||||||
s32 pos;
|
s32 pos;
|
||||||
|
|
||||||
gUnknown_0203CD90.left = 0;
|
sMenu.left = 0;
|
||||||
gUnknown_0203CD90.top = 1;
|
sMenu.top = 1;
|
||||||
gUnknown_0203CD90.minCursorPos = 0;
|
sMenu.minCursorPos = 0;
|
||||||
gUnknown_0203CD90.maxCursorPos = (horizontalCount * verticalCount) - 1;
|
sMenu.maxCursorPos = (horizontalCount * verticalCount) - 1;
|
||||||
gUnknown_0203CD90.windowId = windowId;
|
sMenu.windowId = windowId;
|
||||||
gUnknown_0203CD90.fontId = 1;
|
sMenu.fontId = 1;
|
||||||
gUnknown_0203CD90.optionWidth = optionWidth;
|
sMenu.optionWidth = optionWidth;
|
||||||
gUnknown_0203CD90.optionHeight = 16;
|
sMenu.optionHeight = 16;
|
||||||
gUnknown_0203CD90.horizontalCount = horizontalCount;
|
sMenu.horizontalCount = horizontalCount;
|
||||||
gUnknown_0203CD90.verticalCount = verticalCount;
|
sMenu.verticalCount = verticalCount;
|
||||||
|
|
||||||
pos = initialCursorPos;
|
pos = initialCursorPos;
|
||||||
|
|
||||||
if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
|
if (pos < 0 || pos > sMenu.maxCursorPos)
|
||||||
gUnknown_0203CD90.cursorPos = 0;
|
sMenu.cursorPos = 0;
|
||||||
else
|
else
|
||||||
gUnknown_0203CD90.cursorPos = pos;
|
sMenu.cursorPos = pos;
|
||||||
|
|
||||||
sub_8199134(0, 0);
|
sub_8199134(0, 0);
|
||||||
return gUnknown_0203CD90.cursorPos;
|
return sMenu.cursorPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
void clear_scheduled_bg_copies_to_vram(void)
|
void clear_scheduled_bg_copies_to_vram(void)
|
||||||
|
|||||||
@ -152,7 +152,7 @@ static void Task_ContinueTaskAfterMessagePrints(u8 taskId)
|
|||||||
gUnknown_0300117C(taskId);
|
gUnknown_0300117C(taskId);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data)
|
void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data)
|
||||||
{
|
{
|
||||||
gUnknown_0203A138 = *data;
|
gUnknown_0203A138 = *data;
|
||||||
gTasks[taskId].func = Task_CallYesOrNoCallback;
|
gTasks[taskId].func = Task_CallYesOrNoCallback;
|
||||||
|
|||||||
@ -46,7 +46,7 @@ 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_8195E10(void);
|
extern void InitMatchCallCounters(void);
|
||||||
extern void sub_801AFD8(void);
|
extern void sub_801AFD8(void);
|
||||||
extern void sub_800E5AC(void);
|
extern void sub_800E5AC(void);
|
||||||
extern void sub_81D54BC(void);
|
extern void sub_81D54BC(void);
|
||||||
@ -209,7 +209,7 @@ void NewGameInitData(void)
|
|||||||
SetLilycoveLady();
|
SetLilycoveLady();
|
||||||
ResetAllApprenticeData();
|
ResetAllApprenticeData();
|
||||||
ClearRankingHallRecords();
|
ClearRankingHallRecords();
|
||||||
sub_8195E10();
|
InitMatchCallCounters();
|
||||||
sub_801AFD8();
|
sub_801AFD8();
|
||||||
sub_800E5AC();
|
sub_800E5AC();
|
||||||
sub_81D54BC();
|
sub_81D54BC();
|
||||||
|
|||||||
@ -127,7 +127,7 @@ extern void ExecuteTruckSequence(void);
|
|||||||
extern void sub_80A0A38(void);
|
extern void sub_80A0A38(void);
|
||||||
extern void WriteFlashScanlineEffectBuffer(u8);
|
extern void WriteFlashScanlineEffectBuffer(u8);
|
||||||
extern void sub_81AA2F8(void);
|
extern void sub_81AA2F8(void);
|
||||||
extern void sub_8195E10(void);
|
extern void InitMatchCallCounters(void);
|
||||||
extern void sub_80EDB44(void);
|
extern void sub_80EDB44(void);
|
||||||
extern void sub_81D64C0(void);
|
extern void sub_81D64C0(void);
|
||||||
extern void InitFieldMessageBox(void);
|
extern void InitFieldMessageBox(void);
|
||||||
@ -1777,7 +1777,7 @@ void CB2_ContinueSavedGame(void)
|
|||||||
PlayTimeCounter_Start();
|
PlayTimeCounter_Start();
|
||||||
ScriptContext1_Init();
|
ScriptContext1_Init();
|
||||||
ScriptContext2_Disable();
|
ScriptContext2_Disable();
|
||||||
sub_8195E10();
|
InitMatchCallCounters();
|
||||||
if (UseContinueGameWarp() == TRUE)
|
if (UseContinueGameWarp() == TRUE)
|
||||||
{
|
{
|
||||||
ClearContinueGameWarpStatus();
|
ClearContinueGameWarpStatus();
|
||||||
|
|||||||
1275
src/pokenav_match_call.c
Normal file
1275
src/pokenav_match_call.c
Normal file
File diff suppressed because it is too large
Load Diff
4929
src/roulette.c
Normal file
4929
src/roulette.c
Normal file
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@ void sub_8151678(struct UnkStruct0 *r0)
|
|||||||
memset(&r0->var04, 0, sizeof(r0->var04));
|
memset(&r0->var04, 0, sizeof(r0->var04));
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2)
|
u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2)
|
||||||
{
|
{
|
||||||
if (!(r1 < 16) || (r0->var04[r1].var00_7))
|
if (!(r1 < 16) || (r0->var04[r1].var00_7))
|
||||||
return 0xFF;
|
return 0xFF;
|
||||||
|
|||||||
@ -340,7 +340,7 @@ u32 RtcGetMinuteCount(void)
|
|||||||
return (24 * 60) * RtcGetDayCount(&sRtc) + 60 * sRtc.hour + sRtc.minute;
|
return (24 * 60) * RtcGetDayCount(&sRtc) + 60 * sRtc.hour + sRtc.minute;
|
||||||
}
|
}
|
||||||
|
|
||||||
u16 RtcGetLocalDayCount(void)
|
u32 RtcGetLocalDayCount(void)
|
||||||
{
|
{
|
||||||
return RtcGetDayCount(&sRtc);
|
return RtcGetDayCount(&sRtc);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1032,7 +1032,7 @@ void sub_80E9FFC(u8 taskId)
|
|||||||
void sub_80EA06C(u8 taskId)
|
void sub_80EA06C(u8 taskId)
|
||||||
{
|
{
|
||||||
DisplayYesNoMenu();
|
DisplayYesNoMenu();
|
||||||
sub_8121F68(taskId, &gUnknown_0858D058);
|
DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_80EA08C(u8 taskId)
|
void sub_80EA08C(u8 taskId)
|
||||||
|
|||||||
@ -226,13 +226,7 @@ gPlayerFacingPosition: @ 203AB40
|
|||||||
.include "src/battle_records.o"
|
.include "src/battle_records.o"
|
||||||
.include "src/pokedex_area_screen.o"
|
.include "src/pokedex_area_screen.o"
|
||||||
.include "src/evolution_scene.o"
|
.include "src/evolution_scene.o"
|
||||||
|
.include "src/roulette.o"
|
||||||
gUnknown_0203AB88: @ 203AB88
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_0203AB8C: @ 203AB8C
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
.include "src/pokedex_cry_screen.o"
|
.include "src/pokedex_cry_screen.o"
|
||||||
.include "src/coins.o"
|
.include "src/coins.o"
|
||||||
.include "src/battle_transition.o"
|
.include "src/battle_transition.o"
|
||||||
@ -263,13 +257,7 @@ gUnknown_0203AB8C: @ 203AB8C
|
|||||||
.include "src/trainer_pokemon_sprites.o"
|
.include "src/trainer_pokemon_sprites.o"
|
||||||
.include "src/lilycove_lady.o"
|
.include "src/lilycove_lady.o"
|
||||||
.include "src/battle_dome.o"
|
.include "src/battle_dome.o"
|
||||||
|
.include "src/match_call.o"
|
||||||
gUnknown_0203CD80: @ 203CD80
|
|
||||||
.space 0x8
|
|
||||||
|
|
||||||
gUnknown_0203CD88: @ 203CD88
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
.include "src/menu.o"
|
.include "src/menu.o"
|
||||||
.include "src/battle_factory_screen.o"
|
.include "src/battle_factory_screen.o"
|
||||||
.include "src/mossdeep_gym.o"
|
.include "src/mossdeep_gym.o"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user