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

Merge branch 'master' into battle

Browse Source
This commit is contained in:
PikalaxALT
2019-09-25 13:49:16 -04:00
committed by GitHub
parent 2599dac8ac 6539884c88
commit 0e217e22d8
67 changed files with 3363 additions and 3782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data_83FECCC.s
-119
View File
@@ -232,125 +232,6 @@ gUnknown_840C39C:: @ 840C39C
gUnknown_840C3BC:: @ 840C3BC
.incbin "baserom.gba", 0x40C3BC, 0x1E8
gUnknown_840C5A4:: @ 840C5A4
.incbin "baserom.gba", 0x40C5A4, 0xC
gUnknown_840C5B0:: @ 840C5B0
.incbin "baserom.gba", 0x40C5B0, 0x20
gUnknown_840C5D0:: @ 840C5D0
.incbin "baserom.gba", 0x40C5D0, 0x20
gUnknown_840C5F0:: @ 840C5F0
.incbin "baserom.gba", 0x40C5F0, 0x20
gUnknown_840C610:: @ 840C610
.incbin "baserom.gba", 0x40C610, 0x20
gUnknown_840C630:: @ 840C630
.incbin "baserom.gba", 0x40C630, 0x20
gUnknown_840C650:: @ 840C650
.incbin "baserom.gba", 0x40C650, 0x404
gUnknown_840CA54:: @ 840CA54
.incbin "baserom.gba", 0x40CA54, 0x138
gUnknown_840CB8C:: @ 840CB8C
.incbin "baserom.gba", 0x40CB8C, 0x69C
gUnknown_840D228:: @ 840D228
.incbin "baserom.gba", 0x40D228, 0xF30
gUnknown_840E158:: @ 840E158
.incbin "baserom.gba", 0x40E158, 0x7AC
gUnknown_840E904:: @ 840E904
.incbin "baserom.gba", 0x40E904, 0x93C
gUnknown_840F240:: @ 840F240
.incbin "baserom.gba", 0x40F240, 0x704
gUnknown_840F944:: @ 840F944
.incbin "baserom.gba", 0x40F944, 0x854
gUnknown_8410198:: @ 8410198
.incbin "baserom.gba", 0x410198, 0x41C
gUnknown_84105B4:: @ 84105B4
.incbin "baserom.gba", 0x4105B4, 0x728
gUnknown_8410CDC:: @ 8410CDC
.incbin "baserom.gba", 0x410CDC, 0x18
gUnknown_8410CF4:: @ 8410CF4
.incbin "baserom.gba", 0x410CF4, 0x10C
gUnknown_8410E00:: @ 8410E00
.incbin "baserom.gba", 0x410E00, 0x4
gUnknown_8410E04:: @ 8410E04
.incbin "baserom.gba", 0x410E04, 0x4
gUnknown_8410E08:: @ 8410E08
.incbin "baserom.gba", 0x410E08, 0x8
gUnknown_8410E10:: @ 8410E10
.incbin "baserom.gba", 0x410E10, 0x20
gUnknown_8410E30:: @ 8410E30
.incbin "baserom.gba", 0x410E30, 0xDC8
gUnknown_8411BF8:: @ 8411BF8
.incbin "baserom.gba", 0x411BF8, 0x20
gUnknown_8411C18:: @ 8411C18
.incbin "baserom.gba", 0x411C18, 0xD88
gUnknown_84129A0:: @ 84129A0
.incbin "baserom.gba", 0x4129A0, 0x20
gUnknown_84129C0:: @ 84129C0
.incbin "baserom.gba", 0x4129C0, 0x958
gUnknown_8413318:: @ 8413318
.incbin "baserom.gba", 0x413318, 0x20
gUnknown_8413338:: @ 8413338
.incbin "baserom.gba", 0x413338, 0x51C
gUnknown_8413854:: @ 8413854
.incbin "baserom.gba", 0x413854, 0x20
gUnknown_8413874:: @ 8413874
.incbin "baserom.gba", 0x413874, 0x524
gUnknown_8413D98:: @ 8413D98
.incbin "baserom.gba", 0x413D98, 0x20
gUnknown_8413DB8:: @ 8413DB8
.incbin "baserom.gba", 0x413DB8, 0x564
gUnknown_841431C:: @ 841431C
.incbin "baserom.gba", 0x41431C, 0x48
gUnknown_8414364:: @ 8414364
.incbin "baserom.gba", 0x414364, 0x54
gUnknown_84143B8:: @ 84143B8
.incbin "baserom.gba", 0x4143B8, 0x18
gUnknown_84143D0:: @ 84143D0
.incbin "baserom.gba", 0x4143D0, 0x1B8
gUnknown_8414588:: @ 8414588
.incbin "baserom.gba", 0x414588, 0x34
gUnknown_84145BC:: @ 84145BC
.incbin "baserom.gba", 0x4145BC, 0x204
@ strings
.section .rodata.841EE44
.align 2
gUnknown_841EE44:: @ 841EE44