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

berry_fix_program

Browse Source
This commit is contained in:
PikalaxALT
2019-06-15 16:24:47 -04:00
parent 9fb5dcdbf6
commit e28c767612
10 changed files with 306 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data_83FECCC.s
+4 -1
View File
@@ -2808,7 +2808,10 @@ gUnknown_843F8DB:: @ 843F8DB
.incbin "baserom.gba", 0x43F8DB, 0x5
gUnknown_843F8E0:: @ 843F8E0
.incbin "baserom.gba", 0x43F8E0, 0x10
.4byte gUnknown_847A8D8
.4byte gUnknown_847A8FA
.4byte gUnknown_847A913
.4byte gUnknown_847A934
gUnknown_843F8F0:: @ 843F8F0
.incbin "baserom.gba", 0x43F8F0, 0x20
data/data_8471F00.s
+61 -8
View File
@@ -231,19 +231,72 @@ gUnknown_8479748::
// berry_fix_program
gUnknown_847A890:: @ 847A890
.4byte gUnknown_8EA467C, gUnknown_8EA52B8, gUnknown_8EA463C
.4byte gUnknown_8EA5664, gUnknown_8EA60C8, gUnknown_8EA5604
.4byte gUnknown_8EA6408, gUnknown_8EA7028, gUnknown_8EA63C8
.4byte gUnknown_8EA7320, gUnknown_8EA8118, gUnknown_8EA72E0
.4byte gUnknown_8EA8408, gUnknown_8EA8CC8, gUnknown_8EA83C8
.4byte gUnknown_8EA8F40, gUnknown_8EA9588, gUnknown_8EA8F00
gUnknown_847A8D8::
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
.incbin "baserom.gba", 0x47A8D8, 0x2D4
gUnknown_847A8FA::
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
gUnknown_847A913::
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
gUnknown_847A934::
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$"
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$"
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
.string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$"
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$"
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
.string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$"
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
.string "ABCDE$"
.string "FGHIJ$"
.string "KLMNO$"
.string "PQRST$"
.string "UVWXY$"
.string "Z $"
.string "01234$"
.string "56789$"
.string ".,!? $"
.string "-/&… $"
.string "abcde$"
.string "fghij$"
.string "klmno$"
.string "pqrst$"
.string "uvwxy$"
.string "z $"
.string "01234$"
.string "56789$"
.string ".,!? $"
.string "-/&… $"
.string "$"
.string "$"
.string "$"
.string "$"
.string "$"
.string "$"
.string "$"
.string "$"
.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
.string "{EXTRA 210}{EXTRA 208}ょ: $"
// trainer_tower (again?)
@ 847ABAC
.align 2
.include "data/trainer_tower/trainers.inc"
.align 2
data/graphics.s
+18 -18
View File
@@ -16234,58 +16234,58 @@ gTilesetPalettes_8EA1B68:: @ 8EA1B68
gTilesetTiles_8EA1D68:: @ 8EA1D68
.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
gUnknown_8EA463C:: @ 8EA463C
gBerryFixGameboy_Pal:: @ 8EA463C
.incbin "graphics/berry_fix/gba_small.gbapal"
gUnknown_8EA467C:: @ 8EA467C
gBerryFixGameboy_Gfx:: @ 8EA467C
.incbin "graphics/berry_fix/gba_small.4bpp.lz"
gUnknown_8EA52B8:: @ 8EA52B8
gBerryFixGameboy_Tilemap:: @ 8EA52B8
.incbin "graphics/berry_fix/gba_small.bin.lz"
gUnknown_8EA5604:: @ 8EA5604
gBerryFixGameboyLogo_Pal:: @ 8EA5604
.incbin "graphics/berry_fix/logo.gbapal"
gUnknown_8EA5664:: @ 8EA5664
gBerryFixGameboyLogo_Gfx:: @ 8EA5664
.incbin "graphics/berry_fix/logo.4bpp.lz"
gUnknown_8EA60C8:: @ 8EA60C8
gBerryFixGameboyLogo_Tilemap:: @ 8EA60C8
.incbin "graphics/berry_fix/logo.bin.lz"
gUnknown_8EA63C8:: @ 8EA63C8
gBerryFixGbaTransfer_Pal:: @ 8EA63C8
.incbin "graphics/berry_fix/gba_transfer.gbapal"
gUnknown_8EA6408:: @ 8EA6408
gBerryFixGbaTransfer_Gfx:: @ 8EA6408
.incbin "graphics/berry_fix/gba_transfer.4bpp.lz"
gUnknown_8EA7028:: @ 8EA7028
gBerryFixGbaTransfer_Tilemap:: @ 8EA7028
.incbin "graphics/berry_fix/gba_transfer.bin.lz"
gUnknown_8EA72E0:: @ 8EA72E0
gBerryFixGbaTransferHighlight_Pal:: @ 8EA72E0
.incbin "graphics/berry_fix/gba_transfer_highlight.gbapal"
gUnknown_8EA7320:: @ 8EA7320
gBerryFixGbaTransferHighlight_Gfx:: @ 8EA7320
.incbin "graphics/berry_fix/gba_transfer_highlight.4bpp.lz"
gUnknown_8EA8118:: @ 8EA8118
gBerryFixGbaTransferHighlight_Tilemap:: @ 8EA8118
.incbin "graphics/berry_fix/gba_transfer_highlight.bin.lz"
gUnknown_8EA83C8:: @ 8EA83C8
gBerryFixGbaTransferError_Pal:: @ 8EA83C8
.incbin "graphics/berry_fix/gba_transfer_error.gbapal"
gUnknown_8EA8408:: @ 8EA8408
gBerryFixGbaTransferError_Gfx:: @ 8EA8408
.incbin "graphics/berry_fix/gba_transfer_error.4bpp.lz"
gUnknown_8EA8CC8:: @ 8EA8CC8
gBerryFixGbaTransferError_Tilemap:: @ 8EA8CC8
.incbin "graphics/berry_fix/gba_transfer_error.bin.lz"
gUnknown_8EA8F00:: @ 8EA8F00
gBerryFixWindow_Pal:: @ 8EA8F00
.incbin "graphics/berry_fix/window.gbapal"
gUnknown_8EA8F40:: @ 8EA8F40
gBerryFixWindow_Gfx:: @ 8EA8F40
.incbin "graphics/berry_fix/window.4bpp.lz"
gUnknown_8EA9588:: @ 8EA9588
gBerryFixWindow_Tilemap:: @ 8EA9588
.incbin "graphics/berry_fix/window.bin.lz"
.align 2