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

Pointer fixes etc

Browse Source 
Fixed up the last of my old dumps
This commit is contained in:
itskobold
2017-11-23 10:48:56 +00:00
parent 40638a48e7
commit deec6f21db
9 changed files with 438 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/cute_sketch.s
-1
View File
@@ -5,7 +5,6 @@
.align 2, 0
gUnknown_085A1F94:: @ 85A1F94
@ replacing .incbin "baserom.gba", 0x005a1f94, 0x2580
.byte 0x00, 0x1d, 0x1c, 0x0e, 0x1e, 0x1b, 0x00, 0x01, 0x32, 0x2e, 0x1e, 0x37, 0x0a, 0x22, 0x1f, 0x05, 0x26, 0x2e, 0x12, 0x17, 0x1e, 0x1a, 0x03, 0x11, 0x05, 0x11, 0x18, 0x05, 0x27, 0x2f, 0x1a, 0x3f
.byte 0x12, 0x22, 0x3f, 0x16, 0x2b, 0x2f, 0x2e, 0x11, 0x02, 0x2d, 0x23, 0x0d, 0x28, 0x17, 0x0c, 0x19, 0x2f, 0x0e, 0x13, 0x30, 0x18, 0x20, 0x2d, 0x28, 0x22, 0x01, 0x03, 0x19, 0x0e, 0x2a, 0x2b, 0x22
.byte 0x15, 0x25, 0x22, 0x0a, 0x26, 0x39, 0x06, 0x23, 0x16, 0x07, 0x2f, 0x22, 0x3a, 0x1b, 0x3b, 0x36, 0x35, 0x0a, 0x2b, 0x24, 0x36, 0x09, 0x12, 0x1c, 0x2f, 0x23, 0x2e, 0x38, 0x2c, 0x05, 0x2a, 0x20
data/fldeff_cut.s
-1
View File
@@ -8,7 +8,6 @@ gUnknown_0857C608:: @ 857C608
.incbin "baserom.gba", 0x57c608, 0x2
gUnknown_0857C60A:: @ 857C60A
@ replacing .incbin "baserom.gba", 0x0057c60a, 0x5a
.byte 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x50, 0xc6, 0x57, 0x08, 0x58, 0x6e, 0x4f, 0x08, 0x20, 0x00, 0x00, 0x00
data/graphics.s
+4 -1
View File
@@ -1365,7 +1365,10 @@ gUnknown_08DD4620:: @ 8DD4620
.incbin "baserom.gba", 0xdd4620, 0xc0
gUnknown_08DD46E0:: @ 8DD46E0
.incbin "baserom.gba", 0xdd46e0, 0x180
.incbin "baserom.gba", 0xdd46e0, 0xc0
gUnknown_08DD47A0:: @ 8DD47A0
.incbin "baserom.gba", 0xdd47a0, 0xc0
gUnknown_08DD4860:: @ 8DD4860
.incbin "baserom.gba", 0xdd4860, 0x20
data/link_strings.s
+25
View File
@@ -4,21 +4,46 @@
.section .rodata
.align 2
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
.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} $"
gUnknown_0862B88D:: @ 862B88D
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
gUnknown_0862B8AE:: @ 862B8AE
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
gUnknown_0862B8CF:: @ 862B8CF
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
gUnknown_0862B8F0:: @ 862B8F0
.string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
gUnknown_0862B911:: @ 862B911
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
gUnknown_0862B932:: @ 862B932
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
gUnknown_0862B953:: @ 862B953
.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_0862B974:: @ 862B974
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
gUnknown_0862B995:: @ 862B995
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
gUnknown_0862B9AE:: @ 862B9AE
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
gUnknown_0862B9C7:: @ 862B9C7
.string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
gUnknown_0862B9E0:: @ 862B9E0
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $"
gUnknown_0862B9F9:: @ 862B9F9
data/menu_indicators.s
-8
View File
@@ -10,35 +10,27 @@ gUnknown_08614244:: @ 8614244
.incbin "baserom.gba", 0x614244, 0x18
gUnknown_0861425C:: @ 861425C
@ replacing .incbin "baserom.gba", 0x0061425c, 0x4
.4byte 0x00000000
gUnknown_08614260:: @ 8614260
@ replacing .incbin "baserom.gba", 0x00614260, 0x4
.4byte 0x00100000
gUnknown_08614264:: @ 8614264
@ replacing .incbin "baserom.gba", 0x00614264, 0x4
.4byte 0x00200000
gUnknown_08614268:: @ 8614268
@ replacing .incbin "baserom.gba", 0x00614268, 0x4
.4byte 0x00300000
gUnknown_0861426C:: @ 861426C
@ replacing .incbin "baserom.gba", 0x0061426c, 0x4
.4byte 0x00400000
gUnknown_08614270:: @ 8614270
@ replacing .incbin "baserom.gba", 0x00614270, 0x4
.4byte 0x00500000
gUnknown_08614274:: @ 8614274
@ replacing .incbin "baserom.gba", 0x00614274, 0x4
.4byte 0x00600000
gUnknown_08614278:: @ 8614278
@ replacing .incbin "baserom.gba", 0x00614278, 0x4
.4byte 0x00700000
gUnknown_0861427C:: @ 861427C
data/naming_screen.s
+50 -29
View File
@@ -7,10 +7,10 @@ gUnknown_0858BD78:: @ 858BD78
.incbin "baserom.gba", 0x58bd78, 0x40
gUnknown_0858BDB8:: @ 858BDB8
.4byte 0x8273216
.4byte 0x8273256
.4byte 0x8273296
.4byte 0x82732d9
.4byte gText_PkmnTransferredSomeonesPC
.4byte gText_PkmnTransferredLanettesPC
.4byte gText_PkmnBoxSomeonesPCFull
.4byte gText_PkmnBoxLanettesPCFull
gUnknown_0858BDC8:: @ 858BDC8
.string "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!$"
@@ -109,30 +109,51 @@ gUnknown_0858BF6C:: @ 858BF6C
.4byte sub_80E49BC
gUnknown_0858BF74:: @ 858BF74
.incbin "baserom.gba", 0x58bf74, 0x14
.incbin "baserom.gba", 0x58bf74, 0x8
gUnknown_0858BF7C:: @ 858BF7C
.4byte 0x0002010D
gUnknown_0858BF80:: @ 858BF80
.4byte 0x0002010E
gUnknown_0858BF84:: @ 858BF84
.4byte 0x0002010F
gUnknown_0858BF88:: @ 858BF88
.byte 0xee, 0xdd, 0xff, 0x00
gUnknown_0858BF8C:: @ 858BF8C
.4byte 0x858bf80
.4byte 0x858bf7c
.4byte 0x858bf84
.4byte gUnknown_0858BF80
.4byte gUnknown_0858BF7C
.4byte gUnknown_0858BF84
gUnknown_0858BF98:: @ 858BF98
.4byte 0x8dd4620
.4byte 0x8dd46e0
.4byte 0x8dd47a0
.4byte gUnknown_08DD4620
.4byte gUnknown_08DD46E0
.4byte gUnknown_08DD47A0
gUnknown_0858BFA4:: @ 858BFA4
.incbin "baserom.gba", 0x58bfa4, 0x34
.incbin "baserom.gba", 0x58bfa4, 0x4
gUnknown_0858BFA8:: @ 858BFA8
.incbin "baserom.gba", 0x58bfa8, 0xc
gUnknown_0858BFB4:: @ 858BFB4
.incbin "baserom.gba", 0x58bfb4, 0xc
gUnknown_0858BFC0:: @ 858BFC0
.incbin "baserom.gba", 0x58bfc0, 0xc
gUnknown_0858BFCC:: @ 858BFCC
.incbin "baserom.gba", 0x58bfcc, 0xc
gUnknown_0858BFD8:: @ 858BFD8
.4byte 0x858bfa8
.4byte 0x858bfb4
.4byte 0x858bfc0
.4byte 0x858bfc0
.4byte 0x858bfcc
.4byte gUnknown_0858BFA8
.4byte gUnknown_0858BFB4
.4byte gUnknown_0858BFC0
.4byte gUnknown_0858BFC0
.4byte gUnknown_0858BFCC
gUnknown_0858BFEC:: @ 858BFEC
.incbin "baserom.gba", 0x58bfec, 0x64
@@ -177,18 +198,18 @@ gUnknown_0858C180:: @ 858C180
.incbin "baserom.gba", 0x58c180, 0x18
gUnknown_0858C198:: @ 858C198
.4byte 0x862b88d
.4byte 0x862b8ae
.4byte 0x862b8cf
.4byte 0x862b8f0
.4byte 0x862b911
.4byte 0x862b932
.4byte 0x862b953
.4byte 0x862b974
.4byte 0x862b995
.4byte 0x862b9ae
.4byte 0x862b9c7
.4byte 0x862b9e0
.4byte gUnknown_0862B88D
.4byte gUnknown_0862B8AE
.4byte gUnknown_0862B8CF
.4byte gUnknown_0862B8F0
.4byte gUnknown_0862B911
.4byte gUnknown_0862B932
.4byte gUnknown_0862B953
.4byte gUnknown_0862B974
.4byte gUnknown_0862B995
.4byte gUnknown_0862B9AE
.4byte gUnknown_0862B9C7
.4byte gUnknown_0862B9E0
gUnknown_0858C1C8:: @ 858C1C8
.incbin "baserom.gba", 0x58c1c8, 0x68
data/shop.s
+5 -5
View File
@@ -10,17 +10,17 @@ gUnknown_08589A08:: @ 8589A08
.4byte BuyMenuReturnToItemList
gUnknown_08589A10:: @ 8589A10
.4byte 0x85e93c7
.4byte gUnknown_085E93C7
.4byte HandleShopMenuBuy
.4byte 0x85e93cb
.4byte gUnknown_085E93CB
.4byte HandleShopMenuSell
.4byte 0x85e93d0
.4byte gUnknown_085E93D0
.4byte HandleShopMenuQuit
gUnknown_08589A28:: @ 8589A28
.4byte 0x85e93c7
.4byte gUnknown_085E93C7
.4byte HandleShopMenuBuy
.4byte 0x85e93d0
.4byte gUnknown_085E93D0
.4byte HandleShopMenuQuit
gUnknown_08589A38:: @ 8589A38
data/trainer_rematch.s
-3
View File
@@ -4,10 +4,7 @@
.section .rodata
gUnknown_0862AD34:: @ 862AD34
@ replacing .incbin "baserom.gba", 0x0062ad34, 0x10
.2byte 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048
gUnknown_0862AD44:: @ 862AD44
@ replacing .incbin "baserom.gba", 0x0062ad44, 0x10
.2byte 0x0041, 0x0042, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0000
data/unk_transition.s
-9
View File
@@ -4,7 +4,6 @@
.section .rodata
gUnknown_0862B770:: @ 862B770
@ replacing .incbin "baserom.gba", 0x0062b770, 0x14
.4byte sub_81DAACC
.4byte sub_81DAC14
.4byte sub_81DABBC
@@ -12,7 +11,6 @@ gUnknown_0862B770:: @ 862B770
.4byte sub_81DAC80
gUnknown_0862B784:: @ 862B784
@ replacing .incbin "baserom.gba", 0x0062b784, 0x14
.4byte sub_81DAACC
.4byte sub_81DACEC
.4byte sub_81DABBC
@@ -20,7 +18,6 @@ gUnknown_0862B784:: @ 862B784
.4byte sub_81DAD58
gUnknown_0862B798:: @ 862B798
@ replacing .incbin "baserom.gba", 0x0062b798, 0x14
.4byte sub_81DAACC
.4byte sub_81DADC4
.4byte sub_81DABBC
@@ -28,7 +25,6 @@ gUnknown_0862B798:: @ 862B798
.4byte sub_81DAE44
gUnknown_0862B7AC:: @ 862B7AC
@ replacing .incbin "baserom.gba", 0x0062b7ac, 0x14
.4byte sub_81DAACC
.4byte sub_81DAEB0
.4byte sub_81DABBC
@@ -36,7 +32,6 @@ gUnknown_0862B7AC:: @ 862B7AC
.4byte sub_81DAF34
gUnknown_0862B7C0:: @ 862B7C0
@ replacing .incbin "baserom.gba", 0x0062b7c0, 0x14
.4byte sub_81DAACC
.4byte sub_81DAFA0
.4byte sub_81DABBC
@@ -44,7 +39,6 @@ gUnknown_0862B7C0:: @ 862B7C0
.4byte sub_81DB02C
gUnknown_0862B7D4:: @ 862B7D4
@ replacing .incbin "baserom.gba", 0x0062b7d4, 0x14
.4byte sub_81DAACC
.4byte sub_81DB098
.4byte sub_81DABBC
@@ -52,7 +46,6 @@ gUnknown_0862B7D4:: @ 862B7D4
.4byte sub_81DB124
gUnknown_0862B7E8:: @ 862B7E8
@ replacing .incbin "baserom.gba", 0x0062b7e8, 0x14
.4byte sub_81DAACC
.4byte sub_81DB190
.4byte sub_81DABBC
@@ -60,10 +53,8 @@ gUnknown_0862B7E8:: @ 862B7E8
.4byte sub_81DB224
gUnknown_0862B7FC:: @ 862B7FC
@ replacing .incbin "baserom.gba", 0x0062b7fc, 0x14
.4byte sub_81DAACC
.4byte sub_81DB290
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DB328