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

Merge branch 'master' of https://github.com/pret/pokeemerald

Browse Source 
also started fixing pointers in my dumps
This commit is contained in:
itskobold
2017-11-15 12:41:25 +00:00
parent e373cf4bb9 72b57b342e
commit 2acab81713
91 changed files with 4805 additions and 8893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_frontier_1.s
+1 -47
View File
@@ -11,7 +11,6 @@ gUnknown_0860C988:: @ 860C988
.incbin "baserom.gba", 0x60c988, 0x269
gUnknown_0860CBF1:: @ 860CBF1
@ replacing .incbin "baserom.gba", 0x0060cbf1, 0x283
.byte 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10
.byte 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x02, 0x04, 0x0b, 0x11
.byte 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12
@@ -44,7 +43,7 @@ gUnknown_0860CE94:: @ 860CE94
window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010
window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090
window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110
window_template 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
gUnknown_0860CEB4:: @ 860CEB4
window_template 0x00, 0x02, 0x02, 0x1a, 0x02, 0x0f, 0x0001
@@ -88,11 +87,9 @@ gUnknown_0860D068:: @ 860D068
.incbin "baserom.gba", 0x60d068, 0x18
gUnknown_0860D080:: @ 860D080
@ replacing .incbin "baserom.gba", 0x0060d080, 0x10
.byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01
gUnknown_0860D090:: @ 860D090
@ replacing .incbin "baserom.gba", 0x0060d090, 0x5c
.4byte sub_818E9CC
.4byte sub_818EA84
.4byte sub_818ED28
@@ -118,41 +115,32 @@ gUnknown_0860D090:: @ 860D090
.4byte sub_818F02C
gUnknown_0860D0EC:: @ 860D0EC
@ replacing .incbin "baserom.gba", 0x0060d0ec, 0x10
.4byte 0x00000004, 0x00000008, 0x00100000, 0x00200000
gUnknown_0860D0FC:: @ 860D0FC
@ replacing .incbin "baserom.gba", 0x0060d0fc, 0x10
.4byte 0xfffffffb, 0xfffffff7, 0xffefffff, 0xffdfffff
gUnknown_0860D10C:: @ 860D10C
@ replacing .incbin "baserom.gba", 0x0060d10c, 0x40
.byte 0x08, 0x00, 0x04, 0x08, 0x09, 0x0c, 0x08, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x0b, 0x04, 0x00, 0x08, 0x0c, 0x00, 0x04, 0x08, 0x0d, 0x0c, 0x08, 0x00, 0x0e, 0x08, 0x0c, 0x00, 0x0f, 0x04, 0x00, 0x08
.byte 0x00, 0x00, 0x04, 0x08, 0x01, 0x0c, 0x08, 0x00, 0x02, 0x08, 0x0c, 0x00, 0x03, 0x04, 0x00, 0x08, 0x04, 0x00, 0x04, 0x08, 0x05, 0x0c, 0x08, 0x00, 0x06, 0x08, 0x0c, 0x00, 0x07, 0x04, 0x00, 0x08
gUnknown_0860D14C:: @ 860D14C
@ replacing .incbin "baserom.gba", 0x0060d14c, 0x10
.byte 0x00, 0x08, 0x04, 0x0c, 0x07, 0x0f, 0x03, 0x0b, 0x02, 0x0a, 0x06, 0x0e, 0x05, 0x0d, 0x01, 0x09
gUnknown_0860D15C:: @ 860D15C
@ replacing .incbin "baserom.gba", 0x0060d15c, 0x40
.byte 0x00, 0x08, 0x0c, 0x0e, 0x00, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e
.byte 0x04, 0x0a, 0x0d, 0x0e, 0x04, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e
gUnknown_0860D19C:: @ 860D19C
@ replacing .incbin "baserom.gba", 0x0060d19c, 0x4
.byte 0x17, 0x1b, 0x1d, 0x1e
gUnknown_0860D1A0:: @ 860D1A0
@ replacing .incbin "baserom.gba", 0x0060d1a0, 0x20
.byte 0x10, 0x18, 0x1c, 0x1e, 0x11, 0x18, 0x1c, 0x1e, 0x12, 0x19, 0x1c, 0x1e, 0x13, 0x19, 0x1c, 0x1e, 0x14, 0x1a, 0x1d, 0x1e, 0x15, 0x1a, 0x1d, 0x1e, 0x16, 0x1b, 0x1d, 0x1e, 0x17, 0x1b, 0x1d, 0x1e
gUnknown_0860D1C0:: @ 860D1C0
@ replacing .incbin "baserom.gba", 0x0060d1c0, 0x10
.byte 0x00, 0x0f, 0x08, 0x07, 0x03, 0x0c, 0x0b, 0x04, 0x01, 0x0e, 0x09, 0x06, 0x02, 0x0d, 0x0a, 0x05
gUnknown_0860D1D0:: @ 860D1D0
@ replacing .incbin "baserom.gba", 0x0060d1d0, 0x44
.4byte 0x82c3188
.4byte 0x82c31aa
.4byte 0x82c31c0
@@ -172,7 +160,6 @@ gUnknown_0860D1D0:: @ 860D1D0
.4byte 0x82c3378
gUnknown_0860D214:: @ 860D214
@ replacing .incbin "baserom.gba", 0x0060d214, 0x80
.4byte 0x82c339b
.4byte 0x82c33c4
.4byte 0x82c33e6
@@ -207,7 +194,6 @@ gUnknown_0860D214:: @ 860D214
.4byte 0x82c37bd
gUnknown_0860D294:: @ 860D294
@ replacing .incbin "baserom.gba", 0x0060d294, 0xac
.4byte 0x82c37d7
.4byte 0x82c37f1
.4byte 0x82c380c
@@ -253,23 +239,18 @@ gUnknown_0860D294:: @ 860D294
.4byte 0x82c3c51
gUnknown_0860D340:: @ 860D340
@ replacing .incbin "baserom.gba", 0x0060d340, 0x3
.byte 0x68, 0x88, 0x68
gUnknown_0860D343:: @ 860D343
@ replacing .incbin "baserom.gba", 0x0060d343, 0x3
.byte 0x26, 0x3e, 0x4e
gUnknown_0860D346:: @ 860D346
@ replacing .incbin "baserom.gba", 0x0060d346, 0x3
.byte 0x00, 0x04, 0x00
gUnknown_0860D349:: @ 860D349
@ replacing .incbin "baserom.gba", 0x0060d349, 0x7
.byte 0x00, 0x05, 0x09, 0x0c, 0x0e, 0x00, 0x00
gUnknown_0860D350:: @ 860D350
@ replacing .incbin "baserom.gba", 0x0060d350, 0x3c
.4byte 0x82c3d1f
.4byte 0x82c3d30
.4byte 0x82c3d41
@@ -287,7 +268,6 @@ gUnknown_0860D350:: @ 860D350
.4byte 0x82c3e0f
gUnknown_0860D38C:: @ 860D38C
@ replacing .incbin "baserom.gba", 0x0060d38c, 0x1c
.4byte 0x82c3c78
.4byte 0x82c3c8e
.4byte 0x82c3c9f
@@ -297,47 +277,37 @@ gUnknown_0860D38C:: @ 860D38C
.4byte 0x82c3d00
gUnknown_0860D3A8:: @ 860D3A8
@ replacing .incbin "baserom.gba", 0x0060d3a8, 0x3
.byte 0x60, 0x60, 0x60
gUnknown_0860D3AB:: @ 860D3AB
@ replacing .incbin "baserom.gba", 0x0060d3ab, 0x3
.byte 0x38, 0x50, 0x68
gUnknown_0860D3AE:: @ 860D3AE
@ replacing .incbin "baserom.gba", 0x0060d3ae, 0x3
.byte 0x90, 0x90, 0x90
gUnknown_0860D3B1:: @ 860D3B1
@ replacing .incbin "baserom.gba", 0x0060d3b1, 0x3
.byte 0x38, 0x50, 0x68
gUnknown_0860D3B4:: @ 860D3B4
@ replacing .incbin "baserom.gba", 0x0060d3b4, 0x10
.byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01
gUnknown_0860D3C4:: @ 860D3C4
@ replacing .incbin "baserom.gba", 0x0060d3c4, 0x2
.byte 0x00, 0x02
gUnknown_0860D3C6:: @ 860D3C6
@ replacing .incbin "baserom.gba", 0x0060d3c6, 0x2b
.byte 0x00, 0x02, 0x02, 0x00, 0x04, 0x02, 0x00, 0x06, 0x02, 0x00, 0x08, 0x02, 0x00, 0x0a, 0x02, 0x00, 0x0c, 0x02, 0x00, 0x0e, 0x02, 0x00, 0x00, 0x04, 0x01, 0x04, 0x04, 0x01, 0x08, 0x04, 0x01, 0x0c
.byte 0x04, 0x01, 0x00, 0x08, 0x02, 0x08, 0x08, 0x02, 0x00, 0x10, 0x03
gUnknown_0860D3F1:: @ 860D3F1
@ replacing .incbin "baserom.gba", 0x0060d3f1, 0x1
.byte 0x00
gUnknown_0860D3F2:: @ 860D3F2
@ replacing .incbin "baserom.gba", 0x0060d3f2, 0x1f
.byte 0x00, 0x01, 0x70, 0x01, 0x00, 0x00, 0x70, 0x00, 0x30, 0x01, 0x40, 0x01, 0x30, 0x00, 0x40, 0x00, 0x10, 0x01, 0x60, 0x01, 0x10, 0x00, 0x60, 0x00, 0x20, 0x01, 0x50, 0x01, 0x20, 0x00, 0x50
gUnknown_0860D411:: @ 860D411
.incbin "baserom.gba", 0x60d411, 0x8ff //struct - byte 1 and 2 loaded seperately, 2 added to move 1 addr across
gUnknown_0860DD10:: @ 860DD10
@ replacing .incbin "baserom.gba", 0x0060dd10, 0x100
.4byte 0x860d450
.4byte 0x860d460
.4byte 0x860d47c
@@ -404,12 +374,10 @@ gUnknown_0860DD10:: @ 860DD10
.4byte 0x860d764
gUnknown_0860DE10:: @ 860DE10
@ replacing .incbin "baserom.gba", 0x0060de10, 0x40
.byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d
.byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d
gUnknown_0860DE50:: @ 860DE50
@ replacing .incbin "baserom.gba", 0x0060de50, 0x28
.4byte 0x8195981
.4byte 0x8195a39
.4byte 0x8195ae5
@@ -422,37 +390,30 @@ gUnknown_0860DE50:: @ 860DE50
.4byte 0x8195db9
gUnknown_0860DE78:: @ 860DE78
@ replacing .incbin "baserom.gba", 0x0060de78, 0xc
.2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046
gUnknown_0860DE84:: @ 860DE84
@ replacing .incbin "baserom.gba", 0x0060de84, 0x14
.2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000
gUnknown_0860DE98:: @ 860DE98
@ replacing .incbin "baserom.gba", 0x0060de98, 0x10
.4byte 0x00000010, 0x00000020, 0x00400000, 0x00800000
gUnknown_0860DEA8:: @ 860DEA8
@ replacing .incbin "baserom.gba", 0x0060dea8, 0x10
.4byte 0xffffffef, 0xffffffdf, 0xffbfffff, 0xff7fffff
gUnknown_0860DEB8:: @ 860DEB8 //struct
.incbin "baserom.gba", 0x60deb8, 0xb68
gUnknown_0860EA20:: @ 860EA20
@ replacing .incbin "baserom.gba", 0x0060ea20, 0xc
.4byte 0x860e3b8
.4byte 0x860e430
.4byte 0x860e4a0
gUnknown_0860EA2C:: @ 860EA2C
@ replacing .incbin "baserom.gba", 0x0060ea2c, 0x8
.4byte 0x860e510
.4byte 0x860e580
gUnknown_0860EA34:: @ 860EA34
@ replacing .incbin "baserom.gba", 0x0060ea34, 0x18
.4byte 0x860e5f0
.4byte 0x860e7f0
.4byte 0x860e860
@@ -476,7 +437,6 @@ gUnknown_0860EF70:: @ 860EF70
.incbin "baserom.gba", 0x60ef70, 0x8
gUnknown_0860EF78:: @ 860EF78
@ replacing .incbin "baserom.gba", 0x0060ef78, 0x20
.4byte sub_819612C
.4byte sub_81961F0
.4byte sub_8196274
@@ -490,13 +450,11 @@ gUnknown_0860EF98:: @ 860EF98
.incbin "baserom.gba", 0x60ef98, 0x8
gUnknown_0860EFA0:: @ 860EFA0
@ replacing .incbin "baserom.gba", 0x0060efa0, 0xc
.4byte 0x2021cc4
.4byte 0x2021dc4
.4byte 0x2021ec4
gUnknown_0860EFAC:: @ 860EFAC
@ replacing .incbin "baserom.gba", 0x0060efac, 0x18
.4byte sub_8196A44
.4byte sub_8196A9C
.4byte sub_8196B98
@@ -505,12 +463,10 @@ gUnknown_0860EFAC:: @ 860EFAC
.4byte sub_8196D14
gUnknown_0860EFC4:: @ 860EFC4
@ replacing .incbin "baserom.gba", 0x0060efc4, 0x30
.2byte 0x0282, 0x0000, 0xfa72, 0x085e, 0x01e1, 0x0000, 0xfa77, 0x085e, 0x02a9, 0x0000, 0xfa7b, 0x085e, 0x02af, 0x0000, 0xfa80, 0x085e
.2byte 0x0033, 0x0000, 0xfa84, 0x085e, 0x011f, 0x0000, 0xfa8a, 0x085e
gUnknown_0860EFF4:: @ 860EFF4
@ replacing .incbin "baserom.gba", 0x0060eff4, 0x1c
.4byte 0x85ed104
.4byte 0x85ed111
.4byte 0x85ed11d
@@ -520,14 +476,12 @@ gUnknown_0860EFF4:: @ 860EFF4
.4byte 0x85ed153
gUnknown_0860F010:: @ 860F010
@ replacing .incbin "baserom.gba", 0x0060f010, 0x10
.4byte 0x8680867
.4byte 0x86a0869
.4byte 0x86c086b
.4byte 0x86e086d
gUnknown_0860F020:: @ 860F020
@ replacing .incbin "baserom.gba", 0x0060f020, 0x54
.4byte 0x82a5d6c
.4byte 0x82a5dab
.4byte 0x82a5df1