summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/items/pocket_names.asm11
-rw-r--r--data/maps/map_data.asm14
-rw-r--r--data/maps/scenes.asm67
-rw-r--r--data/maps/scripts.asm62
-rw-r--r--data/text/common_2.asm6
-rw-r--r--data/wild/bug_contest_mons.asm13
6 files changed, 170 insertions, 3 deletions
diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm
new file mode 100644
index 00000000..880e08fe
--- /dev/null
+++ b/data/items/pocket_names.asm
@@ -0,0 +1,11 @@
+ItemPocketNames:
+; entries correspond to item type constants
+ dw .Item
+ dw .Key
+ dw .Ball
+ dw .TM
+
+.Item: db "ITEM POCKET@"
+.Key: db "KEY POCKET@"
+.Ball: db "BALL POCKET@"
+.TM: db "TM POCKET@"
diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm
new file mode 100644
index 00000000..125f4474
--- /dev/null
+++ b/data/maps/map_data.asm
@@ -0,0 +1,14 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Maps", ROMX
+
+INCLUDE "data/maps/scenes.asm"
+INCLUDE "data/maps/maps.asm"
+INCLUDE "data/maps/attributes.asm"
+
+
+INCLUDE "data/maps/blocks.asm"
+
+
+INCLUDE "data/maps/scripts.asm"
diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
new file mode 100644
index 00000000..13ce4dcd
--- /dev/null
+++ b/data/maps/scenes.asm
@@ -0,0 +1,67 @@
+scene_var: MACRO
+; map, variable
+ map_id \1
+ dw \2
+ENDM
+
+MapScenes::
+ scene_var POKECENTER_2F, wPokecenter2FSceneID
+ scene_var TRADE_CENTER, wTradeCenterSceneID
+ scene_var COLOSSEUM, wColosseumSceneID
+ scene_var TIME_CAPSULE, wTimeCapsuleSceneID
+ scene_var POWER_PLANT, wPowerPlantSceneID
+ scene_var CERULEAN_GYM, wCeruleanGymSceneID
+ scene_var ROUTE_25, wRoute25SceneID
+ scene_var TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID
+ scene_var VICTORY_ROAD_GATE, wVictoryRoadGateSceneID
+ scene_var SAFFRON_MAGNET_TRAIN_STATION, wSaffronMagnetTrainStationSceneID
+ scene_var ROUTE_16_GATE, wRoute16GateSceneID
+ scene_var ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID
+ scene_var INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID
+ scene_var WILLS_ROOM, wWillsRoomSceneID
+ scene_var KOGAS_ROOM, wKogasRoomSceneID
+ scene_var BRUNOS_ROOM, wBrunosRoomSceneID
+ scene_var KARENS_ROOM, wKarensRoomSceneID
+ scene_var LANCES_ROOM, wLancesRoomSceneID
+ scene_var HALL_OF_FAME, wHallOfFameSceneID
+ scene_var ROUTE_27, wRoute27SceneID
+ scene_var NEW_BARK_TOWN, wNewBarkTownSceneID
+ scene_var ELMS_LAB, wElmsLabSceneID
+ scene_var PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID
+ scene_var ROUTE_29, wRoute29SceneID
+ scene_var CHERRYGROVE_CITY, wCherrygroveCitySceneID
+ scene_var MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID
+ scene_var ROUTE_32, wRoute32SceneID
+ scene_var ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateSceneID
+ scene_var ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateSceneID
+ scene_var AZALEA_TOWN, wAzaleaTownSceneID
+ scene_var GOLDENROD_GYM, wGoldenrodGymSceneID
+ scene_var GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID
+ scene_var OLIVINE_CITY, wOlivineCitySceneID
+ scene_var ROUTE_34, wRoute34SceneID ; unused
+ scene_var ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID
+ scene_var ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID
+ scene_var MAHOGANY_TOWN, wMahoganyTownSceneID
+ scene_var ROUTE_43_GATE, wRoute43GateSceneID
+ scene_var MOUNT_MOON, wMountMoonSceneID
+ scene_var SPROUT_TOWER_3F, wSproutTower3FSceneID
+ scene_var BURNED_TOWER_1F, wBurnedTower1FSceneID
+ scene_var BURNED_TOWER_B1F, wBurnedTowerB1FSceneID
+ scene_var RADIO_TOWER_5F, wRadioTower5FSceneID
+ scene_var RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideSceneID
+ scene_var RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterSceneID
+ scene_var RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberSceneID
+ scene_var MAHOGANY_MART_1F, wMahoganyMart1FSceneID
+ scene_var TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID
+ scene_var TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID
+ scene_var TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID
+ scene_var GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
+ scene_var SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID ; unused
+ scene_var VICTORY_ROAD, wVictoryRoadSceneID
+ scene_var DRAGONS_DEN_B1F, wDragonsDenB1FSceneID
+ scene_var OLIVINE_PORT, wOlivinePortSceneID
+ scene_var VERMILION_PORT, wVermilionPortSceneID
+ scene_var FAST_SHIP_1F, wFastShip1FSceneID
+ scene_var FAST_SHIP_B1F, wFastShipB1FSceneID
+ scene_var MOUNT_MOON_SQUARE, wMountMoonSquareSceneID
+ db -1 ; end
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index 160ef64e..54c71ab9 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -1,4 +1,5 @@
SECTION "Map Scripts 1", ROMX
+
INCLUDE "maps/SproutTower1F.asm"
INCLUDE "maps/SproutTower2F.asm"
INCLUDE "maps/SproutTower3F.asm"
@@ -22,7 +23,9 @@ INCLUDE "maps/SafariZoneFuchsiaGateBeta.asm"
INCLUDE "maps/SafariZoneBeta.asm"
INCLUDE "maps/VictoryRoad.asm"
+
SECTION "Map Scripts 2", ROMX
+
INCLUDE "maps/NationalPark.asm"
INCLUDE "maps/NationalParkBugContest.asm"
INCLUDE "maps/RadioTower1F.asm"
@@ -31,7 +34,9 @@ INCLUDE "maps/RadioTower3F.asm"
INCLUDE "maps/RadioTower4F.asm"
INCLUDE "maps/RadioTower5F.asm"
+
SECTION "Map Scripts 3", ROMX
+
INCLUDE "maps/RuinsOfAlphOutside.asm"
INCLUDE "maps/RuinsOfAlphHoOhChamber.asm"
INCLUDE "maps/RuinsOfAlphKabutoChamber.asm"
@@ -51,14 +56,18 @@ INCLUDE "maps/OlivineLighthouse4F.asm"
INCLUDE "maps/OlivineLighthouse5F.asm"
INCLUDE "maps/OlivineLighthouse6F.asm"
+
SECTION "Map Scripts 4", ROMX
+
INCLUDE "maps/MahoganyMart1F.asm"
INCLUDE "maps/TeamRocketBaseB1F.asm"
INCLUDE "maps/TeamRocketBaseB2F.asm"
INCLUDE "maps/TeamRocketBaseB3F.asm"
INCLUDE "maps/IlexForest.asm"
+
SECTION "Map Scripts 5", ROMX
+
INCLUDE "maps/GoldenrodUnderground.asm"
INCLUDE "maps/GoldenrodUndergroundSwitchRoomEntrances.asm"
INCLUDE "maps/GoldenrodDeptStoreB1F.asm"
@@ -73,7 +82,9 @@ INCLUDE "maps/IcePathB2FMahoganySide.asm"
INCLUDE "maps/IcePathB2FBlackthornSide.asm"
INCLUDE "maps/IcePathB3F.asm"
+
SECTION "Map Scripts 6", ROMX
+
INCLUDE "maps/WhirlIslandNW.asm"
INCLUDE "maps/WhirlIslandNE.asm"
INCLUDE "maps/WhirlIslandSW.asm"
@@ -92,7 +103,9 @@ INCLUDE "maps/DragonsDen1F.asm"
INCLUDE "maps/DragonsDenB1F.asm"
INCLUDE "maps/TohjoFalls.asm"
+
SECTION "Map Scripts 7", ROMX
+
INCLUDE "maps/NewBarkTown.asm"
INCLUDE "maps/CherrygroveCity.asm"
INCLUDE "maps/VioletCity.asm"
@@ -100,7 +113,9 @@ INCLUDE "maps/AzaleaTown.asm"
INCLUDE "maps/CianwoodCity.asm"
INCLUDE "maps/GoldenrodCity.asm"
+
SECTION "Map Scripts 8", ROMX
+
INCLUDE "maps/OlivineCity.asm"
INCLUDE "maps/EcruteakCity.asm"
INCLUDE "maps/MahoganyTown.asm"
@@ -108,7 +123,9 @@ INCLUDE "maps/LakeOfRage.asm"
INCLUDE "maps/BlackthornCity.asm"
INCLUDE "maps/SilverCaveOutside.asm"
+
SECTION "Map Scripts 9", ROMX
+
INCLUDE "maps/Route26.asm"
INCLUDE "maps/Route27.asm"
INCLUDE "maps/Route28.asm"
@@ -116,14 +133,18 @@ INCLUDE "maps/Route29.asm"
INCLUDE "maps/Route30.asm"
INCLUDE "maps/Route31.asm"
+
SECTION "Map Scripts 10", ROMX
+
INCLUDE "maps/Route32.asm"
INCLUDE "maps/Route33.asm"
INCLUDE "maps/Route34.asm"
INCLUDE "maps/Route35.asm"
INCLUDE "maps/Route36.asm"
+
SECTION "Map Scripts 11", ROMX
+
INCLUDE "maps/Route37.asm"
INCLUDE "maps/Route38.asm"
INCLUDE "maps/Route39.asm"
@@ -131,7 +152,9 @@ INCLUDE "maps/Route40.asm"
INCLUDE "maps/Route41.asm"
INCLUDE "maps/Route42.asm"
+
SECTION "Map Scripts 12", ROMX
+
INCLUDE "maps/Route43.asm"
INCLUDE "maps/Route44.asm"
INCLUDE "maps/Route45.asm"
@@ -139,7 +162,9 @@ INCLUDE "maps/Route46.asm"
INCLUDE "maps/PewterCity.asm"
INCLUDE "maps/Route2.asm"
+
SECTION "Map Scripts 13", ROMX
+
INCLUDE "maps/ViridianCity.asm"
INCLUDE "maps/Route22.asm"
INCLUDE "maps/Route1.asm"
@@ -155,7 +180,9 @@ INCLUDE "maps/Route16.asm"
INCLUDE "maps/CeladonCity.asm"
INCLUDE "maps/Route7.asm"
+
SECTION "Map Scripts 14", ROMX
+
INCLUDE "maps/Route15.asm"
INCLUDE "maps/Route14.asm"
INCLUDE "maps/Route13.asm"
@@ -168,7 +195,9 @@ INCLUDE "maps/SaffronCity.asm"
INCLUDE "maps/Route5.asm"
INCLUDE "maps/CeruleanCity.asm"
+
SECTION "Map Scripts 15", ROMX
+
INCLUDE "maps/Route9.asm"
INCLUDE "maps/Route24.asm"
INCLUDE "maps/Route25.asm"
@@ -179,7 +208,9 @@ INCLUDE "maps/Route10North.asm"
INCLUDE "maps/Route10South.asm"
INCLUDE "maps/Route23.asm"
+
SECTION "Map Scripts 16", ROMX
+
INCLUDE "maps/OlivinePokecenter1F.asm"
INCLUDE "maps/OlivineGym.asm"
INCLUDE "maps/OlivineTimsHouse.asm"
@@ -196,7 +227,9 @@ INCLUDE "maps/MahoganyGym.asm"
INCLUDE "maps/MahoganyPokecenter1F.asm"
INCLUDE "maps/Route42EcruteakGate.asm"
+
SECTION "Map Scripts 17", ROMX
+
INCLUDE "maps/EcruteakTinTowerEntrance.asm"
INCLUDE "maps/WiseTriosRoom.asm"
INCLUDE "maps/EcruteakPokecenter1F.asm"
@@ -206,7 +239,9 @@ INCLUDE "maps/EcruteakMart.asm"
INCLUDE "maps/EcruteakGym.asm"
INCLUDE "maps/EcruteakItemfinderHouse.asm"
+
SECTION "Map Scripts 18", ROMX
+
INCLUDE "maps/BlackthornGym1F.asm"
INCLUDE "maps/BlackthornGym2F.asm"
INCLUDE "maps/BlackthornDragonSpeechHouse.asm"
@@ -223,7 +258,9 @@ INCLUDE "maps/LakeOfRageMagikarpHouse.asm"
INCLUDE "maps/Route43MahoganyGate.asm"
INCLUDE "maps/Route43Gate.asm"
+
SECTION "Map Scripts 19", ROMX
+
INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm"
INCLUDE "maps/CeruleanPoliceStation.asm"
INCLUDE "maps/CeruleanTradeSpeechHouse.asm"
@@ -236,14 +273,18 @@ INCLUDE "maps/Route10Pokecenter2FBeta.asm"
INCLUDE "maps/PowerPlant.asm"
INCLUDE "maps/BillsHouse.asm"
+
SECTION "Map Scripts 20", ROMX
+
INCLUDE "maps/AzaleaPokecenter1F.asm"
INCLUDE "maps/CharcoalKiln.asm"
INCLUDE "maps/AzaleaMart.asm"
INCLUDE "maps/KurtsHouse.asm"
INCLUDE "maps/AzaleaGym.asm"
+
SECTION "Map Scripts 21", ROMX
+
INCLUDE "maps/VioletMart.asm"
INCLUDE "maps/VioletGym.asm"
INCLUDE "maps/EarlsPokemonAcademy.asm"
@@ -257,6 +298,7 @@ INCLUDE "maps/Route35NationalParkGate.asm"
INCLUDE "maps/Route36RuinsOfAlphGate.asm"
INCLUDE "maps/Route36NationalParkGate.asm"
+
SECTION "Map Scripts 22", ROMX
INCLUDE "maps/GoldenrodGym.asm"
@@ -280,7 +322,9 @@ INCLUDE "maps/IlexForestAzaleaGate.asm"
INCLUDE "maps/Route34IlexForestGate.asm"
INCLUDE "maps/DayCare.asm"
+
SECTION "Map Scripts 23", ROMX
+
INCLUDE "maps/VermilionFishingSpeechHouse.asm"
INCLUDE "maps/VermilionPokecenter1F.asm"
INCLUDE "maps/VermilionPokecenter2FBeta.asm"
@@ -296,7 +340,9 @@ INCLUDE "maps/RedsHouse2F.asm"
INCLUDE "maps/BluesHouse.asm"
INCLUDE "maps/OaksLab.asm"
+
SECTION "Map Scripts 24", ROMX
+
INCLUDE "maps/PewterNidoranSpeechHouse.asm"
INCLUDE "maps/PewterGym.asm"
INCLUDE "maps/PewterMart.asm"
@@ -311,7 +357,9 @@ INCLUDE "maps/KarensRoom.asm"
INCLUDE "maps/LancesRoom.asm"
INCLUDE "maps/HallOfFame.asm"
+
SECTION "Map Scripts 25", ROMX
+
INCLUDE "maps/OlivinePort.asm"
INCLUDE "maps/VermilionPort.asm"
INCLUDE "maps/FastShip1F.asm"
@@ -325,7 +373,9 @@ INCLUDE "maps/MountMoonSquare.asm"
INCLUDE "maps/MountMoonGiftShop.asm"
INCLUDE "maps/TinTowerRoof.asm"
+
SECTION "Map Scripts 26", ROMX
+
INCLUDE "maps/FuchsiaMart.asm"
INCLUDE "maps/SafariZoneMainOffice.asm"
INCLUDE "maps/FuchsiaGym.asm"
@@ -341,7 +391,9 @@ INCLUDE "maps/TradeCenter.asm"
INCLUDE "maps/Colosseum.asm"
INCLUDE "maps/TimeCapsule.asm"
+
SECTION "Map Scripts 27", ROMX
+
INCLUDE "maps/LavenderPokecenter1F.asm"
INCLUDE "maps/LavenderPokecenter2FBeta.asm"
INCLUDE "maps/MrFujisHouse.asm"
@@ -359,7 +411,9 @@ INCLUDE "maps/CianwoodPharmacy.asm"
INCLUDE "maps/CianwoodPhotoStudio.asm"
INCLUDE "maps/CianwoodLugiaSpeechHouse.asm"
+
SECTION "Map Scripts 28", ROMX
+
INCLUDE "maps/CeladonDeptStore1F.asm"
INCLUDE "maps/CeladonDeptStore2F.asm"
INCLUDE "maps/CeladonDeptStore3F.asm"
@@ -383,7 +437,9 @@ INCLUDE "maps/Route16Gate.asm"
INCLUDE "maps/Route7SaffronGate.asm"
INCLUDE "maps/Route17Route18Gate.asm"
+
SECTION "Map Scripts 29", ROMX
+
INCLUDE "maps/ViridianGym.asm"
INCLUDE "maps/ViridianNicknameSpeechHouse.asm"
INCLUDE "maps/TrainerHouse1F.asm"
@@ -395,7 +451,9 @@ INCLUDE "maps/Route2NuggetHouse.asm"
INCLUDE "maps/Route2Gate.asm"
INCLUDE "maps/VictoryRoadGate.asm"
+
SECTION "Map Scripts 30", ROMX
+
INCLUDE "maps/ElmsLab.asm"
INCLUDE "maps/PlayersHouse1F.asm"
INCLUDE "maps/PlayersHouse2F.asm"
@@ -406,7 +464,9 @@ INCLUDE "maps/DayOfWeekSiblingsHouse.asm"
INCLUDE "maps/Route27SandstormHouse.asm"
INCLUDE "maps/Route29Route46Gate.asm"
+
SECTION "Map Scripts 31", ROMX
+
INCLUDE "maps/FightingDojo.asm"
INCLUDE "maps/SaffronGym.asm"
INCLUDE "maps/SaffronMart.asm"
@@ -421,7 +481,9 @@ INCLUDE "maps/Route5UndergroundPathEntrance.asm"
INCLUDE "maps/Route5SaffronGate.asm"
INCLUDE "maps/Route5CleanseTagHouse.asm"
+
SECTION "Map Scripts 32", ROMX
+
INCLUDE "maps/CherrygroveMart.asm"
INCLUDE "maps/CherrygrovePokecenter1F.asm"
INCLUDE "maps/CherrygroveGymSpeechHouse.asm"
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index d82fdccd..78c3d703 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -1331,14 +1331,14 @@ _CoordinatesEventText::
text "Coordinates event"
done
-UnknownText_0x1c4719::
+_ReceivedItemText::
text "<PLAYER> received"
line "@"
text_ram wStringBuffer4
text "."
done
-UnknownText_0x1c472c::
+_PutItemInPocketText::
text "<PLAYER> put the"
line "@"
text_ram wStringBuffer1
@@ -1348,7 +1348,7 @@ UnknownText_0x1c472c::
text "."
prompt
-UnknownText_0x1c474b::
+_PocketIsFullText::
text "The @"
text_ram wStringBuffer3
text_start
diff --git a/data/wild/bug_contest_mons.asm b/data/wild/bug_contest_mons.asm
new file mode 100644
index 00000000..79712703
--- /dev/null
+++ b/data/wild/bug_contest_mons.asm
@@ -0,0 +1,13 @@
+ContestMons:
+ ; %, species, min, max
+ db 20, CATERPIE, 7, 18
+ db 20, WEEDLE, 7, 18
+ db 10, METAPOD, 9, 18
+ db 10, KAKUNA, 9, 18
+ db 5, BUTTERFREE, 12, 15
+ db 5, BEEDRILL, 12, 15
+ db 10, VENONAT, 10, 16
+ db 10, PARAS, 10, 17
+ db 5, SCYTHER, 13, 14
+ db 5, PINSIR, 13, 14
+ db -1, VENOMOTH, 30, 40
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 08:07:52 +0000