diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_emerald.s | 40 | ||||
| -rw-r--r-- | data/strings.s | 40 |
2 files changed, 44 insertions, 36 deletions
diff --git a/data/data_emerald.s b/data/data_emerald.s index 88c57af8d..f27668217 100644 --- a/data/data_emerald.s +++ b/data/data_emerald.s @@ -1,43 +1,11 @@ .include "asm/macros.inc" .include "constants/constants.inc" - .section .rodata - -gUnknown_0860B074:: @ 860B074 - .incbin "baserom.gba", 0x60b074, 0xa - -gUnknown_0860B07E:: @ 860B07E - .incbin "baserom.gba", 0x60b07e, 0x126 - -gUnknown_0860B1A4:: @ 860B1A4 - .incbin "baserom.gba", 0x60b1a4, 0x40 - -gUnknown_0860B1E4:: @ 860B1E4 - .incbin "baserom.gba", 0x60b1e4, 0x20 - -gUnknown_0860B204:: @ 860B204 - .incbin "baserom.gba", 0x60b204, 0x20 - -gUnknown_0860B224:: @ 860B224 - .incbin "baserom.gba", 0x60b224, 0xc8 + @ This section was decompiled in battle_dome_cards. + @ On its merge, this section should be deleted. + @ This section contains three objects and accounts for 28 bytes. -gUnknown_0860B2EC:: @ 860B2EC - .incbin "baserom.gba", 0x60b2ec, 0x18 - -gUnknown_0860B304:: @ 860B304 - .incbin "baserom.gba", 0x60b304, 0xc - -gUnknown_0860B310:: @ 860B310 - .incbin "baserom.gba", 0x60b310, 0x14 - -gUnknown_0860B324:: @ 860B324 - .incbin "baserom.gba", 0x60b324, 0x14 - -gUnknown_0860B338:: @ 860B338 - .incbin "baserom.gba", 0x60b338, 0x14 - -gUnknown_0860B34C:: @ 860B34C - .incbin "baserom.gba", 0x60b34c, 0xc + .section .rodata gUnknown_0860B358:: @ 860B358 .incbin "baserom.gba", 0x60b358, 0x1630 diff --git a/data/strings.s b/data/strings.s index 4d0183a4c..348e493c8 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1263,10 +1263,20 @@ gText_Glacia:: @ 85EAD30 .string "Types of CONTESTS$" .string "Ranks$" .string "Judging$" + +gUnknown_085EADA4:: .string "COOLNESS CONTEST$" + +gUnknown_085EADB5:: .string "BEAUTY CONTEST$" + +gUnknown_085EADC4:: .string "CUTENESS CONTEST$" + +gUnknown_085EADD5:: .string "SMARTNESS CONTEST$" + +gUnknown_085EADE7:: .string "TOUGHNESS CONTEST$" .string "DECORATION$" .string "PACK UP$" @@ -3029,25 +3039,55 @@ gText_MoveOkBack:: @ 85EEAF6 gText_CallCantBeMadeHere:: @ 85EEB0B .string "A call can’t be made from here.$" +gUnknown_085EEB2B:: .string "HANDSOME$" + +gUnknown_085EEB34:: .string "VINNY$" + +gUnknown_085EEB3A:: .string "MOREME$" + +gUnknown_085EEB41:: .string "IRONHARD$" + +gUnknown_085EEB4A:: .string "MUSCLE$" + +gUnknown_085EEB51:: .string "coolness$" + +gUnknown_085EEB5A:: .string "beauty$" + +gUnknown_085EEB61:: .string "cuteness$" + +gUnknown_085EEB6A:: .string "smartness$" + +gUnknown_085EEB74:: .string "toughness$" gText_Lady2:: @ 85EEB7E .string "Lady$" +gUnknown_085EEB83:: .string "slippery$" + +gUnknown_085EEB8C:: .string "roundish$" + +gUnknown_085EEB95:: .string "wham-ish$" + +gUnknown_085EEB9E:: .string "shiny$" + +gUnknown_085EEBA4:: .string "sticky$" + +gUnknown_085EEBAB:: .string "pointy$" gText_RentalPkmn2:: @ 85EEBB2 |