Use linkerscript for bank $2e, disassemble some stuff after pics.

7 files changed, 257 insertions, 48 deletions

diff --git a/data/radio/channel_music.asm b/data/radio/channel_music.asm
new file mode 100644
index 00000000..c11360af
--- /dev/null
+++ b/data/radio/channel_music.asm
@@ -0,0 +1,12 @@
+RadioChannelSongs:
+; entries correspond to radio channel ids
+	dw MUSIC_POKEMON_TALK
+	dw MUSIC_POKEMON_CENTER
+	dw MUSIC_TITLE
+	dw MUSIC_GAME_CORNER
+	dw MUSIC_VIRIDIAN_CITY
+	dw MUSIC_BICYCLE
+	dw MUSIC_ROCKET_OVERTURE
+	dw MUSIC_POKE_FLUTE_CHANNEL
+	dw MUSIC_RUINS_OF_ALPH_RADIO
+	dw MUSIC_LAKE_OF_RAGE_ROCKET_RADIO
diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm
new file mode 100644
index 00000000..acef4bdd
--- /dev/null
+++ b/data/radio/oaks_pkmn_talk_routes.asm
@@ -0,0 +1,19 @@
+; Oak's Pokémon Talk will list wild Pokémon on these maps.
+
+OaksPKMNTalkRoutes:
+	map_id ROUTE_29
+	map_id ROUTE_46
+	map_id ROUTE_30
+	map_id ROUTE_32
+	map_id ROUTE_34
+	map_id ROUTE_35
+	map_id ROUTE_37
+	map_id ROUTE_38
+	map_id ROUTE_39
+	map_id ROUTE_42
+	map_id ROUTE_43
+	map_id ROUTE_44
+	map_id ROUTE_45
+	map_id ROUTE_36
+	map_id ROUTE_31
+.End
diff --git a/data/radio/pnp_hidden_people.asm b/data/radio/pnp_hidden_people.asm
new file mode 100644
index 00000000..5eb17857
--- /dev/null
+++ b/data/radio/pnp_hidden_people.asm
@@ -0,0 +1,26 @@
+; Places and People will not describe these trainers.
+
+PnP_HiddenPeople:
+	db WILL
+	db BRUNO
+	db KAREN
+	db KOGA
+	db CHAMPION
+	; fallthrough
+PnP_HiddenPeople_BeatE4:
+	db BROCK
+	db MISTY
+	db LT_SURGE
+	db ERIKA
+	db JANINE
+	db SABRINA
+	db BLAINE
+	db BLUE
+	; fallthrough
+PnP_HiddenPeople_BeatKanto:
+	db RIVAL1
+	db POKEMON_PROF
+	db CAL
+	db RIVAL2
+	db RED
+	db -1
diff --git a/data/radio/pnp_places.asm b/data/radio/pnp_places.asm
new file mode 100644
index 00000000..540078ef
--- /dev/null
+++ b/data/radio/pnp_places.asm
@@ -0,0 +1,13 @@
+; Places and People will describe the landmarks of these maps.
+
+PnP_Places:
+	map_id PALLET_TOWN                 ; PALLET_TOWN
+	map_id ROUTE_22                    ; ROUTE_22
+	map_id PEWTER_CITY                 ; PEWTER_CITY
+	map_id CERULEAN_POLICE_STATION     ; CERULEAN_CITY
+	map_id ROUTE_12                    ; ROUTE_12
+	map_id ROUTE_11                    ; ROUTE_11
+	map_id ROUTE_16                    ; ROUTE_16
+	map_id ROUTE_14                    ; ROUTE_14
+	map_id CINNABAR_POKECENTER_2F_BETA ; CINNABAR_ISLAND
+.End
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index bab2855e..7cebc41e 100755
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -498,162 +498,162 @@ _OPT_MaryText1::
 	text "'s"
 	done
 
-OPT_SweetAdorably::
+_OPT_SweetAdorablyText::
 	text_start
 	line "sweet and adorably"
 	done
 
