summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/main_menu.s141
-rw-r--r--data/party_menu.s2
-rw-r--r--data/text/birch_speech.inc18
3 files changed, 10 insertions, 151 deletions
diff --git a/data/main_menu.s b/data/main_menu.s
deleted file mode 100644
index 019fdfab8..000000000
--- a/data/main_menu.s
+++ /dev/null
@@ -1,141 +0,0 @@
-@ the second big chunk of data
-
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_082FECFC:: @ 82FECFC
- .incbin "graphics/birch_speech/bg0.gbapal"
- .incbin "graphics/birch_speech/bg1.gbapal"
-
- .align 2
-gBirchIntroShadowGfx:: @ 82FED3C
- .incbin "graphics/birch_speech/shadow.4bpp.lz"
-
- .align 2
-gUnknown_082FEEF0:: @ 82FEEF0
- .incbin "graphics/birch_speech/map.bin.lz"
-
- .align 2
-gUnknown_082FF018:: @ 82FF018
- .incbin "graphics/birch_speech/bg2.gbapal"
-
- .align 2
-gUnknown_082FF028:: @ 82FF028
- .space 16
-
- .align 2
-gUnknown_082FF038:: @ 82FF038
- window_template 0x00, 0x02, 0x01, 0x1a, 0x02, 0x0f, 0x0001
- window_template 0x00, 0x02, 0x05, 0x1a, 0x02, 0x0f, 0x0035
-
- .align 2
-gUnknown_082FF048:: @ 82FF048
- window_template 0x00, 0x02, 0x01, 0x1a, 0x06, 0x0f, 0x0001
- window_template 0x00, 0x02, 0x09, 0x1a, 0x02, 0x0f, 0x009d
- window_template 0x00, 0x02, 0x0d, 0x1a, 0x02, 0x0f, 0x00d1
- window_template 0x00, 0x02, 0x11, 0x1a, 0x02, 0x0f, 0x0105
- window_template 0x00, 0x02, 0x15, 0x1a, 0x02, 0x0f, 0x0139
-
- .align 2
-gUnknown_082FF070:: @ 82FF070
- window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x016d
- null_window_template
-
- .align 2
-gUnknown_082FF080:: @ 82FF080
- window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0001
-
- .align 2
-gUnknown_082FF088:: @ 82FF088
- window_template 0x00, 0x03, 0x05, 0x06, 0x04, 0x0f, 0x006d
- window_template 0x00, 0x03, 0x02, 0x09, 0x0a, 0x0f, 0x0085
- null_window_template
-
- .align 2
-gMainMenuBgPal:: @ 82FF0A0
- .incbin "graphics/misc/main_menu_bg.gbapal"
-
- .align 2
-gMainMenuTextPal:: @ 82FF0C0
- .incbin "graphics/misc/main_menu_text.gbapal"
-
- .align 2
-gUnknown_082FF0E0:: @ 82FF0E0
- .byte 0x0a, 0x0b, 0x0c
-
-gUnknown_082FF0E3:: @ 82FF0E3
- .byte 0x0a, 0x01, 0x0c
-
- .align 2
-gUnknown_082FF0E8:: @ 82FF0E8
- .4byte 0x000001e8, 0x00003071
-
- .align 2
-gUnknown_082FF0F0:: @ 82FF0F0
- .4byte 0x000001ec
-
- .align 2
-gUnknown_082FF0F4:: @ 82FF0F4
- .byte 0x02, 0x78, 0x08, 0x03, 0x78, 0x98, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_082FF104:: @ 82FF104
- .2byte 0xfffe, 0xfffe, 0x3000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF114:: @ 82FF114
- .4byte gUnknown_082FF104
-
- .align 2
-gUnknown_082FF118:: @ 82FF118
- .4byte gText_BirchBoy, 0x00000000
- .4byte gText_BirchGirl, 0x00000000
-
- .align 2
-gMalePresetNames:: @ 82FF128
- .4byte gText_DefaultNameStu
- .4byte gText_DefaultNameMilton
- .4byte gText_DefaultNameTom
- .4byte gText_DefaultNameKenny
- .4byte gText_DefaultNameReid
- .4byte gText_DefaultNameJude
- .4byte gText_DefaultNameJaxson
- .4byte gText_DefaultNameEaston
- .4byte gText_DefaultNameWalker
- .4byte gText_DefaultNameTeru
- .4byte gText_DefaultNameJohnny
- .4byte gText_DefaultNameBrett
- .4byte gText_DefaultNameSeth
- .4byte gText_DefaultNameTerry
- .4byte gText_DefaultNameCasey
- .4byte gText_DefaultNameDarren
- .4byte gText_DefaultNameLandon
- .4byte gText_DefaultNameCollin
- .4byte gText_DefaultNameStanley
- .4byte gText_DefaultNameQuincy
-
- .align 2
-gFemalePresetNames:: @ 82FF178
- .4byte gText_DefaultNameKimmy
- .4byte gText_DefaultNameTiara
- .4byte gText_DefaultNameBella
- .4byte gText_DefaultNameJayla
- .4byte gText_DefaultNameAllie
- .4byte gText_DefaultNameLianna
- .4byte gText_DefaultNameSara
- .4byte gText_DefaultNameMonica
- .4byte gText_DefaultNameCamila
- .4byte gText_DefaultNameAubree
- .4byte gText_DefaultNameRuthie
- .4byte gText_DefaultNameHazel
- .4byte gText_DefaultNameNadine
- .4byte gText_DefaultNameTanja
- .4byte gText_DefaultNameYasmin
- .4byte gText_DefaultNameNicola
- .4byte gText_DefaultNameLillie
- .4byte gText_DefaultNameTerra
- .4byte gText_DefaultNameLucy
- .4byte gText_DefaultNameHalie
diff --git a/data/party_menu.s b/data/party_menu.s
index 1319ce5d8..9eae24ab9 100644
--- a/data/party_menu.s
+++ b/data/party_menu.s
@@ -434,7 +434,7 @@ gUnknown_08615D9C:: @ 8615D9C
.4byte sub_80D3718, 0x00000007
.4byte SetUpFieldMove_Flash, 0x0000000d
.4byte sub_8135654, 0x0000000d
- .4byte hm_prepare_rocksmash, 0x0000000d
+ .4byte SetUpFieldMove_Strength, 0x0000000d
.4byte sub_81B5820, 0x00000008
.4byte sub_81B5884, 0x0000000d
.4byte sub_81B5974, 0x0000000d
diff --git a/data/text/birch_speech.inc b/data/text/birch_speech.inc
index 9e7eea3bc..1dfc0242b 100644
--- a/data/text/birch_speech.inc
+++ b/data/text/birch_speech.inc
@@ -1,4 +1,4 @@
-gUnknown_082C897B:: @ 82C897B
+gText_Birch_Welcome:: @ 82C897B
.string "Hi! Sorry to keep you waiting!\p"
.string "Welcome to the world of POKéMON!\p"
.string "My name is BIRCH.\p"
@@ -6,12 +6,12 @@ gUnknown_082C897B:: @ 82C897B
.string "PROFESSOR.\p"
.string "$"
-gUnknown_082C89FB:: @ 82C89FB
+gText_Birch_Pokemon:: @ 82C89FB
.string "This is what we call a “POKéMON.”\p"
.string "\n"
.string "$"
-gUnknown_082C8A1F:: @ 82C8A1F
+gText_Birch_MainSpeech:: @ 82C8A1F
.string "This world is widely inhabited by\n"
.string "creatures known as POKéMON.\p"
.string "We humans live alongside POKéMON,\n"
@@ -28,28 +28,28 @@ gUnknown_082C8A1F:: @ 82C8A1F
.string "That’s what I do.\p"
.string "$"
-gUnknown_082C8BD0:: @ 82C8BD0
+gText_Birch_AndYouAre:: @ 82C8BD0
.string "And you are?$"
-gUnknown_082C8BDD:: @ 82C8BDD
+gText_Birch_BoyOrGirl:: @ 82C8BDD
.string "Are you a boy?\n"
.string "Or are you a girl?$"
-gUnknown_082C8BFF:: @ 82C8BFF
+gText_Birch_WhatsYourName:: @ 82C8BFF
.string "All right.\n"
.string "What’s your name?$"
-gUnknown_082C8C1C:: @ 82C8C1C
+gText_Birch_SoItsPlayer:: @ 82C8C1C
.string "So it’s {PLAYER}{KUN}?$"
-gUnknown_082C8C2A:: @ 82C8C2A
+gText_Birch_YourePlayer:: @ 82C8C2A
.string "Ah, okay!\p"
.string "You’re {PLAYER}{KUN} who’s moving to my\n"
.string "hometown of LITTLEROOT.\l"
.string "I get it now!\p"
.string "$"
-gUnknown_082C8C7A:: @ 82C8C7A
+gText_Birch_AreYouReady:: @ 82C8C7A
.string "All right, are you ready?\p"
.string "Your very own adventure is about\n"
.string "to unfold.\p"