diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-23 22:41:31 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-23 22:41:31 +0100 |
commit | 3a3772c74ff76a258ffa4b6515fa07d5c96a2979 (patch) | |
tree | ab4f4aa0ed2031b2e777ffaa5f12f95adc71b68c | |
parent | 4d24381e5e58b2dd8a138f1d45e618b0e726ec27 (diff) |
more baseroms dumped
-rw-r--r-- | data/script_pokemon_util_80F87D8.s | 2 | ||||
-rw-r--r-- | data/starter_choose.s | 8 | ||||
-rw-r--r-- | data/strings.s | 4 | ||||
-rw-r--r-- | data/trainer_card.s | 12 |
4 files changed, 17 insertions, 9 deletions
diff --git a/data/script_pokemon_util_80F87D8.s b/data/script_pokemon_util_80F87D8.s index beda525c8..360a6f50a 100644 --- a/data/script_pokemon_util_80F87D8.s +++ b/data/script_pokemon_util_80F87D8.s @@ -4,4 +4,4 @@ .section .rodata .align 2, 0 gUnknown_0858D8EC:: @ 858D8EC - .incbin "baserom.gba", 0x58d8ec, 0x4 + .byte 3, 4, 5, 14 diff --git a/data/starter_choose.s b/data/starter_choose.s index a951a8987..d20b4f99a 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -1,7 +1,6 @@ -@ the fourth big chunk of data - .include "asm/macros.inc" .include "constants/constants.inc" + .include "include/constants/species.h" .section .rodata @@ -33,8 +32,11 @@ gStarterChoose_LabelCoords:: @ 85B1DF2 .incbin "baserom.gba", 0x5b1df2, 0x6 sStarterMon:: @ 85B1DF8 - .incbin "baserom.gba", 0x5b1df8, 0x8 + .2byte SPECIES_TREECKO + .2byte SPECIES_TORCHIC + .2byte SPECIES_MUDKIP +.align 2 gUnknown_085B1E00:: @ 85B1E00 .incbin "baserom.gba", 0x5b1e00, 0xc diff --git a/data/strings.s b/data/strings.s index a193fe2e7..1d6444cd8 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3521,10 +3521,10 @@ gText_Var1sTrainerCard:: @ 85ECFA6 gText_HallOfFameDebut:: @ 85ECFB8 .string "HALL OF FAME DEBUT $" -gUnknown_085ECFCD:: @ 85ECFCD +gText_LinkBattles:: @ 85ECFCD .string "LINK BATTLES$" -gUnknown_085ECFDA:: @ 85ECFDA +gText_LinkCableBattles:: @ 85ECFDA .string "LINK CABLE BATTLES$" gText_WinsLosses:: @ 85ECFED diff --git a/data/trainer_card.s b/data/trainer_card.s index ce4f36b4e..d97e3f254 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -88,7 +88,10 @@ gUnknown_0856FB0C:: @ 856FB0C .incbin "baserom.gba", 0x56fb0c, 0x3 gUnknown_0856FB0F:: @ 856FB0F - .incbin "baserom.gba", 0x56fb0f, 0x9 + .incbin "baserom.gba", 0x56fb0f, 0x3 + +gUnknown_0856FB12:: @ 856FB12 + .incbin "baserom.gba", 0x56fb12, 0x6 gUnknown_0856FB18:: @ 856FB18 .incbin "baserom.gba", 0x56fb18, 0x8 @@ -105,7 +108,8 @@ gUnknown_0856FB28:: @ 856FB28 .4byte sub_80C4DB0 gUnknown_0856FB40:: @ 856FB40 - .incbin "baserom.gba", 0x56fb40, 0x8 + .4byte gUnknown_0856FB0C + .4byte gUnknown_0856FB12 gUnknown_0856FB48:: @ 856FB48 .incbin "baserom.gba", 0x56fb48, 0x2 @@ -123,7 +127,9 @@ gUnknown_0856FB57:: @ 856FB57 .incbin "baserom.gba", 0x56fb57, 0x5 gUnknown_0856FB5C:: @ 856FB5C - .incbin "baserom.gba", 0x56fb5c, 0xc + .4byte gText_LinkBattles + .4byte gText_LinkCableBattles + .4byte gText_LinkBattles gUnknown_0856FB68:: @ 856FB68 .incbin "baserom.gba", 0x56fb68, 0x6 |