contest.s, region_map.s, trainer_rematch.s

all partially done
This commit is contained in:
itskobold
2017-11-07 23:11:17 +00:00
parent 860d5e026d
commit b2cb7ba58c
3 changed files with 179 additions and 20 deletions
+45 -10
View File
@@ -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