summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2019-08-04 15:23:09 -0700
committerultima-soul <akshayjhanji@hotmail.com>2019-08-04 15:23:09 -0700
commited90bf2430290853bd9376d53c70055fa07634be (patch)
tree39f67b5cbd0c0ef9e1a4763a052fd07924349940 /data
parentbbc7c6ccfc7d59f61f406849f752fdd5038a6a80 (diff)
parentd58bf398b2b83a326d23d14d531de7f45a1058bb (diff)
Merge branch 'master' into pokedex_2
Diffstat (limited to 'data')
-rw-r--r--data/data_83F5738.s123
-rw-r--r--data/field_map_obj.s8
-rw-r--r--data/field_weather.s3
-rw-r--r--data/graphics.s45
-rw-r--r--data/graphics/title_screen/unk_83BF58C.pngbin0 -> 78 bytes
-rw-r--r--data/graphics/title_screen/unk_83BF5A8.bin1
-rw-r--r--data/graphics/title_screen/unk_83bf64c.pngbin0 -> 188 bytes
-rw-r--r--data/graphics/title_screen/unk_83bf77c.pal19
-rw-r--r--data/graphics/title_screen/unk_83bf79c.pngbin0 -> 539 bytes
-rw-r--r--data/graphics/title_screen/unk_83bfa14.pngbin0 -> 150 bytes
-rw-r--r--data/slot_machine.s94
-rw-r--r--data/strings.s6
-rw-r--r--data/title_screen.s34
13 files changed, 57 insertions, 276 deletions
diff --git a/data/data_83F5738.s b/data/data_83F5738.s
index a466ffd45..dc09b0532 100644
--- a/data/data_83F5738.s
+++ b/data/data_83F5738.s
@@ -133,128 +133,7 @@ gUnknown_83F846D:: @ 83F846D
gUnknown_83F847D:: @ 83F847D
.incbin "baserom.gba", 0x3F847D, 0x323
-gUnknown_83F87A0:: @ 83F87A0
- .incbin "baserom.gba", 0x3F87A0, 0x580
-
-gUnknown_83F8D20:: @ 83F8D20
- .incbin "baserom.gba", 0x3F8D20, 0x240
-
-gUnknown_83F8F60:: @ 83F8F60
- .incbin "baserom.gba", 0x3F8F60, 0x11E0
-
-gUnknown_83FA140:: @ 83FA140
- .incbin "baserom.gba", 0x3FA140, 0x1E0
-
-gUnknown_83FA320:: @ 83FA320
- .incbin "baserom.gba", 0x3FA320, 0x48
-
-gUnknown_83FA368:: @ 83FA368
- .incbin "baserom.gba", 0x3FA368, 0x48
-
-gUnknown_83FA3B0:: @ 83FA3B0
- .incbin "baserom.gba", 0x3FA3B0, 0x10
-
-gUnknown_83FA3C0:: @ 83FA3C0
- .incbin "baserom.gba", 0x3FA3C0, 0xC
-
-gUnknown_83FA3CC:: @ 83FA3CC
- .incbin "baserom.gba", 0x3FA3CC, 0x8
-
-gUnknown_83FA3D4:: @ 83FA3D4
- .incbin "baserom.gba", 0x3FA3D4, 0x8
-
-gUnknown_83FA3DC:: @ 83FA3DC
- .incbin "baserom.gba", 0x3FA3DC, 0x18
-
-gUnknown_83FA3F4:: @ 83FA3F4
- .incbin "baserom.gba", 0x3FA3F4, 0xC
-
-gUnknown_83FA400:: @ 83FA400
- .incbin "baserom.gba", 0x3FA400, 0x4
-
-gUnknown_83FA404:: @ 83FA404
- .incbin "baserom.gba", 0x3FA404, 0xA
-
-gUnknown_83FA40E:: @ 83FA40E
- .incbin "baserom.gba", 0x3FA40E, 0x6
-
-gUnknown_83FA414:: @ 83FA414
- .incbin "baserom.gba", 0x3FA414, 0x1C
-
-gUnknown_83FA430:: @ 83FA430
- .incbin "baserom.gba", 0x3FA430, 0x8
-
-gUnknown_83FA438:: @ 83FA438
- .incbin "baserom.gba", 0x3FA438, 0xC
-
-gUnknown_83FA444:: @ 83FA444
- .incbin "baserom.gba", 0x3FA444, 0x20
-
-gUnknown_83FA464:: @ 83FA464
- .incbin "baserom.gba", 0x3FA464, 0x8
-
-gUnknown_83FA46C:: @ 83FA46C
- .incbin "baserom.gba", 0x3FA46C, 0x28
-
-gUnknown_83FA494:: @ 83FA494
- .incbin "baserom.gba", 0x3FA494, 0x6
-
-gUnknown_83FA49A:: @ 83FA49A
- .incbin "baserom.gba", 0x3FA49A, 0x14
-
-gUnknown_83FA4AE:: @ 83FA4AE
- .incbin "baserom.gba", 0x3FA4AE, 0x16
-
-gUnknown_83FA4C4:: @ 83FA4C4
- .incbin "baserom.gba", 0x3FA4C4, 0x1C
-
-gUnknown_83FA4E0:: @ 83FA4E0
- .incbin "baserom.gba", 0x3FA4E0, 0x4
-
-gUnknown_83FA4E4:: @ 83FA4E4
- .incbin "baserom.gba", 0x3FA4E4, 0x4
-
-gUnknown_83FA4E8:: @ 83FA4E8
- .incbin "baserom.gba", 0x3FA4E8, 0xC
-
-gUnknown_83FA4F4:: @ 83FA4F4
- .incbin "baserom.gba", 0x3FA4F4, 0x14
-
-gUnknown_83FA508:: @ 83FA508
- .incbin "baserom.gba", 0x3FA508, 0xC
-
-gUnknown_83FA514:: @ 83FA514
- .incbin "baserom.gba", 0x3FA514, 0xC
-
-gUnknown_83FA520:: @ 83FA520
- .incbin "baserom.gba", 0x3FA520, 0x14
-
-gUnknown_83FA534:: @ 83FA534
- .incbin "baserom.gba", 0x3FA534, 0x46
-
-gUnknown_83FA57A:: @ 83FA57A
- .incbin "baserom.gba", 0x3FA57A, 0xE
-
-gUnknown_83FA588:: @ 83FA588
- .incbin "baserom.gba", 0x3FA588, 0x44
-
-gUnknown_83FA5CC:: @ 83FA5CC
- .incbin "baserom.gba", 0x3FA5CC, 0x6C
-
-gUnknown_83FA638:: @ 83FA638
- .incbin "baserom.gba", 0x3FA638, 0x108
-
-gUnknown_83FA740:: @ 83FA740
- .incbin "baserom.gba", 0x3FA740, 0x14
-
-gUnknown_83FA754:: @ 83FA754
- .incbin "baserom.gba", 0x3FA754, 0x30
-
-gUnknown_83FA784:: @ 83FA784
- .incbin "baserom.gba", 0x3FA784, 0x4B0
-
-gUnknown_83FAC34:: @ 83FAC34
- .incbin "baserom.gba", 0x3FAC34, 0x500
+ .section .rodata.83FB134
gUnknown_83FB134:: @ 83FB134
.incbin "baserom.gba", 0x3FB134, 0xA80
diff --git a/data/field_map_obj.s b/data/field_map_obj.s
index d12de7aa9..72d20cd4e 100644
--- a/data/field_map_obj.s
+++ b/data/field_map_obj.s
@@ -31,7 +31,13 @@ gUnknown_83A0010:: @ 83A0010
.incbin "baserom.gba", 0x3A0010, 0x3688
gUnknown_83A3698:: @ 83A3698
- .incbin "baserom.gba", 0x3A3698, 0x1AC0
+ .incbin "baserom.gba", 0x3A3698, 0x80
+
+gEventObjectBaseOam_32x32:: @ 83A3718
+ .incbin "baserom.gba", 0x3A3718, 0x8
+
+gUnknown_83A3720:: @ 83A3720
+ .incbin "baserom.gba", 0x3A3720, 0x1a38
gUnknown_83A5158:: @ 83A5158
.incbin "baserom.gba", 0x3A5158, 0xB0
diff --git a/data/field_weather.s b/data/field_weather.s
index a25e44344..517480d9a 100644
--- a/data/field_weather.s
+++ b/data/field_weather.s
@@ -1,6 +1,9 @@
.section .rodata
.align 2
+gUnknown_83BFBE4:: @ 83BFBE4
+ .incbin "baserom.gba", 0x3BFBE4, 0x2FD8
+
gUnknown_83C2BBC:: @ 83C2BBC
.incbin "baserom.gba", 0x3C2BBC, 0x4
diff --git a/data/graphics.s b/data/graphics.s
index 83d14001d..4b00c1c4b 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16352,38 +16352,39 @@ gUnknown_8EAAB98:: @ 8EAAB98
gUnknown_8EAB30C:: @ 8EAB30C
.incbin "baserom.gba", 0xEAB30C, 0x3B8
-gUnknown_8EAB6C4:: @ 8EAB6C4
- .incbin "baserom.gba", 0xEAB6C4, 0x200 @UNKNOWN
+ @ title_screen
+gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4
+ .incbin "graphics/title_screen/unk_8eab6c4.gbapal"
-gUnknown_8EAB8C4:: @ 8EAB8C4
- .incbin "baserom.gba", 0xEAB8C4, 0x1ACC
+gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4
+ .incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz"
-gUnknown_8EAD390:: @ 8EAD390
- .incbin "baserom.gba", 0xEAD390, 0x258
+gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390
+ .incbin "graphics/title_screen/unk_8ead390.bin.lz"
-gUnknown_8EAD5E8:: @ 8EAD5E8
- .incbin "baserom.gba", 0xEAD5E8, 0x20 @UNKNOWN
+gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8
+ .incbin "graphics/title_screen/unk_8ead5e8.gbapal"
-gUnknown_8EAD608:: @ 8EAD608
- .incbin "baserom.gba", 0xEAD608, 0x8DC
+gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608
+ .incbin "graphics/title_screen/unk_8ead608.4bpp.lz"
-gUnknown_8EADEE4:: @ 8EADEE4
- .incbin "baserom.gba", 0xEADEE4, 0x1B0
+gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4
+ .incbin "graphics/title_screen/unk_8eadee4.bin.lz"
-gUnknown_8EAE094:: @ 8EAE094
- .incbin "baserom.gba", 0xEAE094, 0x20 @UNKNOWN
+gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094
+ .incbin "graphics/title_screen/unk_8eae094.gbapal"
-gUnknown_8EAE0B4:: @ 8EAE0B4
- .incbin "baserom.gba", 0xEAE0B4, 0x2C0
+gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4
+ .incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz"
-gUnknown_8EAE374:: @ 8EAE374
- .incbin "baserom.gba", 0xEAE374, 0x114
+gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374
+ .incbin "graphics/title_screen/unk_8eae374.bin.lz"
-gUnknown_8EAE488:: @ 8EAE488
- .incbin "baserom.gba", 0xEAE488, 0x20 @UNKNOWN
+gGraphics_TitleScreen_FirePals:: @ 8EAE488
+ .incbin "graphics/title_screen/unk_8eae488.gbapal"
-gUnknown_8EAE4A8:: @ 8EAE4A8
- .incbin "baserom.gba", 0xEAE4A8, 0x80
+gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8
+ .incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz"
gUnknown_8EAE528:: @ 8EAE528
.incbin "baserom.gba", 0xEAE528, 0x20 @UNKNOWN
diff --git a/data/graphics/title_screen/unk_83BF58C.png b/data/graphics/title_screen/unk_83BF58C.png
new file mode 100644
index 000000000..895457c3c
--- /dev/null
+++ b/data/graphics/title_screen/unk_83BF58C.png
Binary files differ
diff --git a/data/graphics/title_screen/unk_83BF5A8.bin b/data/graphics/title_screen/unk_83BF5A8.bin
new file mode 100644
index 000000000..375fbeb7a
--- /dev/null
+++ b/data/graphics/title_screen/unk_83BF5A8.bin
@@ -0,0 +1 @@
+àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà \ No newline at end of file
diff --git a/data/graphics/title_screen/unk_83bf64c.png b/data/graphics/title_screen/unk_83bf64c.png
new file mode 100644
index 000000000..260e00a01
--- /dev/null
+++ b/data/graphics/title_screen/unk_83bf64c.png
Binary files differ
diff --git a/data/graphics/title_screen/unk_83bf77c.pal b/data/graphics/title_screen/unk_83bf77c.pal
new file mode 100644
index 000000000..815547f37
--- /dev/null
+++ b/data/graphics/title_screen/unk_83bf77c.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+82 205 180
+0 0 0
+255 255 189
+255 246 139
+255 213 65
+255 172 0
+197 164 49
+115 180 139
+98 189 156
+90 197 164
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+82 205 180
diff --git a/data/graphics/title_screen/unk_83bf79c.png b/data/graphics/title_screen/unk_83bf79c.png
new file mode 100644
index 000000000..66a57a899
--- /dev/null
+++ b/data/graphics/title_screen/unk_83bf79c.png
Binary files differ
diff --git a/data/graphics/title_screen/unk_83bfa14.png b/data/graphics/title_screen/unk_83bfa14.png
new file mode 100644
index 000000000..f4f030a5b
--- /dev/null
+++ b/data/graphics/title_screen/unk_83bfa14.png
Binary files differ
diff --git a/data/slot_machine.s b/data/slot_machine.s
deleted file mode 100644
index dac396602..000000000
--- a/data/slot_machine.s
+++ /dev/null
@@ -1,94 +0,0 @@
- .section .rodata
- .align 2
-gUnknown_8464890:: @ 8464890
- .incbin "baserom.gba", 0x464890, 0x1E
-
-gUnknown_84648AE:: @ 84648AE
- .incbin "baserom.gba", 0x4648AE, 0xF
-
-gUnknown_84648BD:: @ 84648BD
- .incbin "baserom.gba", 0x4648BD, 0x15
-
-gUnknown_84648D2:: @ 84648D2
- .incbin "baserom.gba", 0x4648D2, 0x54
-
-gUnknown_8464926:: @ 8464926
- .incbin "baserom.gba", 0x464926, 0x40
-
-gUnknown_8464966:: @ 8464966
- .incbin "baserom.gba", 0x464966, 0xC4A
-
-gUnknown_84655B0:: @ 84655B0
- .incbin "baserom.gba", 0x4655B0, 0x18
-
-gUnknown_84655C8:: @ 84655C8
- .incbin "baserom.gba", 0x4655C8, 0x40
-
-gUnknown_8465608:: @ 8465608
- .incbin "baserom.gba", 0x465608, 0xE
-
-gUnknown_8465616:: @ 8465616
- .incbin "baserom.gba", 0x465616, 0xC0
-
-gUnknown_84656D6:: @ 84656D6
- .incbin "baserom.gba", 0x4656D6, 0x10E
-
-gUnknown_84657E4:: @ 84657E4
- .incbin "baserom.gba", 0x4657E4, 0x98
-
-gUnknown_846587C:: @ 846587C
- .incbin "baserom.gba", 0x46587C, 0x5C
-
-gUnknown_84658D8:: @ 84658D8
- .incbin "baserom.gba", 0x4658D8, 0x18
-
-gUnknown_84658F0:: @ 84658F0
- .incbin "baserom.gba", 0x4658F0, 0x40
-
-gUnknown_8465930:: @ 8465930
- .incbin "baserom.gba", 0x465930, 0x20
-
-gUnknown_8465950:: @ 8465950
- .incbin "baserom.gba", 0x465950, 0x80
-
-gUnknown_84659D0:: @ 84659D0
- .incbin "baserom.gba", 0x4659D0, 0x804
-
-gUnknown_84661D4:: @ 84661D4
- .incbin "baserom.gba", 0x4661D4, 0x2E8
-
-gUnknown_84664BC:: @ 84664BC
- .incbin "baserom.gba", 0x4664BC, 0x20
-
-gUnknown_84664DC:: @ 84664DC
- .incbin "baserom.gba", 0x4664DC, 0x60
-
-gUnknown_846653C:: @ 846653C
- .incbin "baserom.gba", 0x46653C, 0x84
-
-gUnknown_84665C0:: @ 84665C0
- .incbin "baserom.gba", 0x4665C0, 0x60
-
-gUnknown_8466620:: @ 8466620
- .incbin "baserom.gba", 0x466620, 0x378
-
-gUnknown_8466998:: @ 8466998
- .incbin "baserom.gba", 0x466998, 0x178
-
-gUnknown_8466B10:: @ 8466B10
- .incbin "baserom.gba", 0x466B10, 0x10
-
-gUnknown_8466B20:: @ 8466B20
- .incbin "baserom.gba", 0x466B20, 0xEC
-
-gUnknown_8466C0C:: @ 8466C0C
- .incbin "baserom.gba", 0x466C0C, 0x28
-
-gUnknown_8466C34:: @ 8466C34
- .incbin "baserom.gba", 0x466C34, 0x4
-
-gUnknown_8466C38:: @ 8466C38
- .incbin "baserom.gba", 0x466C38, 0x8
-
-gUnknown_8466C40:: @ 8466C40
- .incbin "baserom.gba", 0x466C40, 0x18
diff --git a/data/strings.s b/data/strings.s
index e1804aae0..4f6b40d85 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3067,13 +3067,13 @@ gText_HatchedFromEgg:: @ 841B6FD
gText_NickHatchPrompt:: @ 841B716
.string "Would you like to nickname the newly\nhatched {STR_VAR_1}?$"
-gUnknown_841B747:: @ 841B747
+gString_OutOfCoins:: @ 841B747
.string "You've run out of COINS.\nGame over!$"
-gUnknown_841B76B:: @ 841B76B
+gString_QuitPlaying:: @ 841B76B
.string "Quit playing?$"
-gUnknown_841B779:: @ 841B779
+gString_SlotMachineControls:: @ 841B779
.string "{KEYGFX_DPAD_LEFT_RIGHT}COMBOS {KEYGFX_DPAD_DOWN}WAGER {KEYGFX_A_BUTTON}STOP {KEYGFX_B_BUTTON}EXIT$"
gUnknown_841B798:: @ 0x841B798
diff --git a/data/title_screen.s b/data/title_screen.s
deleted file mode 100644
index 93d0f2f83..000000000
--- a/data/title_screen.s
+++ /dev/null
@@ -1,34 +0,0 @@
- .section .rodata
- .align 2
-gUnknown_83BF58C:: @ 83BF58C
- .incbin "baserom.gba", 0x3BF58C, 0x1C
-
-gUnknown_83BF5A8:: @ 83BF5A8
- .incbin "baserom.gba", 0x3BF5A8, 0x55C
-
-gUnknown_83BFB04:: @ 83BFB04
- .incbin "baserom.gba", 0x3BFB04, 0x18
-
-gUnknown_83BFB1C:: @ 83BFB1C
- .incbin "baserom.gba", 0x3BFB1C, 0x20
-
-gUnknown_83BFB3C:: @ 83BFB3C
- .incbin "baserom.gba", 0x3BFB3C, 0x20
-
-gUnknown_83BFB5C:: @ 83BFB5C
- .incbin "baserom.gba", 0x3BFB5C, 0x18
-
-gUnknown_83BFB74:: @ 83BFB74
- .incbin "baserom.gba", 0x3BFB74, 0x10
-
-gUnknown_83BFB84:: @ 83BFB84
- .incbin "baserom.gba", 0x3BFB84, 0x18
-
-gUnknown_83BFB9C:: @ 83BFB9C
- .incbin "baserom.gba", 0x3BFB9C, 0x20
-
-gUnknown_83BFBBC:: @ 83BFBBC
- .incbin "baserom.gba", 0x3BFBBC, 0x18
-
-gUnknown_83BFBD4:: @ 83BFBD4
- .incbin "baserom.gba", 0x3BFBD4, 0x2FE8