mirror of https://github.com/pret/pokeemerald.git
contest.s, region_map.s, trainer_rematch.s
all partially done
This commit is contained in:
itskobold
parent
860d5e026d
commit
b2cb7ba58c
137
data/contest.s
137
data/contest.s
|
|
@ -5,10 +5,12 @@
|
|||
.align 2, 0
|
||||
|
||||
gUnknown_08587A6C:: @ 8587A6C
|
||||
.incbin "baserom.gba", 0x587a6c, 0x4
|
||||
@ replacing .incbin "baserom.gba", 0x00587a6c, 0x4
|
||||
.byte 0x24, 0x4c, 0x74, 0x9c
|
||||
|
||||
gUnknown_08587A70:: @ 8587A70
|
||||
.incbin "baserom.gba", 0x587a70, 0x4
|
||||
@ replacing .incbin "baserom.gba", 0x00587a70, 0x4
|
||||
.byte 0x24, 0x4c, 0x74, 0x9c
|
||||
|
||||
gUnknown_08587A74:: @ 8587A74
|
||||
.incbin "baserom.gba", 0x587a74, 0x5c
|
||||
|
|
@ -59,19 +61,137 @@ gUnknown_08587C30:: @ 8587C30
|
|||
.include "data/text/contest_text_pointers.inc"
|
||||
|
||||
@ 8587D5C
|
||||
.incbin "baserom.gba", 0x587d5c, 0x34
|
||||
@ replacing .incbin "baserom.gba", 0x00587d5c, 0x34
|
||||
.4byte 0x827d5c1
|
||||
.4byte 0x827d5dc
|
||||
.4byte 0x827d600
|
||||
.4byte 0x827d612
|
||||
.4byte 0x827d612
|
||||
.4byte 0x827d62d
|
||||
.4byte 0x827d654
|
||||
.4byte 0x827d67e
|
||||
.4byte 0x827d69c
|
||||
.4byte 0x827d6ba
|
||||
.4byte 0x827d6e5
|
||||
.4byte 0x827d706
|
||||
.4byte 0x827d71d
|
||||
|
||||
gUnknown_08587D90:: @ 8587D90
|
||||
.incbin "baserom.gba", 0x587d90, 0x80
|
||||
@ replacing .incbin "baserom.gba", 0x00587d90, 0x80
|
||||
.4byte 0x827d743
|
||||
.4byte 0x827d764
|
||||
.4byte 0x827d785
|
||||
.4byte 0x827d7a5
|
||||
.4byte 0x827d7c8
|
||||
.4byte 0x827d7e8
|
||||
.4byte 0x827d831
|
||||
.4byte 0x827d855
|
||||
.4byte 0x827d830
|
||||
.4byte 0x827d872
|
||||
.4byte 0x827d88f
|
||||
.4byte 0x827d8b5
|
||||
.4byte 0x827d8e4
|
||||
.4byte 0x827d8fe
|
||||
.4byte 0x827d926
|
||||
.4byte 0x827d947
|
||||
.4byte 0x827d961
|
||||
.4byte 0x827d986
|
||||
.4byte 0x827d9b1
|
||||
.4byte 0x827d9d9
|
||||
.4byte 0x827da03
|
||||
.4byte 0x827da31
|
||||
.4byte 0x827da5b
|
||||
.4byte 0x827da85
|
||||
.4byte 0x827dab2
|
||||
.4byte 0x827dada
|
||||
.4byte 0x827db03
|
||||
.4byte 0x827d830
|
||||
.4byte 0x827d830
|
||||
.4byte 0x827d830
|
||||
.4byte 0x827db1f
|
||||
.4byte 0x827db4e
|
||||
|
||||
gUnknown_08587E10:: @ 8587E10
|
||||
.incbin "baserom.gba", 0x587e10, 0xf8
|
||||
@ replacing .incbin "baserom.gba", 0x00587e10, 0xf8
|
||||
.4byte 0x827db75
|
||||
.4byte 0x827dbb0
|
||||
.4byte 0x827dbe0
|
||||
.4byte 0x827dc0f
|
||||
.4byte 0x827dc45
|
||||
.4byte 0x827dc7c
|
||||
.4byte 0x827dcb4
|
||||
.4byte 0x827dce7
|
||||
.4byte 0x827dd12
|
||||
.4byte 0x827dd3d
|
||||
.4byte 0x827dd6f
|
||||
.4byte 0x827dd8e
|
||||
.4byte 0x827ddc7
|
||||
.4byte 0x827ddf2
|
||||
.4byte 0x827de14
|
||||
.4byte 0x827de44
|
||||
.4byte 0x827de73
|
||||
.4byte 0x827dea5
|
||||
.4byte 0x827ded9
|
||||
.4byte 0x827df02
|
||||
.4byte 0x827df3a
|
||||
.4byte 0x827df63
|
||||
.4byte 0x827df8c
|
||||
.4byte 0x827dfb8
|
||||
.4byte 0x827dfe2
|
||||
.4byte 0x827e00c
|
||||
.4byte 0x827e02f
|
||||
.4byte 0x827e05f
|
||||
.4byte 0x827e08b
|
||||
.4byte 0x827e0b5
|
||||
.4byte 0x827e0dd
|
||||
.4byte 0x827e107
|
||||
.4byte 0x827e143
|
||||
.4byte 0x827e17f
|
||||
.4byte 0x827e1bb
|
||||
.4byte 0x827e1f3
|
||||
.4byte 0x827e220
|
||||
.4byte 0x827e254
|
||||
.4byte 0x827e289
|
||||
.4byte 0x827e2c5
|
||||
.4byte 0x827e2fe
|
||||
.4byte 0x827e32e
|
||||
.4byte 0x827e35b
|
||||
.4byte 0x827e38d
|
||||
.4byte 0x827e3c1
|
||||
.4byte 0x827e3eb
|
||||
.4byte 0x827e416
|
||||
.4byte 0x827e448
|
||||
.4byte 0x827e473
|
||||
.4byte 0x827e4a6
|
||||
.4byte 0x827e4d5
|
||||
.4byte 0x827e504
|
||||
.4byte 0x827e531
|
||||
.4byte 0x827e55a
|
||||
.4byte 0x827e5b2
|
||||
.4byte 0x827e5d0
|
||||
.4byte 0x827e606
|
||||
.4byte 0x827e638
|
||||
.4byte 0x827e658
|
||||
.4byte 0x827e68b
|
||||
.4byte 0x827e6c4
|
||||
.4byte 0x827e7ba
|
||||
|
||||
gUnknown_08587F08:: @ 8587F08
|
||||
.incbin "baserom.gba", 0x587f08, 0x14
|
||||
@ replacing .incbin "baserom.gba", 0x00587f08, 0x14
|
||||
.4byte 0x827e85f
|
||||
.4byte 0x827e868
|
||||
.4byte 0x827e86f
|
||||
.4byte 0x827e878
|
||||
.4byte 0x827e882
|
||||
|
||||
gUnknown_08587F1C:: @ 8587F1C
|
||||
.incbin "baserom.gba", 0x587f1c, 0x18
|
||||
@ replacing .incbin "baserom.gba", 0x00587f1c, 0x18
|
||||
.4byte 0x827e894
|
||||
.4byte 0x827e89e
|
||||
.4byte 0x827e8aa
|
||||
.4byte 0x827e8b4
|
||||
.4byte 0x827e8bf
|
||||
.4byte 0x827e8ca
|
||||
|
||||
gUnknown_08587F34:: @ 8587F34
|
||||
.incbin "baserom.gba", 0x587f34, 0x10
|
||||
|
|
@ -86,7 +206,7 @@ gUnknown_085880A4:: @ 85880A4
|
|||
.incbin "baserom.gba", 0x5880a4, 0x1740
|
||||
|
||||
gUnknown_085897E4:: @ 85897E4
|
||||
.incbin "baserom.gba", 0x5897e4, 0xc0
|
||||
.incbin "baserom.gba", 0x005897e4, 0xc0
|
||||
|
||||
gUnknown_085898A4:: @ 85898A4
|
||||
.incbin "baserom.gba", 0x5898a4, 0x60
|
||||
|
|
@ -102,3 +222,4 @@ gUnknown_0858998C:: @ 858998C
|
|||
|
||||
gUnknown_085899EC:: @ 85899EC
|
||||
.incbin "baserom.gba", 0x5899ec, 0x1c
|
||||
|
||||
|
|
|
|||
|
|
@ -32,25 +32,48 @@ gUnknown_085A08EC:: @ 85A08EC
|
|||
.incbin "baserom.gba", 0x5a08ec, 0x80
|
||||
|
||||
gUnknown_085A096C:: @ 85A096C
|
||||
.incbin "baserom.gba", 0x5a096c, 0x1a4
|
||||
@ replacing .incbin "baserom.gba", 0x005a096c, 0x1a4
|
||||
.byte 0xd5, 0x1d, 0x1d, 0x04, 0x1c, 0x1c, 0x1c, 0x1c, 0x1a, 0xd5, 0xd5, 0x22, 0x0b, 0x23, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x1d, 0xd5, 0xd5
|
||||
.byte 0xd5, 0xd5, 0x38, 0x38, 0x1a, 0xd5, 0xd5, 0x22, 0xd5, 0x23, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x1e, 0x1d, 0xd5, 0xd5, 0xd5, 0xd5, 0x38, 0x38
|
||||
.byte 0x1a, 0xd5, 0xd5, 0x22, 0xd5, 0x23, 0xd5, 0xd5, 0x39, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x1e, 0xd5, 0xd5, 0xd5, 0xd5, 0x03, 0x1b, 0x1b, 0x1a, 0xd5, 0xd5, 0x22
|
||||
.byte 0xd5, 0x23, 0x24, 0x24, 0x24, 0x24, 0x0c, 0x0c, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0xd5, 0xd5, 0x1e, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x1a, 0xd5, 0xd5, 0x22, 0xd5, 0xd5, 0xd5, 0xd5
|
||||
.byte 0x25, 0xd5, 0xd5, 0xd5, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0xd5, 0xd5, 0x0a, 0x1f, 0x1f, 0x1f, 0x1f, 0xd5, 0xd5, 0xd5, 0x1a, 0xd5, 0xd5, 0x22, 0xd5, 0xd5, 0xd5, 0xd5, 0x25, 0xd5, 0xd5, 0xd5
|
||||
.byte 0x27, 0x27, 0x27, 0x27, 0x0d, 0x0d, 0xd5, 0xd5, 0x0a, 0xd5, 0xd5, 0xd5, 0x05, 0x20, 0x20, 0x20, 0x09, 0x09, 0x21, 0x21, 0x26, 0x26, 0x26, 0x26, 0x26, 0xd5, 0xd5, 0xd5, 0x29, 0x29, 0x29, 0x2a
|
||||
.byte 0x2a, 0x2a, 0xd5, 0xd5, 0x13, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x19, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x29, 0x0e, 0x29, 0x2a, 0x2a, 0x2a, 0xd5, 0xd5
|
||||
.byte 0x13, 0xd5, 0xd5, 0xd5, 0x12, 0x12, 0x12, 0x12, 0x19, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x29, 0x29, 0x29, 0x2a, 0x2a, 0x2a, 0xd5, 0x0f, 0x13, 0x07, 0x11, 0x11
|
||||
.byte 0x01, 0xd5, 0xd5, 0xd5, 0x19, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x2b, 0x2b, 0x2b, 0x2b, 0x0f, 0x14, 0xd5, 0xd5, 0xd5, 0x10, 0xd5, 0xd5, 0xd5
|
||||
.byte 0x08, 0x31, 0x31, 0x31, 0x30, 0x30, 0x30, 0x2f, 0x2f, 0x06, 0x2e, 0x2e, 0x2e, 0x2d, 0x2d, 0x2d, 0x2c, 0x2c, 0xd5, 0xd5, 0x14, 0xd5, 0xd5, 0xd5, 0x00, 0xd5, 0xd5, 0xd5, 0x08, 0xd5, 0xd5, 0xd5
|
||||
.byte 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x14, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x18, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5
|
||||
.byte 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x3a, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x15, 0x15, 0x15, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x18, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5
|
||||
.byte 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x02, 0x16, 0x16, 0x16, 0x17, 0x17, 0x18, 0xd5, 0xd5, 0xd5, 0x49, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5
|
||||
.byte 0xd5, 0xd5, 0xd5, 0xd5
|
||||
|
||||
@ 85A0B10
|
||||
.include "data/region_map_entries.inc"
|
||||
|
||||
gUnknown_085A1B24:: @ 85A1B24
|
||||
.incbin "baserom.gba", 0x5a1b24, 0x60
|
||||
@ replacing .incbin "baserom.gba", 0x005a1b24, 0x60
|
||||
.2byte 0x00ce, 0x0014, 0x0032, 0x0027, 0x00cf, 0x002c, 0x0033, 0x0029, 0x0034, 0x002a, 0x0035, 0x002b, 0x00d0, 0x002c, 0x0036, 0x000e
|
||||
.2byte 0x0045, 0x002b, 0x00c5, 0x000c, 0x0042, 0x000c, 0x00c6, 0x001b, 0x004f, 0x0031, 0x003b, 0x0013, 0x004c, 0x001b, 0x0041, 0x0025
|
||||
.2byte 0x0055, 0x002e, 0x00c7, 0x001a, 0x00d4, 0x001a, 0x00d1, 0x001d, 0x00d2, 0x0012, 0x00ca, 0x0012, 0x003d, 0x0017, 0x00d5, 0x00d5
|
||||
|
||||
gUnknown_085A1B84:: @ 85A1B84
|
||||
.incbin "baserom.gba", 0x5a1b84, 0x6
|
||||
@ replacing .incbin "baserom.gba", 0x005a1b84, 0x6
|
||||
.2byte 0x00cb, 0x00cc, 0x00cc
|
||||
|
||||
gUnknown_085A1B8A:: @ 85A1B8A
|
||||
.incbin "baserom.gba", 0x5a1b8a, 0x22
|
||||
@ replacing .incbin "baserom.gba", 0x005a1b8a, 0x22
|
||||
.2byte 0x001d, 0x001d, 0x001e, 0x001e, 0x001f, 0x001f, 0x0021, 0x0021, 0x0014, 0x0014, 0x0028, 0x0028, 0x002a, 0x002a, 0x002c, 0x002c
|
||||
.2byte 0x0000
|
||||
|
||||
gUnknown_085A1BAC:: @ 85A1BAC
|
||||
.incbin "baserom.gba", 0x5a1bac, 0x20
|
||||
@ replacing .incbin "baserom.gba", 0x005a1bac, 0x20
|
||||
.2byte 0x0000, 0x000a, 0x0000, 0x000c, 0x0018, 0x0003, 0x0019, 0x0004, 0x0019, 0x0006, 0x0019, 0x0007, 0x0018, 0x000a, 0x0018, 0x000a
|
||||
|
||||
gUnknown_085A1BCC:: @ 85A1BCC
|
||||
.incbin "baserom.gba", 0x5a1bcc, 0x34
|
||||
@ replacing .incbin "baserom.gba", 0x005a1bcc, 0x34
|
||||
.byte 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x04, 0x00, 0x14, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x10, 0x00, 0x0a, 0x00
|
||||
.byte 0x20, 0x00, 0x0a, 0x00, 0x10, 0x00, 0x0a, 0x00, 0xfe, 0xff, 0x00, 0x00, 0xd8, 0x1b, 0x5a, 0x08, 0xe4, 0x1b, 0x5a, 0x08
|
||||
|
||||
gUnknown_085A1C00:: @ 85A1C00
|
||||
.incbin "baserom.gba", 0x5a1c00, 0x8
|
||||
|
|
@ -62,10 +85,12 @@ gUnknown_085A1C20:: @ 85A1C20
|
|||
.incbin "baserom.gba", 0x5a1c20, 0x10
|
||||
|
||||
gUnknown_085A1C30:: @ 85A1C30
|
||||
.incbin "baserom.gba", 0x5a1c30, 0x4
|
||||
@ replacing .incbin "baserom.gba", 0x005a1c30, 0x4
|
||||
.4byte 0x85a1c28
|
||||
|
||||
gUnknown_085A1C34:: @ 85A1C34
|
||||
.incbin "baserom.gba", 0x5a1c34, 0x4
|
||||
@ replacing .incbin "baserom.gba", 0x005a1c34, 0x4
|
||||
.byte 0xc8, 0xc9, 0xd3, 0x00
|
||||
|
||||
gUnknown_085A1C38:: @ 85A1C38
|
||||
.incbin "baserom.gba", 0x5a1c38, 0x20
|
||||
|
|
@ -80,7 +105,12 @@ gUnknown_085A1D68:: @ 85A1D68
|
|||
.incbin "baserom.gba", 0x5a1d68, 0xd4
|
||||
|
||||
gUnknown_085A1E3C:: @ 85A1E3C
|
||||
.incbin "baserom.gba", 0x5a1e3c, 0xa0
|
||||
@ replacing .incbin "baserom.gba", 0x005a1e3c, 0xa0
|
||||
.byte 0x00, 0x09, 0x01, 0x00, 0x0a, 0x0e, 0x00, 0x0b, 0x0f, 0x00, 0x0c, 0x10, 0x00, 0x0d, 0x11, 0x00, 0x0e, 0x12, 0x00, 0x0f, 0x13, 0x00, 0x00, 0x03, 0x00, 0x01, 0x04, 0x00, 0x02, 0x05, 0x00, 0x03
|
||||
.byte 0x06, 0x00, 0x04, 0x07, 0x00, 0x05, 0x08, 0x00, 0x06, 0x09, 0x00, 0x07, 0x0a, 0x00, 0x08, 0x0b, 0x00, 0x10, 0x00, 0x00, 0x11, 0x00, 0x00, 0x12, 0x00, 0x00, 0x13, 0x00, 0x00, 0x14, 0x00, 0x00
|
||||
.byte 0x15, 0x00, 0x00, 0x16, 0x00, 0x00, 0x17, 0x00, 0x00, 0x18, 0x00, 0x00, 0x19, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x1f, 0x00
|
||||
.byte 0x00, 0x20, 0x00, 0x00, 0x21, 0x00, 0x00, 0x22, 0x00, 0x00, 0x23, 0x00, 0x00, 0x24, 0x00, 0x00, 0x25, 0x00, 0x00, 0x26, 0x00, 0x00, 0x27, 0x00, 0x00, 0x28, 0x00, 0x00, 0x29, 0x00, 0x00, 0x2a
|
||||
.byte 0x00, 0x00, 0x2b, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x30, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x82, 0xc7, 0x5e, 0x08, 0x91, 0xc7, 0x5e, 0x08
|
||||
|
||||
gUnknown_085A1EDC:: @ 85A1EDC
|
||||
.incbin "baserom.gba", 0x5a1edc, 0x8
|
||||
|
|
@ -95,7 +125,12 @@ gUnknown_085A1F10:: @ 85A1F10
|
|||
.incbin "baserom.gba", 0x5a1f10, 0x8
|
||||
|
||||
gUnknown_085A1F18:: @ 85A1F18
|
||||
.incbin "baserom.gba", 0x5a1f18, 0x64
|
||||
@ replacing .incbin "baserom.gba", 0x005a1f18, 0x64
|
||||
.2byte 0x08a8, 0x003a, 0xffff, 0x00d5, 0x0000, 0x0000, 0x0800, 0x0000, 0x0000, 0x0005, 0xffff, 0x0000, 0x0001, 0x0005, 0xffff, 0x0000
|
||||
.2byte 0x0003, 0x0005, 0xffff, 0x0000, 0x0005, 0x0005, 0xffff, 0x0000, 0x0006, 0x0005, 0xffff, 0x0000, 0x0008, 0x0005, 0xffff, 0x0000
|
||||
.2byte 0x000a, 0x0005, 0xffff, 0x0000, 0x1f28, 0x085a, 0x1f30, 0x085a, 0x1f38, 0x085a, 0x1f40, 0x085a, 0x1f48, 0x085a, 0x1f50, 0x085a
|
||||
.2byte 0x1f58, 0x085a
|
||||
|
||||
gUnknown_085A1F7C:: @ 85A1F7C
|
||||
.incbin "baserom.gba", 0x5a1f7c, 0x18
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,10 @@
|
|||
.section .rodata
|
||||
|
||||
gUnknown_0862AD34:: @ 862AD34
|
||||
.incbin "baserom.gba", 0x62ad34, 0x10
|
||||
@ replacing .incbin "baserom.gba", 0x0062ad34, 0x10
|
||||
.2byte 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048
|
||||
|
||||
gUnknown_0862AD44:: @ 862AD44
|
||||
.incbin "baserom.gba", 0x62ad44, 0x10
|
||||
@ replacing .incbin "baserom.gba", 0x0062ad44, 0x10
|
||||
.2byte 0x0041, 0x0042, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0000
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue