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

Merge branch 'master' into vs_seeker

Browse Source
This commit is contained in:
PikalaxALT
2018-10-08 19:00:01 -04:00
parent 0335914719 10fff9c6f2
commit 2e0259fceb
35 changed files with 1041 additions and 1564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data.s
+4 -1
View File
@@ -1554,7 +1554,10 @@ gUnknown_83AC970:: @ 83AC970
.incbin "baserom.gba", 0x3AC970, 0x20
sFanfares:: @ 83AC990
.incbin "baserom.gba", 0x3AC990, 0x278
.incbin "baserom.gba", 0x3AC990, 0x40
gUnknown_83AC9D0:: @ 83AC9D0
.incbin "baserom.gba", 0x3AC9D0, 0x238
gUnknown_83ACC08:: @ 83ACC08
.incbin "baserom.gba", 0x3ACC08, 0x440
data/data_84827AC.s
+2 -7
View File
@@ -4999,14 +4999,9 @@ gUnknown_8468B6C:: @ 8468B6C
gUnknown_8468BCC:: @ 8468BCC
.incbin "baserom.gba", 0x468BCC, 0x90
.align 2
gUnknown_8468C5C:: @ 8468C5C
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c"
.align 2
gUnknown_8468C94:: @ 8468C94
.asciz "0"
.section .rodata.8468C98
// seagallop.o
.align 2
gUnknown_8468C98:: @ 8468C98
.incbin "baserom.gba", 0x468C98, 0x520
data/graphics/fonts/down_arrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 B

data/graphics/fonts/down_arrow_2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B

data/graphics/fonts/down_arrow_3.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 159 B

data/graphics/fonts/down_arrow_4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 160 B

data/graphics/fonts/down_arrow_RS.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 163 B

data/graphics/fonts/down_arrow_RS_2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B

data/graphics/fonts/font0_jap.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

data/graphics/fonts/font0_latin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

data/graphics/fonts/font1_jap.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

data/graphics/fonts/font1_latin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

data/graphics/fonts/font2_jap.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

data/graphics/fonts/font2_latin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

data/graphics/fonts/font4_jap.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

data/graphics/fonts/font4_latin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

data/graphics/fonts/font5_jap.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

data/graphics/fonts/font5_latin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

data/graphics/fonts/font9_jap.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

data/graphics/fonts/keypad_icons.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 B

data/text.s
-88
View File
@@ -1,88 +0,0 @@
.section .rodata
gDownArrowTiles:: @ 81EA14C
.incbin "baserom.gba", 0x1EA14C, 0x100
gDarkDownArrowTiles:: @ 81EA24C
.incbin "baserom.gba", 0x1EA24C, 0x400
gDownArrowYCoords:: @ 81EA64C
.incbin "baserom.gba", 0x1EA64C, 0x4
gUnknown_81EA650:: @ 81EA650
.incbin "baserom.gba", 0x1EA650, 0x4
gGlyphWidthFuncs:: @ 81EA654
.incbin "baserom.gba", 0x1EA654, 0x38
gUnknown_81EA68C:: @ 81EA68C
.incbin "baserom.gba", 0x1EA68C, 0x18
gUnknown_81EA6A4:: @ 81EA6A4
.incbin "baserom.gba", 0x1EA6A4, 0x10
gUnknown_81EA6B4:: @ 81EA6B4
.incbin "baserom.gba", 0x1EA6B4, 0x18
gUnknown_81EA6CC:: @ 81EA6CC
.incbin "baserom.gba", 0x1EA6CC, 0x34
gUnknown_81EA700:: @ 81EA700
.incbin "baserom.gba", 0x1EA700, 0x800
gUnknown_81EAF00:: @ 81EAF00
.incbin "baserom.gba", 0x1EAF00, 0x4000
gUnknown_81EEF00:: @ 81EEF00
.incbin "baserom.gba", 0x1EEF00, 0x200
gUnknown_81EF100:: @ 81EF100
.incbin "baserom.gba", 0x1EF100, 0x4000
gUnknown_81F3100:: @ 81F3100
.incbin "baserom.gba", 0x1F3100, 0x8000
gUnknown_81FB100:: @ 81FB100
.incbin "baserom.gba", 0x1FB100, 0x200
gUnknown_81FB300:: @ 81FB300
.incbin "baserom.gba", 0x1FB300, 0x4000
gUnknown_81FF300:: @ 81FF300
.incbin "baserom.gba", 0x1FF300, 0x8000
gUnknown_8207300:: @ 8207300
.incbin "baserom.gba", 0x207300, 0x200
gUnknown_8207500:: @ 8207500
.incbin "baserom.gba", 0x207500, 0x8000
gUnknown_820F500:: @ 820F500
.incbin "baserom.gba", 0x20F500, 0x118
gUnknown_820F618:: @ 820F618
.incbin "baserom.gba", 0x20F618, 0x8000
gUnknown_8217618:: @ 8217618
.incbin "baserom.gba", 0x217618, 0x200
gUnknown_8217818:: @ 8217818
.incbin "baserom.gba", 0x217818, 0x8000
gUnknown_821F818:: @ 821F818
.incbin "baserom.gba", 0x21F818, 0x118
gUnknown_821F930:: @ 821F930
.incbin "baserom.gba", 0x21F930, 0x8000
gUnknown_8227930:: @ 8227930
.incbin "baserom.gba", 0x227930, 0x200
gUnknown_8227B30:: @ 8227B30
.incbin "baserom.gba", 0x227B30, 0x8000
gUnknown_822FB30:: @ 822FB30
.incbin "baserom.gba", 0x22FB30, 0x118
gUnknown_822FC48:: @ 822FC48
.incbin "baserom.gba", 0x22FC48, 0x2000