dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into quest_log

Browse Source
This commit is contained in:
PikalaxALT
2018-11-21 09:00:41 -05:00
parent 6bcabeab1e 2ed26ab8fc
commit 77d7434df2
44 changed files with 5266 additions and 6718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data.s
-2222
View File
File diff suppressed because it is too large Load Diff
data/data_835B488.s
+2218
View File
File diff suppressed because it is too large Load Diff
data/data_83FECCC.s
+2 -17
View File
@@ -2731,24 +2731,9 @@ gUnknown_8453178:: @ 8453178
gUnknown_8453184:: @ 8453184
.incbin "baserom.gba", 0x453184, 0x8
gUnknown_845318C:: @ 845318C
.incbin "baserom.gba", 0x45318C, 0xDD0
gUnknown_8453F5C:: @ 8453F5C
.incbin "baserom.gba", 0x453F5C, 0x4
gUnknown_8453F60:: @ 8453F60
.incbin "baserom.gba", 0x453F60, 0x2
gUnknown_8453F62:: @ 8453F62
.incbin "baserom.gba", 0x453F62, 0x2
gUnknown_8453F64:: @ 8453F64
.incbin "baserom.gba", 0x453F64, 0x3
gUnknown_8453F67:: @ 8453F67
.incbin "baserom.gba", 0x453F67, 0x5
.section .rodata.8453F6C
// item_pc.o
gUnknown_8453F6C:: @ 8453F6C
.incbin "baserom.gba", 0x453F6C, 0x8
data/metatile_behavior.s
+6
View File
@@ -0,0 +1,6 @@
.section .rodata
.align 2
gUnknown_8353068:: @ 8353068
.incbin "baserom.gba", 0x353068, 0x8420