-OPT_WigglySlickly::
+_OPT_WigglySlicklyText::
 	text_start
 	line "wiggly and slickly"
 	done
 
-OPT_AptlyNamed::
+_OPT_AptlyNamedText::
 	text_start
 	line "aptly named and"
 	done
 
-OPT_UndeniablyKindOf::
+_OPT_UndeniablyKindOfText::
 	text_start
 	line "undeniably kind of"
 	done
 
-OPT_Unbearably::
+_OPT_UnbearablyText::
 	text_start
 	line "so, so unbearably"
 	done
 
-OPT_WowImpressively::
+_OPT_WowImpressivelyText::
 	text_start
 	line "wow, impressively"
 	done
 
-OPT_AlmostPoisonously::
+_OPT_AlmostPoisonouslyText::
 	text_start
 	line "almost poisonously"
 	done
 
-OPT_Sensually::
+_OPT_SensuallyText::
 	text_start
 	line "ooh, so sensually"
 	done
 
-OPT_Mischievously::
+_OPT_MischievouslyText::
 	text_start
 	line "so mischievously"
 	done
 
-OPT_Topically::
+_OPT_TopicallyText::
 	text_start
 	line "so very topically"
 	done
 
-OPT_Addictively::
+_OPT_AddictivelyText::
 	text_start
 	line "sure addictively"
 	done
 
-OPT_LooksInWater::
+_OPT_LooksInWaterText::
 	text_start
 	line "looks in water is"
 	done
 
-OPT_EvolutionMustBe::
+_OPT_EvolutionMustBeText::
 	text_start
 	line "evolution must be"
 	done
 
-OPT_Provocatively::
+_OPT_ProvocativelyText::
 	text_start
 	line "provocatively"
 	done
 
-OPT_FlippedOut::
+_OPT_FlippedOutText::
 	text_start
 	line "so flipped out and"
 	done
 
-OPT_HeartMeltingly::
+_OPT_HeartMeltinglyText::
 	text_start
 	line "heart-meltingly"
 	done
 
-OPT_Cute::
+_OPT_CuteText::
 	text_start
 	line "cute."
 	done
 
-OPT_Weird::
+_OPT_WeirdText::
 	text_start
 	line "weird."
 	done
 
-OPT_Pleasant::
+_OPT_PleasantText::
 	text_start
 	line "pleasant."
 	done
 
-OPT_BoldSortOf::
+_OPT_BoldSortOfText::
 	text_start
 	line "bold, sort of."
 	done
 
-OPT_Frightening::
+_OPT_FrighteningText::
 	text_start
 	line "frightening."
 	done
 
-OPT_SuaveDebonair::
+_OPT_SuaveDebonairText::
 	text_start
 	line "suave & debonair!"
 	done
 
-OPT_Powerful::
+_OPT_PowerfulText::
 	text_start
 	line "powerful."
 	done
 
-OPT_Exciting::
+_OPT_ExcitingText::
 	text_start
 	line "exciting."
 	done
 
-OPT_Groovy::
+_OPT_GroovyText::
 	text_start
 	line "now!"
 	done
 
-OPT_Inspiring::
+_OPT_InspiringText::
 	text_start
 	line "inspiring."
 	done
 
-OPT_Friendly::
+_OPT_FriendlyText::
 	text_start
 	line "friendly."
 	done
 
-OPT_HotHotHot::
+_OPT_HotHotHotText::
 	text_start
 	line "hot, hot, hot!"
 	done
 
-OPT_Stimulating::
+_OPT_StimulatingText::
 	text_start
 	line "stimulating."
 	done
 
-OPT_Guarded::
+_OPT_GuardedText::
 	text_start
 	line "guarded."
 	done
 
-OPT_Lovely::
+_OPT_LovelyText::
 	text_start
 	line "lovely."
 	done
 
-OPT_Speedy::
+_OPT_SpeedyText::
 	text_start
 	line "speedy."
 	done
@@ -817,82 +817,82 @@ _PnP_Text4::
 	text_ram wStringBuffer1
 	db "@@"
 
-_PnP_cute::
+_PnP_CuteText::
 	text_start
 	line "is cute."
 	done
 
-_PnP_lazy::
+_PnP_LazyText::
 	text_start
 	line "is sort of lazy."
 	done
 
-_PnP_happy::
+_PnP_HappyText::
 	text_start
 	line "is always happy."
 	done
 
-_PnP_noisy::
+_PnP_NoisyText::
 	text_start
 	line "is quite noisy."
 	done
 
-_PnP_precocious::
+_PnP_PrecociousText::
 	text_start
 	line "is precocious."
 	done
 
-_PnP_bold::
+_PnP_BoldText::
 	text_start
 	line "is somewhat bold."
 	done
 
-_PnP_picky::
+_PnP_PickyText::
 	text_start
 	line "is too picky!"
 	done
 
-_PnP_sortofok::
+_PnP_SortOfOKText::
 	text_start
 	line "is sort of OK."
 	done
 
-_PnP_soso::
+_PnP_SoSoText::
 	text_start
 	line "is just so-so."
 	done
 
-_PnP_great::
+_PnP_GreatText::
 	text_start
 	line "is actually great."
 	done
 
-_PnP_mytype::
+_PnP_MyTypeText::
 	text_start
 	line "is just my type."
 	done
 
-_PnP_cool::
+_PnP_CoolText::
 	text_start
 	line "is so cool, no?"
 	done
 
-_PnP_inspiring::
+_PnP_InspiringText::
 	text_start
 	line "is inspiring!"
 	done
 
-_PnP_weird::
+_PnP_WeirdText::
 	text_start
 	line "is kind of weird."
 	done
 
-_PnP_rightforme::
+_PnP_RightForMeText::
 	text_start
 	line "is right for me?"
 	done
 
-_PnP_odd::
+_PnP_OddText::
 	text_start
 	line "is definitely odd!"
 	done
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
new file mode 100644
index 00000000..ed547b84
--- /dev/null
+++ b/data/wild/treemon_maps.asm
@@ -0,0 +1,48 @@
+treemon_map: MACRO
+	map_id \1
+	db \2 ; treemon set
+ENDM
+
+TreeMonMaps:
+	treemon_map ROUTE_26,                  TREEMON_SET_FOREST
+	treemon_map ROUTE_27,                  TREEMON_SET_FOREST
+	treemon_map ROUTE_28,                  TREEMON_SET_NONE
+	treemon_map ROUTE_29,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_30,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_31,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_32,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_33,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_34,                  TREEMON_SET_FOREST
+	treemon_map ROUTE_35,                  TREEMON_SET_FOREST
+	treemon_map ROUTE_36,                  TREEMON_SET_FOREST
+	treemon_map ROUTE_37,                  TREEMON_SET_FOREST
+	treemon_map ROUTE_38,                  TREEMON_SET_FOREST
+	treemon_map ROUTE_39,                  TREEMON_SET_FOREST
+	treemon_map ROUTE_40,                  TREEMON_SET_NONE
+	treemon_map ROUTE_41,                  TREEMON_SET_NONE
+	treemon_map ROUTE_42,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_43,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_44,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_45,                  TREEMON_SET_CANYON
+	treemon_map ROUTE_46,                  TREEMON_SET_CANYON
+	treemon_map NEW_BARK_TOWN,             TREEMON_SET_CITY
+	treemon_map CHERRYGROVE_CITY,          TREEMON_SET_NONE
+	treemon_map VIOLET_CITY,               TREEMON_SET_CITY
+	treemon_map AZALEA_TOWN,               TREEMON_SET_FOREST
+	treemon_map CIANWOOD_CITY,             TREEMON_SET_NONE
+	treemon_map GOLDENROD_CITY,            TREEMON_SET_NONE
+	treemon_map OLIVINE_CITY,              TREEMON_SET_NONE
+	treemon_map ECRUTEAK_CITY,             TREEMON_SET_CITY
+	treemon_map MAHOGANY_TOWN,             TREEMON_SET_CITY
+	treemon_map LAKE_OF_RAGE,              TREEMON_SET_FOREST
+	treemon_map BLACKTHORN_CITY,           TREEMON_SET_CITY
+	treemon_map SILVER_CAVE_OUTSIDE,       TREEMON_SET_NONE
+	treemon_map ILEX_FOREST,               TREEMON_SET_FOREST
+	db -1
+
+RockMonMaps:
+	treemon_map CIANWOOD_CITY,             TREEMON_SET_ROCK
+	treemon_map ROUTE_40,                  TREEMON_SET_ROCK
+	treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK
+	treemon_map SLOWPOKE_WELL_B1F,         TREEMON_SET_ROCK
+	db -1
diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm
new file mode 100644
index 00000000..639b4607
--- /dev/null
+++ b/data/wild/treemons.asm
@@ -0,0 +1,91 @@
+TreeMons:
+; entries correspond to TREEMON_SET_* constants
+	dw TreeMonSet_None
+	dw TreeMonSet_Forest
+	dw TreeMonSet_Canyon
+	dw TreeMonSet_Rock
+	dw TreeMonSet_Unused
+	dw TreeMonSet_None
+
+; Two tables each (common, rare).
+; Structure:
+;	db  %, species, level
+
+TreeMonSet_None:
+TreeMonSet_Unused:
+; common
+	db 50, VENONAT,    15
+	db 30, VENONAT,    15
+	db 10, ABRA,       15
+	db  5, ABRA,       15
+	db  5, VENOMOTH,   15
+	db -1
+; rare
+	db 50, VENONAT,    15
+	db 30, MAGNEMITE,  15
+	db 10, ABRA,       15
+	db  5, ABRA,       15
+	db  5, VENOMOTH,   15
+	db -1
+
+TreeMonSet_Forest:
+
+IF DEF(_GOLD)
+; common
+	db 50, CATERPIE,   10
+	db 15, CATERPIE,   10
+	db 15, METAPOD,    10
+	db 10, EXEGGCUTE,  10
+	db  5, EXEGGCUTE,  10
+	db  5, BUTTERFREE, 10
+	db -1
+; rare
+	db 50, CATERPIE,   10
+	db 15, PINECO,     10
+	db 15, PINECO,     10
+	db 10, EXEGGCUTE,  10
+	db  5, EXEGGCUTE,  10
+	db  5, BUTTERFREE, 10
+	db -1
+
+ELIF DEF(_SILVER)
+; common
+	db 50, WEEDLE,     10
+	db 15, WEEDLE,     10
+	db 15, KAKUNA,     10
+	db 10, EXEGGCUTE,  10
+	db  5, EXEGGCUTE,  10
+	db  5, BEEDRILL,   10
+	db -1
+; rare
+	db 50, WEEDLE,     10
+	db 15, PINECO,     10
+	db 15, PINECO,     10
+	db 10, EXEGGCUTE,  10
+	db  5, EXEGGCUTE,  10
+	db  5, BEEDRILL,   10
+	db -1
+ENDC
+
+TreeMonSet_Canyon:
+; common
+	db 50, SPEAROW,    10
+	db 15, SPEAROW,    10
+	db 15, SPEAROW,    10
+	db 10, AIPOM,      10
+	db  5, AIPOM,      10
+	db  5, AIPOM,      10
+	db -1
+; rare
+	db 50, SPEAROW,    10
+	db 15, HERACROSS,  10
+	db 15, HERACROSS,  10
+	db 10, AIPOM,      10
+	db  5, AIPOM,      10
+	db  5, AIPOM,      10
+	db -1
+
+TreeMonSet_Rock:
+	db 90, KRABBY,     15
+	db 10, SHUCKLE,    15
+	db -1