summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorU-Maria-PC\Maria <throwawaygolem@gmail.com>2017-07-29 11:35:23 -0400
committerU-Maria-PC\Maria <throwawaygolem@gmail.com>2017-07-29 11:35:23 -0400
commite92408af0133974a769215a83500c965f8524724 (patch)
tree9f1556b72ebb1a9f1b7f288ba4b8d23471a46608 /data
parenta9da4340a3c91553d19afdcd07355c53d5157a3e (diff)
parent8b39cdac9adb52a6e6abd03314056ee5d6003a1b (diff)
Merge branch 'master' of https://github.com/pret/pokeruby
`:Q B A B:` r A r D D C D D r
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_807B69C.s23
-rw-r--r--data/battle_scripts_1.s200
-rw-r--r--data/battle_scripts_2.s8
-rw-r--r--data/berry_tag_screen.s12
-rw-r--r--data/crc16_table.inc34
-rw-r--r--data/data2a.s (renamed from data/data2.s)775
-rw-r--r--data/data2b.s296
-rw-r--r--data/diploma.s5
-rw-r--r--data/event_scripts.s228
-rw-r--r--data/field_move_scripts.inc4
-rw-r--r--data/graphics/pokemon/icon_palette_indices.inc442
-rw-r--r--data/graphics/pokemon/icon_palette_table.inc11
-rw-r--r--data/graphics/pokemon/icon_table.inc442
-rw-r--r--data/item.s10
-rw-r--r--data/items.inc5236
-rw-r--r--data/menu_helpers.s102
-rw-r--r--data/mystery_event_script_cmd_table.s22
-rw-r--r--data/option_menu.s13
-rw-r--r--data/pokemon_icon.s92
-rw-r--r--data/record_mixing.s68
-rw-r--r--data/region_map.s259
-rw-r--r--data/region_map_locations.inc327
-rw-r--r--data/region_map_sections.inc16
-rw-r--r--data/rom_8080874.s18
-rw-r--r--data/script_funcs.s22
-rw-r--r--data/scripts/bard.inc10
-rw-r--r--data/scripts/berry_tree.inc20
-rw-r--r--data/scripts/cable_club.inc134
-rw-r--r--data/scripts/contest_hall.inc40
-rw-r--r--data/scripts/day_care.inc58
-rw-r--r--data/scripts/gabby_and_ty.inc16
-rw-r--r--data/scripts/giddy.inc8
-rw-r--r--data/scripts/hipster.inc6
-rw-r--r--data/scripts/maps/AbandonedShip_Corridors_B1F.inc2
-rw-r--r--data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc8
-rw-r--r--data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc8
-rw-r--r--data/scripts/maps/AbandonedShip_Rooms2_1F.inc4
-rw-r--r--data/scripts/maps/AncientTomb.inc2
-rw-r--r--data/scripts/maps/BattleTower_BattleRoom.inc42
-rw-r--r--data/scripts/maps/BattleTower_Elevator.inc2
-rw-r--r--data/scripts/maps/BattleTower_Lobby.inc78
-rw-r--r--data/scripts/maps/CaveOfOrigin_B4F.inc10
-rw-r--r--data/scripts/maps/DesertRuins.inc2
-rw-r--r--data/scripts/maps/DewfordTown_Hall.inc8
-rw-r--r--data/scripts/maps/EverGrandeCity_ChampionsRoom.inc2
-rw-r--r--data/scripts/maps/EverGrandeCity_DrakesRoom.inc2
-rw-r--r--data/scripts/maps/EverGrandeCity_HallOfFame.inc4
-rw-r--r--data/scripts/maps/FallarborTown_ContestLobby.inc8
-rw-r--r--data/scripts/maps/FallarborTown_House2.inc6
-rw-r--r--data/scripts/maps/FortreeCity_Gym.inc4
-rw-r--r--data/scripts/maps/FortreeCity_House1.inc10
-rw-r--r--data/scripts/maps/IslandCave.inc8
-rw-r--r--data/scripts/maps/JaggedPass.inc4
-rw-r--r--data/scripts/maps/LavaridgeTown.inc2
-rw-r--r--data/scripts/maps/LilycoveCity.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_ContestLobby.inc52
-rw-r--r--data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc4
-rw-r--r--data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc6
-rw-r--r--data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc10
-rw-r--r--data/scripts/maps/LilycoveCity_Harbor.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc14
-rw-r--r--data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc82
-rw-r--r--data/scripts/maps/LittlerootTown.inc2
-rw-r--r--data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc2
-rw-r--r--data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc6
-rw-r--r--data/scripts/maps/LittlerootTown_MaysHouse_1F.inc4
-rw-r--r--data/scripts/maps/LittlerootTown_MaysHouse_2F.inc6
-rw-r--r--data/scripts/maps/MauvilleCity_BikeShop.inc2
-rw-r--r--data/scripts/maps/MauvilleCity_GameCorner.inc24
-rw-r--r--data/scripts/maps/MauvilleCity_Gym.inc18
-rw-r--r--data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc2
-rw-r--r--data/scripts/maps/MeteorFalls_1F_2R.inc6
-rw-r--r--data/scripts/maps/MossdeepCity_GameCorner_1F.inc20
-rw-r--r--data/scripts/maps/MossdeepCity_GameCorner_B1F.inc14
-rw-r--r--data/scripts/maps/MossdeepCity_Gym.inc2
-rw-r--r--data/scripts/maps/MossdeepCity_House1.inc2
-rw-r--r--data/scripts/maps/MossdeepCity_House4.inc4
-rw-r--r--data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc2
-rw-r--r--data/scripts/maps/MtChimney.inc2
-rw-r--r--data/scripts/maps/MtChimney_CableCarStation.inc4
-rw-r--r--data/scripts/maps/MtPyre_6F.inc2
-rw-r--r--data/scripts/maps/NewMauville_Entrance.inc2
-rw-r--r--data/scripts/maps/NewMauville_Inside.inc6
-rw-r--r--data/scripts/maps/PacifidlogTown_House2.inc12
-rw-r--r--data/scripts/maps/PacifidlogTown_House3.inc10
-rw-r--r--data/scripts/maps/PacifidlogTown_House5.inc2
-rw-r--r--data/scripts/maps/PetalburgCity.inc8
-rw-r--r--data/scripts/maps/PetalburgCity_Gym.inc24
-rw-r--r--data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc2
-rw-r--r--data/scripts/maps/PetalburgWoods.inc2
-rw-r--r--data/scripts/maps/Route101.inc4
-rw-r--r--data/scripts/maps/Route102.inc2
-rw-r--r--data/scripts/maps/Route103.inc6
-rw-r--r--data/scripts/maps/Route104.inc10
-rw-r--r--data/scripts/maps/Route104_Prototype.inc2
-rw-r--r--data/scripts/maps/Route106.inc2
-rw-r--r--data/scripts/maps/Route107.inc2
-rw-r--r--data/scripts/maps/Route109.inc6
-rw-r--r--data/scripts/maps/Route110.inc18
-rw-r--r--data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc2
-rw-r--r--data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc2
-rw-r--r--data/scripts/maps/Route110_TrickHouseEnd.inc6
-rw-r--r--data/scripts/maps/Route110_TrickHouseEntrance.inc18
-rw-r--r--data/scripts/maps/Route110_TrickHousePuzzle2.inc8
-rw-r--r--data/scripts/maps/Route110_TrickHousePuzzle3.inc2
-rw-r--r--data/scripts/maps/Route110_TrickHousePuzzle6.inc4
-rw-r--r--data/scripts/maps/Route110_TrickHousePuzzle7.inc10
-rw-r--r--data/scripts/maps/Route111.inc8
-rw-r--r--data/scripts/maps/Route112.inc2
-rw-r--r--data/scripts/maps/Route112_CableCarStation.inc4
-rw-r--r--data/scripts/maps/Route113.inc4
-rw-r--r--data/scripts/maps/Route113_GlassWorkshop.inc2
-rw-r--r--data/scripts/maps/Route114.inc4
-rw-r--r--data/scripts/maps/Route115.inc6
-rw-r--r--data/scripts/maps/Route116.inc8
-rw-r--r--data/scripts/maps/Route117.inc12
-rw-r--r--data/scripts/maps/Route118.inc4
-rw-r--r--data/scripts/maps/Route119.inc6
-rw-r--r--data/scripts/maps/Route119_WeatherInstitute_1F.inc2
-rw-r--r--data/scripts/maps/Route120.inc8
-rw-r--r--data/scripts/maps/Route121.inc4
-rw-r--r--data/scripts/maps/Route121_SafariZoneEntrance.inc6
-rw-r--r--data/scripts/maps/Route123.inc8
-rw-r--r--data/scripts/maps/Route124.inc6
-rw-r--r--data/scripts/maps/Route125.inc2
-rw-r--r--data/scripts/maps/Route128.inc6
-rw-r--r--data/scripts/maps/Route130.inc2
-rw-r--r--data/scripts/maps/RustboroCity_House1.inc10
-rw-r--r--data/scripts/maps/SSTidalCorridor.inc14
-rw-r--r--data/scripts/maps/SafariZone_Southeast.inc2
-rw-r--r--data/scripts/maps/SeafloorCavern_Room9.inc12
-rw-r--r--data/scripts/maps/SealedChamber_InnerRoom.inc10
-rw-r--r--data/scripts/maps/SecretBase_YellowCave4.inc2
-rw-r--r--data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc2
-rw-r--r--data/scripts/maps/ShoalCave_LowTideInnerRoom.inc12
-rw-r--r--data/scripts/maps/ShoalCave_LowTideLowerRoom.inc2
-rw-r--r--data/scripts/maps/ShoalCave_LowTideStairsRoom.inc2
-rw-r--r--data/scripts/maps/SkyPillar_Top.inc2
-rw-r--r--data/scripts/maps/SlateportCity.inc6
-rw-r--r--data/scripts/maps/SlateportCity_ContestLobby.inc8
-rw-r--r--data/scripts/maps/SlateportCity_House1.inc16
-rw-r--r--data/scripts/maps/SlateportCity_PokemonFanClub.inc12
-rw-r--r--data/scripts/maps/SootopolisCity.inc2
-rw-r--r--data/scripts/maps/SootopolisCity_Gym_1F.inc8
-rw-r--r--data/scripts/maps/SootopolisCity_House8.inc16
-rw-r--r--data/scripts/maps/SouthernIsland_Interior.inc6
-rw-r--r--data/scripts/maps/UnknownMap_25_34.inc4
-rw-r--r--data/scripts/maps/VerdanturfTown_ContestLobby.inc8
-rw-r--r--data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc2
-rw-r--r--data/scripts/maps/VictoryRoad_1F.inc2
-rw-r--r--data/scripts/mystery_event_club.inc2
-rw-r--r--data/scripts/players_house.inc6
-rw-r--r--data/scripts/pokeblocks.inc28
-rw-r--r--data/scripts/safari_zone.inc8
-rw-r--r--data/scripts/storyteller.inc14
-rw-r--r--data/scripts/trader.inc12
-rw-r--r--data/scripts/tv.inc30
-rw-r--r--data/specials.inc693
-rw-r--r--data/task.s7
-rw-r--r--data/text/item_descriptions.inc1393
-rw-r--r--data/trader.s17
-rw-r--r--data/trainer_card.s62
-rw-r--r--data/util.s70
164 files changed, 1559 insertions, 10690 deletions
diff --git a/data/battle_anim_807B69C.s b/data/battle_anim_807B69C.s
deleted file mode 100644
index 0ed7d7cf0..000000000
--- a/data/battle_anim_807B69C.s
+++ /dev/null
@@ -1,23 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gSubspriteTable_83931B8:: @ 83931B8
- subsprite -16, -16, 2, 0, 64x64
- subsprite -16, 48, 2, 64, 64x32
- subsprite 48, -16, 2, 96, 32x64
- subsprite 48, 48, 2, 128, 32x32
-
- .align 2
-gSubspriteTables_83931D8:: @ 83931D8
- .4byte 4, gSubspriteTable_83931B8
-
- .align 2
-gSpriteTemplate_83931E0:: @ 83931E0
- spr_template 10010, 10010, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gSpriteTemplate_83931F8:: @ 83931F8
- spr_template 10136, 10136, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807B870
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index fbb0826fc..853760b4a 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -4,7 +4,7 @@
.section script_data, "aw", %progbits
-gUnknown_081D6BBC:: @ 81D6BBC
+gBattleScriptsEffectsTable:: @ 81D6BBC
.4byte MoveEffect_Hit
.4byte MoveEffect_Sleep
.4byte MoveEffect_PoisonHit
@@ -305,11 +305,11 @@ MoveEffect_Sleep: @ 81D6F81
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus TARGET, SLP, BattleScript_1D6FC4
jumpifcannotsleep BattleScript_1D6FE0
- jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
- accuracycheck BattleScript_1D83D6, 0
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed
+ accuracycheck BattleScript_ButItFailed, 0
jumpifhalverset TARGET, 32, BattleScript_1D9037
attackanimation
waitanimation
@@ -638,9 +638,9 @@ MoveEffect_Roar: @ 81D72C5
ppreduce
jumpifability TARGET, ABILITY_SUCTION_CUPS, BattleScript_1D988D
jumpifspecialstatusflag TARGET, 0x400, 0, BattleScript_1D93EC
- accuracycheck BattleScript_1D83D6, 65535
+ accuracycheck BattleScript_ButItFailed, 65535
accuracycheck BattleScript_1D6F77, 0
- forcerandomswitch BattleScript_1D83D6
+ forcerandomswitch BattleScript_ButItFailed
MoveEffect_MultiHit: @ 81D72ED
attackcanceler
@@ -707,7 +707,7 @@ MoveEffect_Conversion: @ 81D73B1
attackcanceler
attackstring
ppreduce
- changetypestoenemyattacktype BattleScript_1D83D6
+ changetypestoenemyattacktype BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_TypeTransform
@@ -737,13 +737,13 @@ MoveEffect_Toxic: @ 81D73F4
attackstring
ppreduce
jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus TARGET, PSN, BattleScript_1D7455
jumpifstatus TARGET, TOX, BattleScript_1D7455
- jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed
jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8
jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8
- accuracycheck BattleScript_1D83D6, 0
+ accuracycheck BattleScript_ButItFailed, 0
jumpifhalverset TARGET, 32, BattleScript_1D9037
attackanimation
waitanimation
@@ -810,7 +810,7 @@ MoveEffect_Ohko: @ 81D74E4
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 65535
+ accuracycheck BattleScript_ButItFailed, 65535
atk6
jumpifbyte 4, 0x2024c68, 41, BattleScript_1D6F48
koplussomethings BattleScript_1D7505
@@ -939,7 +939,7 @@ MoveEffect_FocusEnergy: @ 81D7689
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus USER, S_FOCUS_ENERGY, BattleScript_1D83D6
+ jumpifsecondarytstatus USER, S_FOCUS_ENERGY, BattleScript_ButItFailed
setincreasedcriticalchance
attackanimation
waitanimation
@@ -958,9 +958,9 @@ MoveEffect_Confuse: @ 81D76BF
attackstring
ppreduce
jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D76FE
- accuracycheck BattleScript_1D83D6, 0
+ accuracycheck BattleScript_ButItFailed, 0
jumpifhalverset TARGET, 32, BattleScript_1D9037
attackanimation
waitanimation
@@ -1041,13 +1041,13 @@ MoveEffect_Poison: @ 81D7795
attackstring
ppreduce
jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus TARGET, PSN, BattleScript_1D7455
jumpifstatus TARGET, TOX, BattleScript_1D7455
jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8
jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8
- jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
- accuracycheck BattleScript_1D83D6, 0
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed
+ accuracycheck BattleScript_ButItFailed, 0
jumpifhalverset TARGET, 32, BattleScript_1D9037
attackanimation
waitanimation
@@ -1062,12 +1062,12 @@ MoveEffect_Paralyze: @ 81D77F6
attackstring
ppreduce
jumpifability TARGET, ABILITY_LIMBER, BattleScript_1D7859
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
atk6
- jumpifbyte 4, 0x2024c68, 41, BattleScript_1D83D6
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_ButItFailed
jumpifstatus TARGET, PAR, BattleScript_1D784B
- jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
- accuracycheck BattleScript_1D83D6, 0
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed
+ accuracycheck BattleScript_ButItFailed, 0
jumpifhalverset TARGET, 32, BattleScript_1D9037
attackanimation
waitanimation
@@ -1190,9 +1190,9 @@ MoveEffect_Mimic: @ 81D7988
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
- accuracycheck BattleScript_1D83D6, 65535
- copyattack BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
+ accuracycheck BattleScript_ButItFailed, 65535
+ copyattack BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_LearnedMove2
@@ -1214,7 +1214,7 @@ MoveEffect_LeechSeed: @ 81D79C2
attackstring
pause 32
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
accuracycheck BattleScript_1D79D9, 0
BattleScript_1D79D9: @ 81D79D9
@@ -1240,8 +1240,8 @@ MoveEffect_Disable: @ 81D79FB
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 0
- disablelastusedattack BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 0
+ disablelastusedattack BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_MoveWasDisabled
@@ -1285,7 +1285,7 @@ MoveEffect_Encore: @ 81D7A5D
accuracycheck BattleScript_1D6F72, 0
attackstring
ppreduce
- setencore BattleScript_1D83D6
+ setencore BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_EncoreGot
@@ -1296,8 +1296,8 @@ MoveEffect_PainSplit: @ 81D7A79
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 65535
- painsplitdamagecalculator BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 65535
+ painsplitdamagecalculator BattleScript_ButItFailed
attackanimation
waitanimation
orword 0x2024c6c, 0x100
@@ -1315,7 +1315,7 @@ MoveEffect_Snore: @ 81D7AB0
jumpifstatus USER, SLP, BattleScript_1D7AC2
attackstring
ppreduce
- jump BattleScript_1D83D6
+ jump BattleScript_ButItFailed
BattleScript_1D7AC2: @ 81D7AC2
jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7AD6
@@ -1334,7 +1334,7 @@ MoveEffect_Conversion2: @ 81D7AEA
attackcanceler
attackstring
ppreduce
- settypetorandomresistance BattleScript_1D83D6
+ settypetorandomresistance BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_TypeTransform
@@ -1345,8 +1345,8 @@ MoveEffect_LockOn: @ 81D7AFF
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
- accuracycheck BattleScript_1D83D6, 0
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
+ accuracycheck BattleScript_ButItFailed, 0
setalwayshitflag
attackanimation
waitanimation
@@ -1358,8 +1358,8 @@ MoveEffect_Sketch: @ 81D7B21
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
- copymovepermanently BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
+ copymovepermanently BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_SketchedMove
@@ -1371,7 +1371,7 @@ MoveEffect_SleepTalk: @ 81D7B40
jumpifstatus USER, SLP, BattleScript_1D7B52
attackstring
ppreduce
- jump BattleScript_1D83D6
+ jump BattleScript_ButItFailed
BattleScript_1D7B52: @ 81D7B52
printstring BATTLE_TEXT_FastAsleep
@@ -1382,7 +1382,7 @@ BattleScript_1D7B52: @ 81D7B52
orword 0x2024c6c, 0x800
selectrandommovefromusermoves BattleScript_1D7B72
pause 64
- jump BattleScript_1D83D6
+ jump BattleScript_ButItFailed
BattleScript_1D7B72: @ 81D7B72
attackanimation
@@ -1410,8 +1410,8 @@ MoveEffect_Spite: @ 81D7B99
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 0
- reducepprandom BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 0
+ reducepprandom BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_ReducedBy
@@ -1512,8 +1512,8 @@ MoveEffect_MeanLook: @ 81D7CCC
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 65534
- jumpifsecondarytstatus TARGET, S_MEAN_LOOK, BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 65534
+ jumpifsecondarytstatus TARGET, S_MEAN_LOOK, BattleScript_ButItFailed
attackanimation
waitanimation
setbyte 0x2024d21, 32
@@ -1526,10 +1526,10 @@ MoveEffect_Nightmare: @ 81D7CF4
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
- jumpifsecondarytstatus TARGET, S_NIGHTMARE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifsecondarytstatus TARGET, S_NIGHTMARE, BattleScript_ButItFailed
jumpifstatus TARGET, SLP, BattleScript_1D7D1A
- jump BattleScript_1D83D6
+ jump BattleScript_ButItFailed
BattleScript_1D7D1A: @ 81D7D1A
attackanimation
@@ -1553,7 +1553,7 @@ MoveEffect_Curse: @ 81D7D3B
ppreduce
jumpifstat USER, 2, 3, 0, BattleScript_1D7D60
jumpifstat USER, 1, 1, 12, BattleScript_1D7D60
- jumpifstat USER, 0, 2, 12, BattleScript_1D83D6
+ jumpifstat USER, 0, 2, 12, BattleScript_ButItFailed
BattleScript_1D7D60: @ 81D7D60
copyarray 0x2024c08, 0x2024c07, 1
@@ -1588,8 +1588,8 @@ BattleScript_1D7DC4: @ 81D7DC4
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
- cursetarget BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
+ cursetarget BattleScript_ButItFailed
orword 0x2024c6c, 0x100
setbyte 0x2016002, 0
attackanimation
@@ -1640,7 +1640,7 @@ MoveEffect_PerishSong: @ 81D7E3D
attackcanceler
attackstring
ppreduce
- setperishsong BattleScript_1D83D6
+ setperishsong BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_PerishSong
@@ -1687,7 +1687,7 @@ MoveEffect_Swagger: @ 81D7EA2
accuracycheck BattleScript_1D6F72, 0
attackstring
ppreduce
- jumpifconfusedandattackmaxed 1, BattleScript_1D83D6
+ jumpifconfusedandattackmaxed 1, BattleScript_ButItFailed
attackanimation
waitanimation
setbyte 0x201601e, 33
@@ -1724,8 +1724,8 @@ MoveEffect_Attract: @ 81D7F1F
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 0
- tryinfatuatetarget BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 0
+ tryinfatuatetarget BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_FellLove
@@ -1773,10 +1773,10 @@ MoveEffect_BatonPass: @ 81D7F7C
attackcanceler
attackstring
ppreduce
- jumpifcannotswitch 129, BattleScript_1D83D6
+ jumpifcannotswitch 129, BattleScript_ButItFailed
attackanimation
waitanimation
- openpartyscreen USER, BattleScript_1D83D6
+ openpartyscreen USER, BattleScript_ButItFailed
atke2 USER
waitstateatk
atk51 USER, 2
@@ -1858,7 +1858,7 @@ MoveEffect_BellyDrum: @ 81D8038
attackcanceler
attackstring
ppreduce
- maxattackhalvehp BattleScript_1D83D6
+ maxattackhalvehp BattleScript_ButItFailed
orword 0x2024c6c, 0x100
attackanimation
waitanimation
@@ -1872,7 +1872,7 @@ MoveEffect_PsychUp: @ 81D805A
attackcanceler
attackstring
ppreduce
- copyfoestats BattleScript_1D83D6
+ copyfoestats BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_CopyStatChanges
@@ -1971,7 +1971,7 @@ MoveEffect_FutureSight: @ 81D817D
attackcanceler
attackstring
ppreduce
- setfutureattack BattleScript_1D83D6
+ setfutureattack BattleScript_ButItFailed
attackanimation
waitanimation
printfromtable BattleTextList_4015E2
@@ -2017,9 +2017,9 @@ MoveEffect_Teleport: @ 81D8233
attackcanceler
attackstring
ppreduce
- jumpifhalfword 4, 0x20239f8, 8, BattleScript_1D83D6
+ jumpifhalfword 4, 0x20239f8, 8, BattleScript_ButItFailed
atk76 USER, 2
- jumpifbyte 0, 0x2024d1e, 1, BattleScript_1D83D6
+ jumpifbyte 0, 0x2024d1e, 1, BattleScript_ButItFailed
jumpifbyte 0, 0x2024d1e, 2, BattleScript_1D8839
attackanimation
waitanimation
@@ -2038,7 +2038,7 @@ MoveEffect_BeatUp: @ 81D826E
BattleScript_1D8281: @ 81D8281
atk25
- beatupcalculation BattleScript_1D82C4, BattleScript_1D83D6
+ beatupcalculation BattleScript_1D82C4, BattleScript_ButItFailed
printstring BATTLE_TEXT_PokeAttack
critcalc
jumpifbyte 1, 0x2024c0d, 2, BattleScript_1D829C
@@ -2156,7 +2156,7 @@ BattleScript_1D83D4: @ 81D83D4
BattleScript_1D83D5: @ 81D83D5
ppreduce
-BattleScript_1D83D6:: @ 81D83D6
+BattleScript_ButItFailed:: @ 81D83D6
pause 32
orbyte 0x2024c68, 32
resultmessage
@@ -2243,8 +2243,8 @@ MoveEffect_Torment: @ 81D8495
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 0
- settorment BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 0
+ settorment BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_TormentSubject
@@ -2257,7 +2257,7 @@ MoveEffect_Flatter: @ 81D84B1
accuracycheck BattleScript_1D6F72, 0
attackstring
ppreduce
- jumpifconfusedandattackmaxed 4, BattleScript_1D83D6
+ jumpifconfusedandattackmaxed 4, BattleScript_ButItFailed
attackanimation
waitanimation
setbyte 0x201601e, 20
@@ -2279,12 +2279,12 @@ MoveEffect_WillOWisp: @ 81D850F
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus TARGET, BRN, BattleScript_1D8575
jumpiftype TARGET, TYPE_FIRE, BattleScript_1D83E8
jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_1D855B
- jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
- accuracycheck BattleScript_1D83D6, 0
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed
+ accuracycheck BattleScript_ButItFailed, 0
jumpifhalverset TARGET, 32, BattleScript_1D9037
attackanimation
waitanimation
@@ -2309,7 +2309,7 @@ MoveEffect_Memento: @ 81D8583
jumpifbyte 0, 0x2024d24, 1, BattleScript_1D860A
attackstring
ppreduce
- jumpifattackandspecialattackcannotfall BattleScript_1D83D6
+ jumpifattackandspecialattackcannotfall BattleScript_ButItFailed
setuserhptozero
attackanimation
waitanimation
@@ -2415,8 +2415,8 @@ MoveEffect_Taunt: @ 81D86AB
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 0
- settaunt BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 0
+ settaunt BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_TauntFell
@@ -2427,7 +2427,7 @@ MoveEffect_HelpingHand: @ 81D86C7
attackcanceler
attackstring
ppreduce
- sethelpinghand BattleScript_1D83D6
+ sethelpinghand BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_ReadyToHelp
@@ -2438,9 +2438,9 @@ MoveEffect_Trick: @ 81D86DC
attackcanceler
attackstring
ppreduce
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
- accuracycheck BattleScript_1D83D6, 0
- itemswap BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
+ accuracycheck BattleScript_ButItFailed, 0
+ itemswap BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_SwitchedItems
@@ -2453,8 +2453,8 @@ MoveEffect_RolePlay: @ 81D870A
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 65535
- copyability BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 65535
+ copyability BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_CopiedObject
@@ -2465,7 +2465,7 @@ MoveEffect_Wish: @ 81D8726
attackcanceler
attackstring
ppreduce
- atkd4 0, BattleScript_1D83D6
+ atkd4 0, BattleScript_ButItFailed
attackanimation
waitanimation
jump BattleScript_EndTurn
@@ -2484,7 +2484,7 @@ MoveEffect_Ingrain: @ 81D874D
attackcanceler
attackstring
ppreduce
- setroots BattleScript_1D83D6
+ setroots BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_PlantedRoots
@@ -2510,7 +2510,7 @@ MoveEffect_Recycle: @ 81D8782
attackcanceler
attackstring
ppreduce
- recycleitem BattleScript_1D83D6
+ recycleitem BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_FoundOne
@@ -2562,11 +2562,11 @@ MoveEffect_Yawn: @ 81D87EE
ppreduce
jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_1D882F
jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_1D882F
- jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed
jumpifhalverset TARGET, 32, BattleScript_1D9037
- accuracycheck BattleScript_1D83D6, 65535
- jumpifcannotsleep BattleScript_1D83D6
- setyawn BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 65535
+ jumpifcannotsleep BattleScript_ButItFailed
+ setyawn BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_DrowsyMade
@@ -2590,7 +2590,7 @@ MoveEffect_Endeavor: @ 81D8852
attackcanceler
attackstring
ppreduce
- setdamagetohealthdifference BattleScript_1D83D6
+ setdamagetohealthdifference BattleScript_ButItFailed
copyarray 0x2024bf0, 0x2024bec, 4
accuracycheck BattleScript_1D6F77, 0
atk6
@@ -2608,8 +2608,8 @@ MoveEffect_SkillSwap: @ 81D8893
attackcanceler
attackstring
ppreduce
- accuracycheck BattleScript_1D83D6, 65535
- abilityswap BattleScript_1D83D6
+ accuracycheck BattleScript_ButItFailed, 65535
+ abilityswap BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_AbilitySwap
@@ -2620,7 +2620,7 @@ MoveEffect_Imprison: @ 81D88AF
attackcanceler
attackstring
ppreduce
- imprisoneffect BattleScript_1D83D6
+ imprisoneffect BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_SealedMove
@@ -2631,7 +2631,7 @@ MoveEffect_Refresh: @ 81D88C4
attackcanceler
attackstring
ppreduce
- cureifburnedparalysedorpoisoned BattleScript_1D83D6
+ cureifburnedparalysedorpoisoned BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_StatusNormal
@@ -2643,7 +2643,7 @@ MoveEffect_Grudge: @ 81D88DB
attackcanceler
attackstring
ppreduce
- setgrudge BattleScript_1D83D6
+ setgrudge BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_GrudgeBear
@@ -2740,7 +2740,7 @@ MoveEffect_WaterSport: @ 81D89D7
attackcanceler
attackstring
ppreduce
- settypebasedhalvers BattleScript_1D83D6
+ settypebasedhalvers BattleScript_ButItFailed
attackanimation
waitanimation
printfromtable BattleTextList_4015D4
@@ -2767,7 +2767,7 @@ MoveEffect_Tickle: @ 81D8A0A
jumpifstat TARGET, 0, 2, 0, BattleScript_1D8A7D
BattleScript_1D8A1F: @ 81D8A1F
- accuracycheck BattleScript_1D83D6, 0
+ accuracycheck BattleScript_ButItFailed, 0
attackanimation
waitanimation
setbyte 0x20160dc, 0
@@ -2924,7 +2924,7 @@ MoveEffect_Camouflage: @ 81D8C43
attackcanceler
attackstring
ppreduce
- settypetoterrain BattleScript_1D83D6
+ settypetoterrain BattleScript_ButItFailed
attackanimation
waitanimation
printstring BATTLE_TEXT_TypeTransform
@@ -3364,7 +3364,7 @@ gUnknown_081D90B2:: @ 81D90B2
gUnknown_081D90F1:: @ 81D90F1
printstring BATTLE_TEXT_UnleashedEnergy
waitmessage 64
- jump BattleScript_1D83D6
+ jump BattleScript_ButItFailed
gUnknown_081D90FC:: @ 81D90FC
attackanimation
@@ -3385,7 +3385,7 @@ BattleScript_1D9116: @ 81D9116
atk52 TARGET
jump BattleScript_EndTurn
-gUnknown_081D9128:: @ 81D9128
+BattleScript_MistProtected:: @ 81D9128
pause 32
printstring BATTLE_TEXT_MistProtect
waitmessage 64
@@ -3531,17 +3531,17 @@ BattleScript_RapidSpinAway:: @ 81D92C0
breakfree
return
-gUnknown_081D92C2:: @ 81D92C2
+BattleScript_WrapFree:: @ 81D92C2
printstring BATTLE_TEXT_GotFreeFrom
waitmessage 64
return
-gUnknown_081D92C9:: @ 81D92C9
+BattleScript_LeechSeedFree:: @ 81D92C9
printstring BATTLE_TEXT_LeechShed
waitmessage 64
return
-gUnknown_081D92D0:: @ 81D92D0
+BattleScript_SpikesFree:: @ 81D92D0
printstring BATTLE_TEXT_SpikesBlownAway
waitmessage 64
return
@@ -4164,7 +4164,7 @@ BattleScript_1D988D: @ 81D988D
waitmessage 64
jump BattleScript_EndTurn
-gUnknown_081D989B:: @ 81D989B
+BattleScript_AbilityNoStatLoss:: @ 81D989B
pause 32
printstring BATTLE_TEXT_PreventedStatLoss
waitmessage 64
@@ -4188,7 +4188,7 @@ BattleScript_PSNPrevention:: @ 81D98BD
waitmessage 64
return
-gUnknown_081D98C9:: @ 81D98C9
+BattleScript_ObliviousPreventsAttraction:: @ 81D98C9
pause 32
printstring BATTLE_TEXT_PreventedRomance
waitmessage 64
@@ -4214,7 +4214,7 @@ gUnknown_081D98F3:: @ 81D98F3
waitmessage 64
jump BattleScript_EndTurn
-gUnknown_081D9903:: @ 81D9903
+BattleScript_AbilityNoSpecificStatLoss:: @ 81D9903
pause 32
printstring BATTLE_TEXT_PreventedLoss
waitmessage 64
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 3f0dc8af1..b10b7f96f 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -51,7 +51,7 @@ BattleScript_1D9EBC: @ 81D9EBC
atk98 1
pokemoncatchfunction
-gUnknown_081D9EC2:: @ 81D9EC2
+BattleScript_SuccessBallThrow:: @ 81D9EC2
jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0
atk60 11
@@ -76,12 +76,12 @@ BattleScript_1D9EF8: @ 81D9EF8
setbyte gBattleOutcome, 7
activesidesomething
-gUnknown_081D9F00:: @ 81D9F00
+BattleScript_WallyBallThrow:: @ 81D9F00
printstring BATTLE_TEXT_BallCaught2
setbyte gBattleOutcome, 7
activesidesomething
-gUnknown_081D9F0A:: @ 81D9F0A
+BattleScript_ShakeBallThrow:: @ 81D9F0A
printfromtable BattleTextList_4015E6
waitmessage 64
jumpifbyte 5, gBattleTypeFlags, 128, BattleScript_1D9F34
@@ -93,7 +93,7 @@ gUnknown_081D9F0A:: @ 81D9F0A
BattleScript_1D9F34: @ 81D9F34
atkf6
-gUnknown_081D9F35:: @ 81D9F35
+BattleScript_TrainerBallBlock:: @ 81D9F35
waitmessage 64
printstring BATTLE_TEXT_BlockBall
waitmessage 64
diff --git a/data/berry_tag_screen.s b/data/berry_tag_screen.s
deleted file mode 100644
index d1be8a9d7..000000000
--- a/data/berry_tag_screen.s
+++ /dev/null
@@ -1,12 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_0841192C:: @ 841192C
- .4byte ContestStatsText_VerySoft
- .4byte ContestStatsText_Soft
- .4byte ContestStatsText_Hard
- .4byte ContestStatsText_VeryHard
- .4byte ContestStatsText_SuperHard
diff --git a/data/crc16_table.inc b/data/crc16_table.inc
deleted file mode 100644
index a1f8babd0..000000000
--- a/data/crc16_table.inc
+++ /dev/null
@@ -1,34 +0,0 @@
- .align 1
-gCrc16Table:: @ 82087DC
- .2byte 0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF
- .2byte 0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7
- .2byte 0x1081, 0x0108, 0x3393, 0x221A, 0x56A5, 0x472C, 0x75B7, 0x643E
- .2byte 0x9CC9, 0x8D40, 0xBFDB, 0xAE52, 0xDAED, 0xCB64, 0xF9FF, 0xE876
- .2byte 0x2102, 0x308B, 0x0210, 0x1399, 0x6726, 0x76AF, 0x4434, 0x55BD
- .2byte 0xAD4A, 0xBCC3, 0x8E58, 0x9FD1, 0xEB6E, 0xFAE7, 0xC87C, 0xD9F5
- .2byte 0x3183, 0x200A, 0x1291, 0x0318, 0x77A7, 0x662E, 0x54B5, 0x453C
- .2byte 0xBDCB, 0xAC42, 0x9ED9, 0x8F50, 0xFBEF, 0xEA66, 0xD8FD, 0xC974
- .2byte 0x4204, 0x538D, 0x6116, 0x709F, 0x0420, 0x15A9, 0x2732, 0x36BB
- .2byte 0xCE4C, 0xDFC5, 0xED5E, 0xFCD7, 0x8868, 0x99E1, 0xAB7A, 0xBAF3
- .2byte 0x5285, 0x430C, 0x7197, 0x601E, 0x14A1, 0x0528, 0x37B3, 0x263A
- .2byte 0xDECD, 0xCF44, 0xFDDF, 0xEC56, 0x98E9, 0x8960, 0xBBFB, 0xAA72
- .2byte 0x6306, 0x728F, 0x4014, 0x519D, 0x2522, 0x34AB, 0x0630, 0x17B9
- .2byte 0xEF4E, 0xFEC7, 0xCC5C, 0xDDD5, 0xA96A, 0xB8E3, 0x8A78, 0x9BF1
- .2byte 0x7387, 0x620E, 0x5095, 0x411C, 0x35A3, 0x242A, 0x16B1, 0x0738
- .2byte 0xFFCF, 0xEE46, 0xDCDD, 0xCD54, 0xB9EB, 0xA862, 0x9AF9, 0x8B70
- .2byte 0x8408, 0x9581, 0xA71A, 0xB693, 0xC22C, 0xD3A5, 0xE13E, 0xF0B7
- .2byte 0x0840, 0x19C9, 0x2B52, 0x3ADB, 0x4E64, 0x5FED, 0x6D76, 0x7CFF
- .2byte 0x9489, 0x8500, 0xB79B, 0xA612, 0xD2AD, 0xC324, 0xF1BF, 0xE036
- .2byte 0x18C1, 0x0948, 0x3BD3, 0x2A5A, 0x5EE5, 0x4F6C, 0x7DF7, 0x6C7E
- .2byte 0xA50A, 0xB483, 0x8618, 0x9791, 0xE32E, 0xF2A7, 0xC03C, 0xD1B5
- .2byte 0x2942, 0x38CB, 0x0A50, 0x1BD9, 0x6F66, 0x7EEF, 0x4C74, 0x5DFD
- .2byte 0xB58B, 0xA402, 0x9699, 0x8710, 0xF3AF, 0xE226, 0xD0BD, 0xC134
- .2byte 0x39C3, 0x284A, 0x1AD1, 0x0B58, 0x7FE7, 0x6E6E, 0x5CF5, 0x4D7C
- .2byte 0xC60C, 0xD785, 0xE51E, 0xF497, 0x8028, 0x91A1, 0xA33A, 0xB2B3
- .2byte 0x4A44, 0x5BCD, 0x6956, 0x78DF, 0x0C60, 0x1DE9, 0x2F72, 0x3EFB
- .2byte 0xD68D, 0xC704, 0xF59F, 0xE416, 0x90A9, 0x8120, 0xB3BB, 0xA232
- .2byte 0x5AC5, 0x4B4C, 0x79D7, 0x685E, 0x1CE1, 0x0D68, 0x3FF3, 0x2E7A
- .2byte 0xE70E, 0xF687, 0xC41C, 0xD595, 0xA12A, 0xB0A3, 0x8238, 0x93B1
- .2byte 0x6B46, 0x7ACF, 0x4854, 0x59DD, 0x2D62, 0x3CEB, 0x0E70, 0x1FF9
- .2byte 0xF78F, 0xE606, 0xD49D, 0xC514, 0xB1AB, 0xA022, 0x92B9, 0x8330
- .2byte 0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78
diff --git a/data/data2.s b/data/data2a.s
index 00ef5c26e..db2158fc7 100644
--- a/data/data2.s
+++ b/data/data2a.s
@@ -1027,778 +1027,3 @@ gUnknown_081FA724:: @ 81FA724
.2byte 0x140
.2byte 0x130
.2byte 0xFFFF
-
- .align 2
-gBattleScriptingCommandsTable:: @ 81FA73C
- .4byte atk00_attackcanceler
- .4byte atk01_accuracycheck
- .4byte atk02_attackstring
- .4byte atk03_ppreduce
- .4byte atk04_critcalc
- .4byte atk05_damagecalc1
- .4byte atk06_typecalc
- .4byte atk07_dmg_adjustment
- .4byte atk08_dmg_adjustment2
- .4byte atk09_attackanimation
- .4byte atk0A_waitanimation
- .4byte atk0B_healthbarupdate
- .4byte atk0C_datahpupdate
- .4byte atk0D_critmessage
- .4byte atk0E_effectiveness_sound
- .4byte atk0F_resultmessage
- .4byte atk10_printstring
- .4byte atk11_printstring_playeronly
- .4byte atk12_waitmessage
- .4byte atk13_printfromtable
- .4byte atk14_printfromtable_playeronly
- .4byte atk15_seteffectwithchancetarget
- .4byte atk16_seteffectprimary
- .4byte atk17_seteffectsecondary
- .4byte atk18_status_effect_clear
- .4byte atk19_faint_pokemon
- .4byte atk1A_faint_animation
- .4byte atk1B_faint_effects_clear
- .4byte atk1C_jumpifstatus
- .4byte atk1D_jumpifstatus2
- .4byte atk1E_jumpifability
- .4byte atk1F_jumpifsideaffecting
- .4byte atk20_jumpifstat
- .4byte atk21_jumpifstatus3
- .4byte atk22_jumpiftype
- .4byte atk23_getexp
- .4byte atk24
- .4byte atk25_move_values_cleanup
- .4byte atk26_set_multihit
- .4byte atk27_decrement_multihit
- .4byte atk28_goto
- .4byte atk29_jumpifbyte
- .4byte atk2A_jumpifhalfword
- .4byte atk2B_jumpifword
- .4byte atk2C_jumpifarrayequal
- .4byte atk2D_jumpifarraynotequal
- .4byte atk2E_setbyte
- .4byte atk2F_addbyte
- .4byte atk30_subbyte
- .4byte atk31_copyarray
- .4byte atk32_copyarray_withindex
- .4byte atk33_orbyte
- .4byte atk34_orhalfword
- .4byte atk35_orword
- .4byte atk36_bicbyte
- .4byte atk37_bichalfword
- .4byte atk38_bicword
- .4byte atk39_pause
- .4byte atk3A_waitstate
- .4byte atk3B_healthbar_update
- .4byte atk3C_return
- .4byte atk3D_end
- .4byte atk3E_end2
- .4byte atk3F_end3
- .4byte atk40_jump_if_move_affected_by_protect
- .4byte atk41_call
- .4byte atk42_jumpiftype2
- .4byte atk43_jumpifabilitypresent
- .4byte atk44
- .4byte atk45_playanimation
- .4byte atk46_playanimation2
- .4byte atk47_setgraphicalstatchangevalues_setgraphicalstatchangevalues_setgraphicalstatchangevalues
- .4byte atk48_playstatchangeanimation
- .4byte sub_80217F8
- .4byte atk4A_damageflags
- .4byte atk4B_cmd4b
- .4byte atk4C_switch1
- .4byte sub_80225F0
- .4byte sub_8022784
- .4byte sub_8022830
- .4byte atk50_openpartyscreen
- .4byte sub_802331C
- .4byte sub_8023524
- .4byte sub_80237CC
- .4byte atk54_802511C
- .4byte sub_8023848
- .4byte atk56_8025194
- .4byte atk57_80251C4_flee
- .4byte atk58_cmd58
- .4byte atk59_8025230
- .4byte sub_8023AF8
- .4byte atk5B_80256E0
- .4byte atk5C_cmd5c
- .4byte sub_8024014
- .4byte atk5E_8025A70
- .4byte atk5F_8025B24
- .4byte atk60_cmd60
- .4byte atk61_8025BA4
- .4byte atk62_08025C6C
- .4byte atk63_jumptoattack
- .4byte atk64_statusanimation
- .4byte atk65_8025D90
- .4byte atk66_8025E38
- .4byte atk67_8025ECC
- .4byte sub_80246A0
- .4byte atk69_8025FE0
- .4byte atk6A_stash_item_for_side
- .4byte sub_80248C0
- .4byte sub_80248FC
- .4byte sub_8024C4C
- .4byte atk6E_state0_side_becomes_attacker
- .4byte atk6F_8026810
- .4byte atk70_record_ability_usage_of_side
- .4byte atk71_80268A0
- .4byte atk72_flee
- .4byte atk73_cmd73
- .4byte atk74_hp_tresholds_2
- .4byte atk75_8026A58
- .4byte sub_8024F40
- .4byte atk77_setprotect
- .4byte atk78_faintifabilitynotdamp
- .4byte atk79_setuserhptozero
- .4byte sub_80253E8
- .4byte sub_802548C
- .4byte sub_8025508
- .4byte sub_80256D0
- .4byte atk7E_setreflect
- .4byte sub_80257DC
- .4byte atk80_manipulatedamage
- .4byte atk81_setrest
- .4byte atk82_jumpifnotfirstturn
- .4byte sub_8025A34
- .4byte sub_8025AE0
- .4byte sub_8025B5C
- .4byte atk86_stockpiletobasedamage
- .4byte sub_8025D00
- .4byte atk88_negativedamage
- .4byte atk89_statbuffchange
- .4byte atk8A_normalisebuffs
- .4byte atk8B_setbide
- .4byte atk8C_confuseifrepeatingattackends
- .4byte atk8D_setloopcounter
- .4byte sub_8026468
- .4byte sub_8026590
- .4byte sub_802688C
- .4byte atk91_givemoney
- .4byte atk92_setlightscreen
- .4byte sub_8026B78
- .4byte atk94_gethalfcurrentenemyhp
- .4byte sub_8026E94
- .4byte sub_8026EEC
- .4byte sub_8027064
- .4byte sub_8027238
- .4byte sub_8027348
- .4byte atk9A_setincreasedcriticalchance
- .4byte atk9B_transformdataexecution
- .4byte sub_80275D8
- .4byte atk9D_copyattack
- .4byte sub_80278B8
- .4byte sub_8027960
- .4byte atkA0_psywavedamageeffect
- .4byte atkA1_counterdamagecalculator
- .4byte atkA2_mirrorcoatdamagecalculator
- .4byte atkA3_disablelastusedattack
- .4byte atkA4_setencore
- .4byte sub_8027E4C
- .4byte sub_8027F44
- .4byte atkA7_setalwayshitflag
- .4byte atkA8_copymovepermanently
- .4byte sub_8028420
- .4byte sub_8028558
- .4byte atkAB_802A458
- .4byte atkAC_remaininghptopower
- .4byte sub_8028668
- .4byte sub_8028858
- .4byte sub_8028AD4
- .4byte sub_8028B70
- .4byte sub_8028BFC
- .4byte atkB2_setperishsong
- .4byte atkB3_rolloutdamagecalculation
- .4byte atkB4_jumpifconfusedandattackmaxed
- .4byte sub_8028EC8
- .4byte atkB6_happinesstodamagecalculation
- .4byte atkB7_presentdamagecalculation
- .4byte sub_80290BC
- .4byte atkB9_magnitudedamagecalculation
- .4byte sub_8029270
- .4byte sub_80293E8
- .4byte atkBC_maxattackhalvehp
- .4byte atkBD_copyfoestats
- .4byte atkBE_breakfree
- .4byte sub_802964C
- .4byte atkC0_recoverbasedonsunlight
- .4byte sub_8029784
- .4byte atkC2_selectnexttarget
- .4byte atkC3_setfutureattack
- .4byte atkC4_802B910
- .4byte atkC5_hidepreattack
- .4byte atkC6_unhidepostattack
- .4byte atkC7_setminimize
- .4byte sub_8029DAC
- .4byte atkC9_jumpifattackandspecialattackcannotfall
- .4byte atkCA_setforcedtarget
- .4byte atkCB_setcharge
- .4byte atkCC_callterrainattack
- .4byte atkCD_cureifburnedparalysedorpoisoned
- .4byte atkCE_settorment
- .4byte atkCF_jumpifnodamage
- .4byte atkD0_settaunt
- .4byte sub_802A170
- .4byte sub_802A218
- .4byte sub_802A4B0
- .4byte atkD4_802C408
- .4byte sub_802A5FC
- .4byte atkD6_doubledamagedealtifdamaged
- .4byte sub_802A6BC
- .4byte atkD8_setdamagetohealthdifference
- .4byte atkD9_scaledamagebyhealthratio
- .4byte atkDA_abilityswap
- .4byte atkDB_imprisoneffect
- .4byte atkDC_setgrudge
- .4byte atkDD_weightdamagecalculation
- .4byte atkDE_asistattackselect
- .4byte atkDF_setmagiccoat
- .4byte atkE0_setstealstatchange
- .4byte atkE1_802CBE4
- .4byte sub_802ADD8
- .4byte atkE3_jumpiffainted
- .4byte sub_802AEB0
- .4byte sub_802AF68
- .4byte atkE6_castform_transform
- .4byte atkE7_castform_switch
- .4byte atkE8_settypebasedhalvers
- .4byte sub_802B1C0
- .4byte atkEA_recycleitem
- .4byte atkEB_settypetoterrain
- .4byte sub_802B3E0
- .4byte sub_802B4B4
- .4byte sub_802B51C
- .4byte sub_802B5B8
- .4byte sub_802B960
- .4byte sub_802B9E0
- .4byte sub_802BA90
- .4byte atkF3_receive_new_pokemon_maybe
- .4byte sub_802BEF0
- .4byte sub_802BF20
- .4byte sub_802BF48
- .4byte sub_802BF54
-
- .align 2
-gAccuracyStageRatios:: @ 81FAB1C
- .byte 33, 100, 0, 0 @ -6
- .byte 36, 100, 0, 0 @ -5
- .byte 43, 100, 0, 0 @ -4
- .byte 50, 100, 0, 0 @ -3
- .byte 60, 100, 0, 0 @ -2
- .byte 75, 100, 0, 0 @ -1
- .byte 1, 1, 0, 0 @ 0
- .byte 133, 100, 0, 0 @ +1
- .byte 166, 100, 0, 0 @ +2
- .byte 2, 1, 0, 0 @ +3
- .byte 233, 100, 0, 0 @ +4
- .byte 133, 50, 0, 0 @ +5
- .byte 3, 1, 0, 0 @ +6
-
-@ The chance is 1/N for each stage.
- .align 1
-gCriticalHitChance:: @ 81FAB50
- .2byte 16 @ +0
- .2byte 8 @ +1
- .2byte 4 @ +2
- .2byte 3 @ +3
- .2byte 2 @ +4
-
- .align 2
-gStatusFlagsForMoveEffects:: @ 81FAB5C
- .4byte 0x00000000
- .4byte 0x00000007
- .4byte 0x00000008
- .4byte 0x00000010
- .4byte 0x00000020
- .4byte 0x00000040
- .4byte 0x00000080
- .4byte 0x00000007
- .4byte 0x00000008
- .4byte 0x00000000
- .4byte 0x00000070
- .4byte 0x00000000
- .4byte 0x00001000
- .4byte 0x0000E000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00400000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x04000000
- .4byte 0x08000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000C00
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x00000000
-
- .align 2
-gMoveEffectBS_Ptrs:: @ 81FAC4C
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D965A
- .4byte BattleScript_1D9669
- .4byte BattleScript_1D9678
- .4byte BattleScript_1D9687
- .4byte BattleScript_1D969D
- .4byte BattleScript_1D96BA
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D9696
- .4byte BattleScript_1D96AA
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D96B1
- .4byte BattleScript_1D96C8
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D963E
- .4byte BattleScript_1D96C8
-
-@ unreferenced bit masks
- .byte 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F
-
-gLevelUpStatBoxStats:: @ 81FACEF
- .byte 0x3A @ HP
- .byte 0x3E @ Sp. Attack
- .byte 0x3B @ Attack
- .byte 0x3F @ Sp. Defense
- .byte 0x3C @ Defense
- .byte 0x3D @ Speed
-
- .align 1
-gProtectSuccessRates:: @ 81FACF6
- .2byte 0xFFFF, 0x7FFF, 0x3FFF, 0x1FFF
-
- .align 1
-gUnknown_081FACFE:: @ 81FACFE
- .2byte MOVE_METRONOME
- .2byte MOVE_STRUGGLE
- .2byte MOVE_SKETCH
- .2byte MOVE_MIMIC
- .2byte 0xFFFE
- .2byte MOVE_COUNTER
- .2byte MOVE_MIRROR_COAT
- .2byte MOVE_PROTECT
- .2byte MOVE_DETECT
- .2byte MOVE_ENDURE
- .2byte MOVE_DESTINY_BOND
- .2byte MOVE_SLEEP_TALK
- .2byte MOVE_THIEF
- .2byte MOVE_FOLLOW_ME
- .2byte MOVE_SNATCH
- .2byte MOVE_HELPING_HAND
- .2byte MOVE_COVET
- .2byte MOVE_TRICK
- .2byte MOVE_FOCUS_PUNCH
- .2byte 0xFFFF
-
-gUnknown_081FAD26:: @ 81FAD26
- .byte 1, 200
- .byte 4, 150
- .byte 9, 100
- .byte 16, 80
- .byte 32, 40
- .byte 48, 20
-
- .align 1
-gNaturePowerMoves:: @ 81FAD32
- .2byte MOVE_STUN_SPORE
- .2byte MOVE_RAZOR_LEAF
- .2byte MOVE_EARTHQUAKE
- .2byte MOVE_HYDRO_PUMP
- .2byte MOVE_SURF
- .2byte MOVE_BUBBLE_BEAM
- .2byte MOVE_ROCK_SLIDE
- .2byte MOVE_SHADOW_BALL
- .2byte MOVE_SWIFT
- .2byte MOVE_SWIFT
-
-@ weight-based damage table for Low Kick
-@ format: min. weight (hectograms), base power
-
- .align 1
-gWeightDamage:: @ 81FAD46
- .2byte 100, 20
- .2byte 250, 40
- .2byte 500, 60
- .2byte 1000, 80
- .2byte 2000, 100
- .2byte -1, -1
-
- .align 1
-gPickupItems:: @ 81FAD5E
- .2byte ITEM_SUPER_POTION, 30
- .2byte ITEM_FULL_HEAL, 40
- .2byte ITEM_ULTRA_BALL, 50
- .2byte ITEM_RARE_CANDY, 60
- .2byte ITEM_FULL_RESTORE, 70
- .2byte ITEM_REVIVE, 80
- .2byte ITEM_NUGGET, 90
- .2byte ITEM_PROTEIN, 95
- .2byte ITEM_PP_UP, 99
- .2byte ITEM_KINGS_ROCK, 1
-
-gTerrainToType:: @ 81FAD86
- .byte TYPE_GRASS @ tall grass
- .byte TYPE_GRASS @ long grass
- .byte TYPE_GROUND @ sand
- .byte TYPE_WATER @ underwater
- .byte TYPE_WATER @ water
- .byte TYPE_WATER @ pond water
- .byte TYPE_ROCK @ rock
- .byte TYPE_ROCK @ cave
- .byte TYPE_NORMAL @ building
- .byte TYPE_NORMAL @ plain
-
-gBallCatchBonuses:: @ 81FAD90
- .byte 20 @ Ultra Ball
- .byte 15 @ Great Ball
- .byte 10 @ Poké Ball
- .byte 15 @ Safari Ball
-
- .string "ターン$" @ "turn"
-
- .align 2
-gPlayerBufferCommands:: @ 81FAD98
- .4byte PlayerHandleGetAttributes
- .4byte sub_802ECF0
- .4byte PlayerHandleSetAttributes
- .4byte sub_802F7CC
- .4byte PlayerHandleLoadPokeSprite
- .4byte PlayerHandleSendOutPoke
- .4byte PlayerHandleReturnPokeToBall
- .4byte PlayerHandleTrainerThrow
- .4byte PlayerHandleTrainerSlide
- .4byte PlayerHandleTrainerSlideBack
- .4byte sub_802FE7C
- .4byte sub_802FF60
- .4byte sub_802FF80
- .4byte PlayerHandleBallThrow
- .4byte PlayerHandlePuase
- .4byte PlayerHandleMoveAnimation
- .4byte PlayerHandlePrintString
- .4byte PlayerHandlePrintStringPlayerOnly
- .4byte sub_803037C
- .4byte nullsub_42
- .4byte sub_8030468
- .4byte PlayerHandleOpenBag
- .4byte sub_8030594
- .4byte sub_8030674
- .4byte PlayerHandleHealthBarUpdate
- .4byte PlayerHandleExpBarUpdate
- .4byte PlayerHandleStatusIconUpdate
- .4byte PlayerHandleStatusAnimation
- .4byte PlayerHandleStatusXor
- .4byte sub_803097C
- .4byte PlayerHandleDMATransfer
- .4byte sub_8030A3C
- .4byte sub_8030A6C
- .4byte sub_8030A78
- .4byte sub_8030A8C
- .4byte sub_8030AA0
- .4byte sub_8030AB4
- .4byte sub_8030AC8
- .4byte sub_8030AE4
- .4byte sub_8030B1C
- .4byte sub_8030B34
- .4byte PlayerHandleHitAnimation
- .4byte sub_8030BCC
- .4byte PlayerHandleEffectivenessSound
- .4byte sub_8030C1C
- .4byte PlayerHandleFaintingCry
- .4byte PlayerHandleIntroSlide
- .4byte PlayerHandleTrainerBallThrow
- .4byte sub_8030FAC
- .4byte sub_80310A4
- .4byte sub_80310F0
- .4byte PlayerHandleSpriteInvisibility
- .4byte PlayerHandleBattleAnimation
- .4byte PlayerHandleLinkStandbyMsg
- .4byte PlayerHandleResetActionMoveSelection
- .4byte sub_80312A0
- .4byte nullsub_43
-
-gUnknown_081FAE7C:: @ 81FAE7C
- .byte 0, 2, 3, 1
-
-gUnknown_081FAE80:: @ 81FAE80
- .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}$"
-
-gUnknown_081FAE89:: @ 81FAE89
- .byte 8, 120
- .byte 88, 120
- .byte 8, 136
- .byte 88, 136
-
-gUnknown_081FAE91:: @ 81FAE91
- .byte 144, 120
- .byte 190, 120
- .byte 144, 136
- .byte 190, 136
- .byte 72, 72
- .byte 32, 90
- .byte 80, 80
- .byte 80, 88
-
- .align 2
-gUnknown_081FAEA4:: @ 81FAEA4
- obj_tiles gSmokescreenImpactTiles, 0x180, 55019
-
- .align 2
-gUnknown_081FAEAC:: @ 81FAEAC
- obj_pal gSmokescreenImpactPalette, 55019
-
- .align 2
-gOamData_81FAEB4:: @ 81FAEB4
- .2byte 0x0000
- .2byte 0x4000
- .2byte 0x0400
-
- .align 2
-gSpriteAnim_81FAEBC:: @ 81FAEBC
- obj_image_anim_frame 0, 4
- obj_image_anim_frame 4, 4
- obj_image_anim_frame 8, 4
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_81FAECC:: @ 81FAECC
- obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
- obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
- obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_81FAEDC:: @ 81FAEDC
- obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
- obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP
- obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_81FAEEC:: @ 81FAEEC
- obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
- obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
- obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_81FAEFC:: @ 81FAEFC
- .4byte gSpriteAnim_81FAEBC
- .4byte gSpriteAnim_81FAECC
- .4byte gSpriteAnim_81FAEDC
- .4byte gSpriteAnim_81FAEEC
-
- .align 2
-gSpriteTemplate_81FAF0C:: @ 81FAF0C
- spr_template 55019, 55019, gOamData_81FAEB4, gSpriteAnimTable_81FAEFC, NULL, gDummySpriteAffineAnimTable, sub_80463CC
-
- .align 2
-gUnknown_081FAF24:: @ 81FAF24
- obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759
-
- .align 2
-gOamData_81FAF2C:: @ 81FAF2C
- .2byte 0x4000
- .2byte 0x4000
- .2byte 0x0C00
-
- .align 2
-gSpriteTemplate_81FAF34:: @ 81FAF34
- spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978
-
- .align 2
-gUnknown_081FAF4C:: @ 81FAF4C
- .4byte 0x02008000
- .4byte 0x0200a000
- .4byte 0x0200c000
- .4byte 0x0200e000
-
- .align 2
-gOpponentBufferCommands:: @ 81FAF5C
- .4byte OpponentHandleGetAttributes
- .4byte dp01t_01_2_read_pokmon_data_slice
- .4byte OpponentHandleSetAttributes
- .4byte sub_8034744
- .4byte OpponentHandleLoadPokeSprite
- .4byte OpponentHandleSendOutPoke
- .4byte OpponentHandleReturnPokeToBall
- .4byte OpponentHandleTrainerThrow
- .4byte OpponentHandleTrainerSlide
- .4byte OpponentHandleTrainerSlideBack
- .4byte sub_8035030
- .4byte sub_80350D4
- .4byte sub_80350E0
- .4byte OpponentHandleBallThrow
- .4byte OpponentHandlePause
- .4byte OpponentHandleMoveAnimation
- .4byte OpponentHandlePrintString
- .4byte OpponentHandlePrintStringPlayerOnly
- .4byte sub_803540C
- .4byte sub_803541C
- .4byte sub_8035428
- .4byte sub_8035590
- .4byte sub_80355C0
- .4byte sub_80356C0
- .4byte OpponentHandleHealthBarUpdate
- .4byte OpponentHandleExpBarUpdate
- .4byte OpponentHandleStatusIconUpdate
- .4byte OpponentHandleStatusAnimation
- .4byte OpponentHandleStatusXor
- .4byte sub_80358B0
- .4byte OpponentHandleDMATransfer
- .4byte sub_80358C8
- .4byte sub_80358D4
- .4byte sub_80358E0
- .4byte sub_80358EC
- .4byte sub_80358F8
- .4byte sub_8035904
- .4byte sub_8035910
- .4byte sub_803592C
- .4byte sub_8035964
- .4byte sub_803597C
- .4byte OpponentHandleHitAnimation
- .4byte sub_8035A14
- .4byte OpponentHandleEffectivenessSound
- .4byte sub_8035A64
- .4byte OpponentHandleFaintingCry
- .4byte dp01t_2E_7_battle_intro
- .4byte sub_8035B04
- .4byte dp01t_30_7_0803D67C
- .4byte sub_8035E6C
- .4byte sub_8035EB8
- .4byte OpponentHandleSpriteInvisibility
- .4byte OpponentHandleBattleAnimation
- .4byte OpponentHandleLinkStandbyMsg
- .4byte OpponentHandleResetActionMoveSelection
- .4byte sub_8035FA4
- .4byte nullsub_46
-
-@ unreferenced unknown values
- .byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20
-
- .align 2
-gLinkOpponentBufferCommands:: @ 81FB048
- .4byte LinkOpponentHandleGetAttributes
- .4byte sub_803889C
- .4byte sub_80388A8
- .4byte sub_8039220
- .4byte sub_8039294
- .4byte sub_80393E4
- .4byte sub_80395B4
- .4byte sub_80396D0
- .4byte sub_80398A4
- .4byte sub_80398B0
- .4byte sub_803995C
- .4byte sub_8039A00
- .4byte sub_8039A0C
- .4byte sub_8039A18
- .4byte sub_8039A24
- .4byte sub_8039A30
- .4byte sub_8039CC8
- .4byte sub_8039D2C
- .4byte sub_8039D38
- .4byte sub_8039D44
- .4byte sub_8039D50
- .4byte sub_8039D5C
- .4byte sub_8039D68
- .4byte sub_8039D74
- .4byte sub_8039D80
- .4byte sub_8039E70
- .4byte sub_8039E7C
- .4byte sub_8039EF0
- .4byte sub_8039F58
- .4byte sub_8039F64
- .4byte sub_8039F70
- .4byte sub_8039F7C
- .4byte sub_8039F88
- .4byte sub_8039F94
- .4byte sub_8039FA0
- .4byte sub_8039FAC
- .4byte sub_8039FB8
- .4byte sub_8039FC4
- .4byte sub_8039FE0
- .4byte sub_803A018
- .4byte sub_803A030
- .4byte dp01t_29_4_blink
- .4byte sub_803A0C8
- .4byte sub_803A0D4
- .4byte sub_803A118
- .4byte sub_803A148
- .4byte dp01t_2E_4_battle_intro
- .4byte sub_803A1B8
- .4byte sub_803A3DC
- .4byte sub_803A520
- .4byte sub_803A56C
- .4byte sub_803A578
- .4byte bx_exec_buffer_A_ch0_tbl4
- .4byte sub_803A640
- .4byte sub_803A64C
- .4byte sub_803A658
- .4byte nullsub_48
-
-@ 81FB12C
- .include "data/battle_moves.inc"
-
- .align 2
-gUnknown_081FC1D0:: @ 81FC1D0
- .2byte 0x34, 0x10, 0x101
- .space 2
-
- .2byte -1, -1, -1
- .space 2
diff --git a/data/data2b.s b/data/data2b.s
new file mode 100644
index 000000000..ef16eaa25
--- /dev/null
+++ b/data/data2b.s
@@ -0,0 +1,296 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
+ .section .rodata
+
+ .string "ターン$" @ "turn"
+
+ .align 2
+gPlayerBufferCommands:: @ 81FAD98
+ .4byte PlayerHandleGetAttributes
+ .4byte sub_802ECF0
+ .4byte PlayerHandleSetAttributes
+ .4byte sub_802F7CC
+ .4byte PlayerHandleLoadPokeSprite
+ .4byte PlayerHandleSendOutPoke
+ .4byte PlayerHandleReturnPokeToBall
+ .4byte PlayerHandleTrainerThrow
+ .4byte PlayerHandleTrainerSlide
+ .4byte PlayerHandleTrainerSlideBack
+ .4byte sub_802FE7C
+ .4byte sub_802FF60
+ .4byte sub_802FF80
+ .4byte PlayerHandleBallThrow
+ .4byte PlayerHandlePuase
+ .4byte PlayerHandleMoveAnimation
+ .4byte PlayerHandlePrintString
+ .4byte PlayerHandlePrintStringPlayerOnly
+ .4byte sub_803037C
+ .4byte nullsub_42
+ .4byte sub_8030468
+ .4byte PlayerHandleOpenBag
+ .4byte sub_8030594
+ .4byte sub_8030674
+ .4byte PlayerHandleHealthBarUpdate
+ .4byte PlayerHandleExpBarUpdate
+ .4byte PlayerHandleStatusIconUpdate
+ .4byte PlayerHandleStatusAnimation
+ .4byte PlayerHandleStatusXor
+ .4byte sub_803097C
+ .4byte PlayerHandleDMATransfer
+ .4byte sub_8030A3C
+ .4byte sub_8030A6C
+ .4byte sub_8030A78
+ .4byte sub_8030A8C
+ .4byte sub_8030AA0
+ .4byte sub_8030AB4
+ .4byte sub_8030AC8
+ .4byte sub_8030AE4
+ .4byte sub_8030B1C
+ .4byte sub_8030B34
+ .4byte PlayerHandleHitAnimation
+ .4byte sub_8030BCC
+ .4byte PlayerHandleEffectivenessSound
+ .4byte sub_8030C1C
+ .4byte PlayerHandleFaintingCry
+ .4byte PlayerHandleIntroSlide
+ .4byte PlayerHandleTrainerBallThrow
+ .4byte sub_8030FAC
+ .4byte sub_80310A4
+ .4byte sub_80310F0
+ .4byte PlayerHandleSpriteInvisibility
+ .4byte PlayerHandleBattleAnimation
+ .4byte PlayerHandleLinkStandbyMsg
+ .4byte PlayerHandleResetActionMoveSelection
+ .4byte sub_80312A0
+ .4byte nullsub_43
+
+gUnknown_081FAE7C:: @ 81FAE7C
+ .byte 0, 2, 3, 1
+
+gUnknown_081FAE80:: @ 81FAE80
+ .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}$"
+
+gUnknown_081FAE89:: @ 81FAE89
+ .byte 8, 120
+ .byte 88, 120
+ .byte 8, 136
+ .byte 88, 136
+
+gUnknown_081FAE91:: @ 81FAE91
+ .byte 144, 120
+ .byte 190, 120
+ .byte 144, 136
+ .byte 190, 136
+ .byte 72, 72
+ .byte 32, 90
+ .byte 80, 80
+ .byte 80, 88
+
+ .align 2
+gUnknown_081FAEA4:: @ 81FAEA4
+ obj_tiles gSmokescreenImpactTiles, 0x180, 55019
+
+ .align 2
+gUnknown_081FAEAC:: @ 81FAEAC
+ obj_pal gSmokescreenImpactPalette, 55019
+
+ .align 2
+gOamData_81FAEB4:: @ 81FAEB4
+ .2byte 0x0000
+ .2byte 0x4000
+ .2byte 0x0400
+
+ .align 2
+gSpriteAnim_81FAEBC:: @ 81FAEBC
+ obj_image_anim_frame 0, 4
+ obj_image_anim_frame 4, 4
+ obj_image_anim_frame 8, 4
+ obj_image_anim_end
+
+ .align 2
+gSpriteAnim_81FAECC:: @ 81FAECC
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+ .align 2
+gSpriteAnim_81FAEDC:: @ 81FAEDC
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP
+ obj_image_anim_end
+
+ .align 2
+gSpriteAnim_81FAEEC:: @ 81FAEEC
+ obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
+ obj_image_anim_end
+
+ .align 2
+gSpriteAnimTable_81FAEFC:: @ 81FAEFC
+ .4byte gSpriteAnim_81FAEBC
+ .4byte gSpriteAnim_81FAECC
+ .4byte gSpriteAnim_81FAEDC
+ .4byte gSpriteAnim_81FAEEC
+
+ .align 2
+gSpriteTemplate_81FAF0C:: @ 81FAF0C
+ spr_template 55019, 55019, gOamData_81FAEB4, gSpriteAnimTable_81FAEFC, NULL, gDummySpriteAffineAnimTable, sub_80463CC
+
+ .align 2
+gUnknown_081FAF24:: @ 81FAF24
+ obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759
+
+ .align 2
+gOamData_81FAF2C:: @ 81FAF2C
+ .2byte 0x4000
+ .2byte 0x4000
+ .2byte 0x0C00
+
+ .align 2
+gSpriteTemplate_81FAF34:: @ 81FAF34
+ spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978
+
+ .align 2
+gUnknown_081FAF4C:: @ 81FAF4C
+ .4byte 0x02008000
+ .4byte 0x0200a000
+ .4byte 0x0200c000
+ .4byte 0x0200e000
+
+ .align 2
+gOpponentBufferCommands:: @ 81FAF5C
+ .4byte OpponentHandleGetAttributes
+ .4byte dp01t_01_2_read_pokmon_data_slice
+ .4byte OpponentHandleSetAttributes
+ .4byte sub_8034744
+ .4byte OpponentHandleLoadPokeSprite
+ .4byte OpponentHandleSendOutPoke
+ .4byte OpponentHandleReturnPokeToBall
+ .4byte OpponentHandleTrainerThrow
+ .4byte OpponentHandleTrainerSlide
+ .4byte OpponentHandleTrainerSlideBack
+ .4byte sub_8035030
+ .4byte sub_80350D4
+ .4byte sub_80350E0
+ .4byte OpponentHandleBallThrow
+ .4byte OpponentHandlePause
+ .4byte OpponentHandleMoveAnimation
+ .4byte OpponentHandlePrintString
+ .4byte OpponentHandlePrintStringPlayerOnly
+ .4byte sub_803540C
+ .4byte sub_803541C
+ .4byte sub_8035428
+ .4byte sub_8035590
+ .4byte sub_80355C0
+ .4byte sub_80356C0
+ .4byte OpponentHandleHealthBarUpdate
+ .4byte OpponentHandleExpBarUpdate
+ .4byte OpponentHandleStatusIconUpdate
+ .4byte OpponentHandleStatusAnimation
+ .4byte OpponentHandleStatusXor
+ .4byte sub_80358B0
+ .4byte OpponentHandleDMATransfer
+ .4byte sub_80358C8
+ .4byte sub_80358D4
+ .4byte sub_80358E0
+ .4byte sub_80358EC
+ .4byte sub_80358F8
+ .4byte sub_8035904
+ .4byte sub_8035910
+ .4byte sub_803592C
+ .4byte sub_8035964
+ .4byte sub_803597C
+ .4byte OpponentHandleHitAnimation
+ .4byte sub_8035A14
+ .4byte OpponentHandleEffectivenessSound
+ .4byte sub_8035A64
+ .4byte OpponentHandleFaintingCry
+ .4byte dp01t_2E_7_battle_intro
+ .4byte sub_8035B04
+ .4byte dp01t_30_7_0803D67C
+ .4byte sub_8035E6C
+ .4byte sub_8035EB8
+ .4byte OpponentHandleSpriteInvisibility
+ .4byte OpponentHandleBattleAnimation
+ .4byte OpponentHandleLinkStandbyMsg
+ .4byte OpponentHandleResetActionMoveSelection
+ .4byte sub_8035FA4
+ .4byte nullsub_46
+
+@ unreferenced unknown values
+ .byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20
+
+ .align 2
+gLinkOpponentBufferCommands:: @ 81FB048
+ .4byte LinkOpponentHandleGetAttributes
+ .4byte sub_803889C
+ .4byte sub_80388A8
+ .4byte sub_8039220
+ .4byte sub_8039294
+ .4byte sub_80393E4
+ .4byte sub_80395B4
+ .4byte sub_80396D0
+ .4byte sub_80398A4
+ .4byte sub_80398B0
+ .4byte sub_803995C
+ .4byte sub_8039A00
+ .4byte sub_8039A0C
+ .4byte sub_8039A18
+ .4byte sub_8039A24
+ .4byte sub_8039A30
+ .4byte sub_8039CC8
+ .4byte sub_8039D2C
+ .4byte sub_8039D38
+ .4byte sub_8039D44
+ .4byte sub_8039D50
+ .4byte sub_8039D5C
+ .4byte sub_8039D68
+ .4byte sub_8039D74
+ .4byte sub_8039D80
+ .4byte sub_8039E70
+ .4byte sub_8039E7C
+ .4byte sub_8039EF0
+ .4byte sub_8039F58
+ .4byte sub_8039F64
+ .4byte sub_8039F70
+ .4byte sub_8039F7C
+ .4byte sub_8039F88
+ .4byte sub_8039F94
+ .4byte sub_8039FA0
+ .4byte sub_8039FAC
+ .4byte sub_8039FB8
+ .4byte sub_8039FC4
+ .4byte sub_8039FE0
+ .4byte sub_803A018
+ .4byte sub_803A030
+ .4byte dp01t_29_4_blink
+ .4byte sub_803A0C8
+ .4byte sub_803A0D4
+ .4byte sub_803A118
+ .4byte sub_803A148
+ .4byte dp01t_2E_4_battle_intro
+ .4byte sub_803A1B8
+ .4byte sub_803A3DC
+ .4byte sub_803A520
+ .4byte sub_803A56C
+ .4byte sub_803A578
+ .4byte bx_exec_buffer_A_ch0_tbl4
+ .4byte sub_803A640
+ .4byte sub_803A64C
+ .4byte sub_803A658
+ .4byte nullsub_48
+
+@ 81FB12C
+ .include "data/battle_moves.inc"
+
+ .align 2
+gUnknown_081FC1D0:: @ 81FC1D0
+ .2byte 0x34, 0x10, 0x101
+ .space 2
+
+ .2byte -1, -1, -1
+ .space 2
diff --git a/data/diploma.s b/data/diploma.s
deleted file mode 100644
index 508e86c63..000000000
--- a/data/diploma.s
+++ /dev/null
@@ -1,5 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
diff --git a/data/event_scripts.s b/data/event_scripts.s
index d909f1006..d6702745a 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -433,16 +433,16 @@ EventScript_15F419:
compare RESULT, 0
jumpeq EventScript_15F384
closebutton
- special 10
+ special SecretBasePC_PackUp
releaseall
end
EventScript_15F432:
- special 14
+ special SecretBasePC_Decoration
end
EventScript_15F436:
- special 15
+ special SecretBasePC_Registry
end
gUnknown_0815F43A:: @ 815F43A
@@ -475,18 +475,18 @@ gUnknown_0815F49A:: @ 815F49A
end
EventScript_15F4A1:
- special 12
+ special sub_80BC56C
compare RESULT, 1
jumpeq EventScript_15F4E0
compare RESULT, 2
jumpeq EventScript_15F503
- special 303
+ special sub_80BC224
msgbox UnknownString_81A3958, 5
compare RESULT, 0
jumpeq EventScript_15F452
msgbox UnknownString_81A3A22, 3
- special 13
- special 26
+ special sub_80BC5BC
+ special sub_80C683C
releaseall
end
@@ -495,14 +495,14 @@ EventScript_15F4E0:
compare RESULT, 0
jumpeq EventScript_15F452
msgbox UnknownString_81A3A3A, 3
- special 13
- special 26
+ special sub_80BC5BC
+ special sub_80C683C
releaseall
end
EventScript_15F503:
msgbox UnknownString_81A39C0, 3
- special 26
+ special sub_80C683C
closebutton
releaseall
end
@@ -514,7 +514,7 @@ EventScript_15F511:
end
EventScript_15F51D:
- special 26
+ special sub_80C683C
closebutton
releaseall
end
@@ -525,7 +525,7 @@ gUnknown_0815F523:: @ 815F523
end
gUnknown_0815F528:: @ 815F528
- special 307
+ special GetShieldToyTVDecorationInfo
compare RESULT, 0
jumpeq EventScript_15F558
compare RESULT, 1
@@ -924,14 +924,14 @@ LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
SecretBase_RedCave1_EventScript_19F806:: @ 819F806
- special 93
+ special InitSaveDialog
waitstate
return
gUnknown_0819F80B:: @ 819F80B
lock
- special 56
- special 55
+ special PlayTrainerEncounterMusic
+ special sub_80847C8
waitstate
jump EventScript_19F8F2
@@ -940,11 +940,11 @@ gUnknown_0819F818:: @ 819F818
faceplayer
move LAST_TALKED, Movement_19F8F0
waitmove 0
- specialval RESULT, 54
+ specialval RESULT, sub_8082564
compare RESULT, 0
jumpif 5, EventScript_19F83F
- special 56
- special 314
+ special PlayTrainerEncounterMusic
+ special sub_8082524
jump EventScript_19F8F2
EventScript_19F83F:
@@ -954,18 +954,18 @@ gUnknown_0819F840:: @ 819F840
lock
faceplayer
call EventScript_19F8E5
- specialval RESULT, 54
+ specialval RESULT, sub_8082564
compare RESULT, 0
jumpif 5, EventScript_19F877
- special 61
+ special CheckForAlivePartyMons
compare RESULT, 0
jumpif 5, EventScript_19F870
- special 56
- special 314
+ special PlayTrainerEncounterMusic
+ special sub_8082524
jump EventScript_19F8F2
EventScript_19F870:
- special 53
+ special sub_8082718
waittext
waitbutton
release
@@ -977,21 +977,21 @@ EventScript_19F877:
gUnknown_0819F878:: @ 819F878
move LAST_TALKED, Movement_19F8F0
waitmove 0
- special 56
+ special PlayTrainerEncounterMusic
reptrainerbattle
endtrainerbattle
gUnknown_0819F887:: @ 819F887
call EventScript_19F8E5
- specialval RESULT, 58
+ specialval RESULT, sub_8082C9C
compare RESULT, 0
jumpeq EventScript_19F8AD
- special 56
- special 314
- special 52
+ special PlayTrainerEncounterMusic
+ special sub_8082524
+ special sub_80826D8
waittext
waitbutton
- special 59
+ special sub_80826B0
waitstate
releaseall
end
@@ -1000,18 +1000,18 @@ EventScript_19F8AD:
endtrainerbattle
gUnknown_0819F8AE:: @ 819F8AE
- specialval RESULT, 58
+ specialval RESULT, sub_8082C9C
compare RESULT, 0
jumpeq EventScript_19F8DD
- special 61
+ special CheckForAlivePartyMons
compare RESULT, 0
jumpif 5, EventScript_19F8DE
- special 56
- special 314
- special 52
+ special PlayTrainerEncounterMusic
+ special sub_8082524
+ special sub_80826D8
waittext
waitbutton
- special 59
+ special sub_80826B0
waitstate
releaseall
end
@@ -1020,7 +1020,7 @@ EventScript_19F8DD:
endtrainerbattle
EventScript_19F8DE:
- special 53
+ special sub_8082718
waittext
waitbutton
release
@@ -1036,11 +1036,11 @@ Movement_19F8F0::
step_end
EventScript_19F8F2:
- special 52
+ special sub_80826D8
waittext
waitbutton
reptrainerbattle
- specialval RESULT, 51
+ specialval RESULT, sub_8082558
compare RESULT, 0
jumpeq EventScript_19F934
compare RESULT, 2
@@ -1295,7 +1295,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
clearflag 751
clearflag 860
clearflag 861
- special 169
+ special sub_810FAA0
checkflag 291
callif 0, EverGrandeCity_HallOfFame_EventScript_19FC62
checkflag 255
@@ -1454,7 +1454,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
checkanimation 25
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
waitmove 0
- special 0
+ special HealPlayerParty
checkflag 273
jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0
@@ -1475,7 +1475,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
return
OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
- specialval RESULT, 308
+ specialval RESULT, IsPokerusInParty
compare RESULT, 1
jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDEA
compare RESULT, 0
@@ -1644,7 +1644,7 @@ HiddenItemScript_Success:
waitfanfare
waittext
msgbox Message_PutAwayItem
- special 0x96
+ special SetFlagInVar
releaseall
end
@@ -1665,7 +1665,7 @@ UnusedMixRecordsScript: @ 819FFD5
jumpeq UnusedMixRecordsScript_Done
jump UnusedMixRecordsScript_Done
UnusedMixRecordsScript_Yes: @ 819FFFA
- special 0x1B
+ special sub_80B929C
waitstate
lock
faceplayer
@@ -1679,7 +1679,7 @@ UnusedMixRecordsScript_Done: @ 81A0000
gUnknown_081A0009:: @ 81A0009
lockall
setvar 0x8004, 0
- special 214
+ special DoPCTurnOnEffect
playsfx 4
msgbox UnknownString_81A09EC, 4
jump EventScript_1A0023
@@ -1688,7 +1688,7 @@ gUnknown_081A0009:: @ 81A0009
EventScript_1A0023:
message gPCText_WhichPCShouldBeAccessed
waittext
- special 262
+ special TryCreatePCMenu
waitstate
jump EventScript_1A0033
end
@@ -1705,7 +1705,7 @@ EventScript_1A0033:
EventScript_1A0070:
playsfx 2
msgbox UnknownString_81A0A54, 4
- special 250
+ special PlayerPC
waitstate
jump EventScript_1A0023
end
@@ -1717,7 +1717,7 @@ EventScript_1A0085:
checkflag 2123
callif 1, EventScript_1A00B5
msgbox UnknownString_81A0A35, 4
- special 60
+ special ShowPokemonStorageSystem
waitstate
jump EventScript_1A0023
end
@@ -1733,7 +1733,7 @@ EventScript_1A00B5:
EventScript_1A00BE:
setvar 0x8004, 0
playsfx 3
- special 215
+ special DoPCTurnOffEffect
releaseall
end
@@ -1741,7 +1741,7 @@ EventScript_1A00CB:
checkflag 2052
jumpif 0, EventScript_1A00BE
playsfx 2
- special 263
+ special AccessHallOfFamePC
waitstate
jump EventScript_1A0033
end
@@ -1788,7 +1788,7 @@ Route123_BerryMastersHouse_EventScript_1A00F3:: @ 81A00F3
SlateportCity_OceanicMuseum_1F_EventScript_1A00F3:: @ 81A00F3
SlateportCity_PokemonFanClub_EventScript_1A00F3:: @ 81A00F3
fadescreen 1
- special 95
+ special sub_80E60D8
fadescreen 0
return
@@ -1804,7 +1804,7 @@ DewfordTown_EventScript_1A0102:: @ 81A0102
DewfordTown_Hall_EventScript_1A0102:: @ 81A0102
checkdailyflags
setvar 0x8004, 0
- special 126
+ special sub_80FA5BC
return
DewfordTown_EventScript_1A010C:: @ 81A010C
@@ -2111,7 +2111,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
fadescreen 1
fanfare 368
waitfanfare
- special 0
+ special HealPlayerParty
fadescreen 0
return
@@ -2119,7 +2119,7 @@ Event_WorldMap:: @ 81A02D6
lockall
msgbox UnknownString_817303D, 4
fadescreen 1
- special 251
+ special FieldShowRegionMap
waitstate
releaseall
end
@@ -2201,7 +2201,7 @@ Route101_EventScript_1A039B:: @ 81A039B
Route101_EventScript_1A03A5:: @ 81A03A5
copyvar 0x8004, 0x8009
- special 213
+ special ShowPokedexRatingMessage
waittext
waitbutton
return
@@ -2209,7 +2209,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5
EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0
Route101_EventScript_1A03B0:: @ 81A03B0
setvar 0x8004, 0
- specialval RESULT, 212
+ specialval RESULT, ScriptGetPokedexInfo
copyvar 0x8008, 0x8005
copyvar 0x8009, 0x8006
copyvar 0x800a, RESULT
@@ -2220,7 +2220,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0
compare 0x800a, 0
jumpeq Route101_EventScript_1A14DC
setvar 0x8004, 1
- specialval RESULT, 212
+ specialval RESULT, ScriptGetPokedexInfo
copyvar 0x8008, 0x8005
copyvar 0x8009, 0x8006
buffernum 0, 0x8008
@@ -2328,7 +2328,7 @@ CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3
CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3
setvar 0x8004, 1
setvar 0x8005, 1
- special 310
+ special sub_810F758
waitstate
releaseall
end
@@ -2533,7 +2533,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678
RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678
SlateportCity_House1_EventScript_1A0678:: @ 81A0678
fadescreen 1
- special 158
+ special sub_80BF9F8
waitstate
return
@@ -2568,7 +2568,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693
setmaptile 10, 2, 733, 1
setmaptile 11, 2, 734, 1
setmaptile 12, 2, 733, 1
- special 142
+ special DrawWholeMapView
return
EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710
@@ -2584,7 +2584,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710
setmaptile 5, 13, 526, 1
setmaptile 6, 13, 526, 1
setmaptile 7, 13, 526, 1
- special 142
+ special DrawWholeMapView
return
EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757
@@ -3256,7 +3256,7 @@ Event_NoRegisteredItem:: @ 81A14AF
gUnknown_081A14B8:: @ 81A14B8
lockall
- special 199
+ special ExecuteWhiteOut
waitstate
compare RESULT, 1
jumpeq EventScript_1A14CA
@@ -3267,10 +3267,10 @@ EventScript_1A14CA::
message UnknownString_81A1141
waittext
waitbutton
- special 332
+ special sub_8081924
waitstate
fadescreen 1
- special 200
+ special sp0C8_whiteout_maybe
waitstate
end
@@ -3600,8 +3600,8 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4
.string "Are you speechless?$"
gUnknown_081A2C51:: @ 81A2C51
- special 21
- special 7
+ special sub_80BB70C
+ special sub_80BB63C
compare RESULT, 1
jumpeq EventScript_1A2E45
checkattack MOVE_SECRET_POWER
@@ -3719,11 +3719,11 @@ EventScript_1A2DB8:
playsfx 9
setvar 0x4097, 0
setflag 173
- special 6
- special 8
+ special sub_80BB8CC
+ special sub_80BBAF0
setvar 0x8004, 0
setvar 0x8005, 0
- special 18
+ special sub_80BBDD0
setvar 0x4089, 1
waitstate
end
@@ -3737,13 +3737,13 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
jumpeq SecretBase_RedCave1_EventScript_1A2E08
closebutton
playsfx 9
- special 9
+ special sub_80BC440
end
SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
closebutton
setflag 96
- special 24
+ special sub_80BBC78
waitstate
end
@@ -3756,18 +3756,18 @@ gUnknown_081A2E14:: @ 81A2E14
lockall
setvar 0x4097, 1
playsfx 9
- special 11
+ special sub_80BC114
compare RESULT, 0
jumpeq EventScript_1A2E38
clearflag 173
- special 8
+ special sub_80BBAF0
setvar 0x4089, 0
waitstate
end
EventScript_1A2E38:
setflag 173
- special 8
+ special sub_80BBAF0
setvar 0x4089, 0
waitstate
end
@@ -3779,7 +3779,7 @@ EventScript_1A2E45:
setanimation 0, RESULT
setorcopyvar 0x8004, RESULT
lockall
- special 278
+ special GetSecretBaseNearbyMapName
msgbox UnknownString_81A3C71, 5
compare RESULT, 0
jumpeq EventScript_1A2F3A
@@ -3787,7 +3787,7 @@ EventScript_1A2E45:
compare RESULT, 0
jumpeq EventScript_1A2F3A
fadescreen 1
- special 330
+ special sub_80BC50C
closebutton
fadescreen 0
msgbox UnknownString_81A3CC9, 5
@@ -3857,7 +3857,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68
SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68
setvar 0x8004, 0
setvar 0x8005, 0
- special 18
+ special sub_80BBDD0
setvar 0x4089, 1
end
@@ -3867,7 +3867,7 @@ gUnknown_081A2F7B:: @ 81A2F7B
end
EventScript_1A2F86:
- special 19
+ special sub_80FF474
end
gUnknown_081A2F8A:: @ 81A2F8A
@@ -3876,7 +3876,7 @@ gUnknown_081A2F8A:: @ 81A2F8A
end
EventScript_1A2F95:
- special 23
+ special sub_8100A7C
compare RESULT, 1
jumpeq EventScript_1A2FBF
addvar 0x8004, 1
@@ -3914,7 +3914,7 @@ SecretBase_YellowCave1_EventScript_1A2FC0:: @ 81A2FC0
SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0
SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0
SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
- special 17
+ special sub_80BCE90
compare 0x8004, 0
jumpeq SecretBase_RedCave1_EventScript_1A3032
compare 0x8004, 1
@@ -3948,7 +3948,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A308F
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A308F
@@ -3963,7 +3963,7 @@ SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1B97, 2
end
@@ -3983,7 +3983,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A310B
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A310B
@@ -3998,7 +3998,7 @@ SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1F2E, 2
end
@@ -4018,7 +4018,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3187
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3187
@@ -4033,7 +4033,7 @@ SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2230, 2
end
@@ -4053,7 +4053,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3203
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3203
@@ -4068,7 +4068,7 @@ SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A258A, 2
end
@@ -4088,7 +4088,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A327F
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A327F
@@ -4103,7 +4103,7 @@ SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A28F4, 2
end
@@ -4123,7 +4123,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A32FB
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A32FB
@@ -4138,7 +4138,7 @@ SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A1D59, 2
end
@@ -4158,7 +4158,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3377
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3377
@@ -4173,7 +4173,7 @@ SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A20AE, 2
end
@@ -4193,7 +4193,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A33F3
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A33F3
@@ -4208,7 +4208,7 @@ SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2420, 2
end
@@ -4228,7 +4228,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A346F
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A346F
@@ -4243,7 +4243,7 @@ SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2736, 2
end
@@ -4263,7 +4263,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A34EB
setvar RESULT, 1
- special 25
+ special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A34EB
@@ -4278,7 +4278,7 @@ SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB
setvar RESULT, 0
- special 25
+ special sub_80BCE4C
hidebox 0, 0, 15, 10
msgbox SecretBase_RedCave1_Text_1A2AFB, 2
end
@@ -4288,12 +4288,12 @@ SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501
end
SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
- special 16
+ special sub_80BCE1C
setvar 0x8004, 1
setvar 0x8005, 0
- special 236
+ special sub_813556C
waitstate
- special 0
+ special HealPlayerParty
release
end
@@ -4378,14 +4378,14 @@ BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46
FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46
SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46
SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46
- special 68
+ special sub_80BDE48
inccounter GAME_STAT_GOT_INTERVIEWED
release
end
SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D
setvar 0x8005, 1
- special 67
+ special sub_80BF2C4
compare RESULT, 1
jumpeq SlateportCity_PokemonFanClub_EventScript_1ADED6
copyvar 0x8009, 0x8006
@@ -4430,7 +4430,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0
lock
faceplayer
setvar 0x8005, 2
- special 67
+ special sub_80BF2C4
compare RESULT, 1
jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96
copyvar 0x8009, 0x8006
@@ -4485,11 +4485,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96
SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0
lock
faceplayer
- specialval RESULT, 69
+ specialval RESULT, sub_80BF544
compare RESULT, 0
jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE4D
setvar 0x8005, 3
- special 67
+ special sub_80BF2C4
compare RESULT, 1
jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0AC
copyvar 0x8009, 0x8006
@@ -4566,7 +4566,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
checkflag 2
jumpeq FallarborTown_ContestLobby_EventScript_1AE17E
setvar 0x8005, 6
- special 67
+ special sub_80BF2C4
compare RESULT, 1
jumpeq FallarborTown_ContestLobby_EventScript_1AE17E
copyvar 0x8009, 0x8006
@@ -4598,7 +4598,7 @@ FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D
FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137
setvar 0x8004, 24
- special 70
+ special SetContestCategoryStringVarForInterview
msgbox FallarborTown_ContestLobby_Text_1A70A5, 4
setvar 0x8004, 11
copyvar 0x8005, 0x8009
@@ -4626,7 +4626,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188
compare 0x4086, 2
jumpif 5, FallarborTown_ContestLobby_EventScript_1AE1FE
setvar 0x8005, 6
- special 67
+ special sub_80BF2C4
compare RESULT, 1
jumpeq FallarborTown_ContestLobby_EventScript_1AE1FE
switch 0x4088
@@ -4663,7 +4663,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
checkflag 2
jumpeq BattleTower_Lobby_EventScript_1AE2E3
setvar 0x8005, 7
- special 67
+ special sub_80BF2C4
compare RESULT, 1
jumpeq BattleTower_Lobby_EventScript_1AE2E3
copyvar 0x8009, 0x8006
@@ -4732,7 +4732,7 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED
compare 0x40bc, 0
jumpeq BattleTower_Lobby_EventScript_1AE30F
setvar 0x8005, 7
- special 67
+ special sub_80BF2C4
compare RESULT, 1
jumpeq BattleTower_Lobby_EventScript_1AE30F
clearflag 918
@@ -4827,7 +4827,7 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC
end
MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA
- special 162
+ special PlayRoulette
waitstate
end
@@ -4900,7 +4900,7 @@ gUnknown_081C6BDE:: @ 81C6BDE
waitmove 0
playsfx 43
pause 60
- special 319
+ special sp13F_fall_to_last_warp
waitstate
end
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index 413ab351a..315217055 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -87,10 +87,10 @@ DoRockSmashMovement: @ 81B0F0C
move LAST_TALKED, RockSmashMovement
waitmove 0
disappear LAST_TALKED
- specialval RESULT, 298
+ specialval RESULT, sub_810F5BC
compare RESULT, 1
jumpeq DoRockSmashMovement_Done
- special 171
+ special RockSmashWildEncounter
compare RESULT, 0
jumpeq DoRockSmashMovement_Done
waitstate
diff --git a/data/graphics/pokemon/icon_palette_indices.inc b/data/graphics/pokemon/icon_palette_indices.inc
deleted file mode 100644
index f37ec2a7a..000000000
--- a/data/graphics/pokemon/icon_palette_indices.inc
+++ /dev/null
@@ -1,442 +0,0 @@
- .align 2
-gMonIconPaletteIndices:: @ 83BC400
- .byte 0 @ ??????????
- .byte 1 @ Bulbasaur
- .byte 1 @ Ivysaur
- .byte 1 @ Venusaur
- .byte 0 @ Charmander
- .byte 0 @ Charmeleon
- .byte 0 @ Charizard
- .byte 0 @ Squirtle
- .byte 2 @ Wartortle
- .byte 2 @ Blastoise
- .byte 1 @ Caterpie
- .byte 1 @ Metapod
- .byte 0 @ Butterfree
- .byte 1 @ Weedle
- .byte 2 @ Kakuna
- .byte 2 @ Beedrill
- .byte 0 @ Pidgey
- .byte 0 @ Pidgeotto
- .byte 0 @ Pidgeot
- .byte 2 @ Rattata
- .byte 1 @ Raticate
- .byte 0 @ Spearow
- .byte 0 @ Fearow
- .byte 2 @ Ekans
- .byte 2 @ Arbok
- .byte 2 @ Pikachu
- .byte 0 @ Raichu
- .byte 2 @ Sandshrew
- .byte 2 @ Sandslash
- .byte 2 @ Nidoran♀
- .byte 2 @ Nidorina
- .byte 2 @ Nidoqueen
- .byte 2 @ Nidoran♂
- .byte 2 @ Nidorino
- .byte 2 @ Nidoking
- .byte 0 @ Clefairy
- .byte 0 @ Clefable
- .byte 2 @ Vulpix
- .byte 1 @ Ninetales
- .byte 0 @ Jigglypuff
- .byte 0 @ Wigglytuff
- .byte 2 @ Zubat
- .byte 2 @ Golbat
- .byte 1 @ Oddish
- .byte 0 @ Gloom
- .byte 0 @ Vileplume
- .byte 0 @ Paras
- .byte 0 @ Parasect
- .byte 0 @ Venonat
- .byte 2 @ Venomoth
- .byte 2 @ Diglett
- .byte 2 @ Dugtrio
- .byte 1 @ Meowth
- .byte 1 @ Persian
- .byte 1 @ Psyduck
- .byte 2 @ Golduck
- .byte 1 @ Mankey
- .byte 2 @ Primeape
- .byte 0 @ Growlithe
- .byte 0 @ Arcanine
- .byte 0 @ Poliwag
- .byte 0 @ Poliwhirl
- .byte 0 @ Poliwrath
- .byte 2 @ Abra
- .byte 2 @ Kadabra
- .byte 2 @ Alakazam
- .byte 0 @ Machop
- .byte 2 @ Machoke
- .byte 0 @ Machamp
- .byte 1 @ Bellsprout
- .byte 1 @ Weepinbell
- .byte 1 @ Victreebel
- .byte 2 @ Tentacool
- .byte 2 @ Tentacruel
- .byte 1 @ Geodude
- .byte 1 @ Graveler
- .byte 1 @ Golem
- .byte 0 @ Ponyta
- .byte 0 @ Rapidash
- .byte 0 @ Slowpoke
- .byte 0 @ Slowbro
- .byte 0 @ Magnemite
- .byte 0 @ Magneton
- .byte 1 @ Farfetch'd
- .byte 2 @ Doduo
- .byte 2 @ Dodrio
- .byte 2 @ Seel
- .byte 2 @ Dewgong
- .byte 2 @ Grimer
- .byte 2 @ Muk
- .byte 2 @ Shellder
- .byte 2 @ Cloyster
- .byte 2 @ Gastly
- .byte 2 @ Haunter
- .byte 2 @ Gengar
- .byte 2 @ Onix
- .byte 2 @ Drowzee
- .byte 1 @ Hypno
- .byte 2 @ Krabby
- .byte 2 @ Kingler
- .byte 0 @ Voltorb
- .byte 0 @ Electrode
- .byte 0 @ Exeggcute
- .byte 1 @ Exeggutor
- .byte 1 @ Cubone
- .byte 1 @ Marowak
- .byte 2 @ Hitmonlee
- .byte 2 @ Hitmonchan
- .byte 1 @ Lickitung
- .byte 2 @ Koffing
- .byte 2 @ Weezing
- .byte 1 @ Rhyhorn
- .byte 1 @ Rhydon
- .byte 0 @ Chansey
- .byte 0 @ Tangela
- .byte 1 @ Kangaskhan
- .byte 0 @ Horsea
- .byte 0 @ Seadra
- .byte 0 @ Goldeen
- .byte 0 @ Seaking
- .byte 2 @ Staryu
- .byte 2 @ Starmie
- .byte 0 @ Mr. mime
- .byte 1 @ Scyther
- .byte 2 @ Jynx
- .byte 1 @ Electabuzz
- .byte 0 @ Magmar
- .byte 2 @ Pinsir
- .byte 2 @ Tauros
- .byte 0 @ Magikarp
- .byte 0 @ Gyarados
- .byte 2 @ Lapras
- .byte 2 @ Ditto
- .byte 2 @ Eevee
- .byte 0 @ Vaporeon
- .byte 0 @ Jolteon
- .byte 0 @ Flareon
- .byte 0 @ Porygon
- .byte 0 @ Omanyte
- .byte 0 @ Omastar
- .byte 2 @ Kabuto
- .byte 2 @ Kabutops
- .byte 0 @ Aerodactyl
- .byte 1 @ Snorlax
- .byte 0 @ Articuno
- .byte 0 @ Zapdos
- .byte 0 @ Moltres
- .byte 0 @ Dratini
- .byte 0 @ Dragonair
- .byte 2 @ Dragonite
- .byte 2 @ Mewtwo
- .byte 0 @ Mew
- .byte 1 @ Chikorita
- .byte 1 @ Bayleef
- .byte 1 @ Meganium
- .byte 1 @ Cyndaquil
- .byte 1 @ Quilava
- .byte 1 @ Typhlosion
- .byte 2 @ Totodile
- .byte 2 @ Croconaw
- .byte 2 @ Feraligatr
- .byte 2 @ Sentret
- .byte 2 @ Furret
- .byte 2 @ Hoothoot
- .byte 2 @ Noctowl
- .byte 0 @ Ledyba
- .byte 0 @ Ledian
- .byte 1 @ Spinarak
- .byte 0 @ Ariados
- .byte 2 @ Crobat
- .byte 2 @ Chinchou
- .byte 0 @ Lanturn
- .byte 0 @ Pichu
- .byte 0 @ Cleffa
- .byte 1 @ Igglybuff
- .byte 2 @ Togepi
- .byte 2 @ Togetic
- .byte 0 @ Natu
- .byte 0 @ Xatu
- .byte 2 @ Mareep
- .byte 0 @ Flaaffy
- .byte 0 @ Ampharos
- .byte 1 @ Bellossom
- .byte 2 @ Marill
- .byte 2 @ Azumarill
- .byte 1 @ Sudowoodo
- .byte 1 @ Politoed
- .byte 1 @ Hoppip
- .byte 1 @ Skiploom
- .byte 2 @ Jumpluff
- .byte 2 @ Aipom
- .byte 1 @ Sunkern
- .byte 1 @ Sunflora
- .byte 1 @ Yanma
- .byte 0 @ Wooper
- .byte 0 @ Quagsire
- .byte 2 @ Espeon
- .byte 2 @ Umbreon
- .byte 2 @ Murkrow
- .byte 0 @ Slowking
- .byte 0 @ Misdreavus
- .byte 0 @ Unown A
- .byte 0 @ Wobbuffet
- .byte 1 @ Girafarig
- .byte 0 @ Pineco
- .byte 2 @ Forretress
- .byte 2 @ Dunsparce
- .byte 2 @ Gligar
- .byte 0 @ Steelix
- .byte 0 @ Snubbull
- .byte 2 @ Granbull
- .byte 0 @ Qwilfish
- .byte 0 @ Scizor
- .byte 1 @ Shuckle
- .byte 2 @ Heracross
- .byte 0 @ Sneasel
- .byte 0 @ Teddiursa
- .byte 2 @ Ursaring
- .byte 0 @ Slugma
- .byte 0 @ Magcargo
- .byte 2 @ Swinub
- .byte 2 @ Piloswine
- .byte 0 @ Corsola
- .byte 0 @ Remoraid
- .byte 0 @ Octillery
- .byte 0 @ Delibird
- .byte 2 @ Mantine
- .byte 0 @ Skarmory
- .byte 0 @ Houndour
- .byte 0 @ Houndoom
- .byte 0 @ Kingdra
- .byte 0 @ Phanpy
- .byte 0 @ Donphan
- .byte 0 @ Porygon2
- .byte 2 @ Stantler
- .byte 1 @ Smeargle
- .byte 2 @ Tyrogue
- .byte 2 @ Hitmontop
- .byte 1 @ Smoochum
- .byte 1 @ Elekid
- .byte 1 @ Magby
- .byte 1 @ Miltank
- .byte 1 @ Blissey
- .byte 0 @ Raikou
- .byte 2 @ Entei
- .byte 0 @ Suicune
- .byte 1 @ Larvitar
- .byte 0 @ Pupitar
- .byte 1 @ Tyranitar
- .byte 0 @ Lugia
- .byte 1 @ Ho-Oh
- .byte 1 @ Celebi
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 1 @ Treecko
- .byte 0 @ Grovyle
- .byte 1 @ Sceptile
- .byte 0 @ Torchic
- .byte 0 @ Combusken
- .byte 0 @ Blaziken
- .byte 0 @ Mudkip
- .byte 0 @ Marshtomp
- .byte 0 @ Swampert
- .byte 2 @ Poochyena
- .byte 2 @ Mightyena
- .byte 2 @ Zigzagoon
- .byte 2 @ Linoone
- .byte 0 @ Wurmple
- .byte 2 @ Silcoon
- .byte 0 @ Beautifly
- .byte 2 @ Cascoon
- .byte 1 @ Dustox
- .byte 1 @ Lotad
- .byte 1 @ Lombre
- .byte 1 @ Ludicolo
- .byte 1 @ Seedot
- .byte 1 @ Nuzleaf
- .byte 0 @ Shiftry
- .byte 1 @ Nincada
- .byte 1 @ Ninjask
- .byte 1 @ Shedinja
- .byte 2 @ Taillow
- .byte 2 @ Swellow
- .byte 1 @ Shroomish
- .byte 1 @ Breloom
- .byte 1 @ Spinda
- .byte 0 @ Wingull
- .byte 0 @ Pelipper
- .byte 2 @ Surskit
- .byte 0 @ Masquerain
- .byte 2 @ Wailmer
- .byte 0 @ Wailord
- .byte 0 @ Skitty
- .byte 2 @ Delcatty
- .byte 1 @ Kecleon
- .byte 1 @ Baltoy
- .byte 0 @ Claydol
- .byte 0 @ Nosepass
- .byte 1 @ Torkoal
- .byte 2 @ Sableye
- .byte 0 @ Barboach
- .byte 0 @ Whiscash
- .byte 0 @ Luvdisc
- .byte 0 @ Corphish
- .byte 0 @ Crawdaunt
- .byte 2 @ Feebas
- .byte 0 @ Milotic
- .byte 0 @ Carvanha
- .byte 0 @ Sharpedo
- .byte 1 @ Trapinch
- .byte 1 @ Vibrava
- .byte 1 @ Flygon
- .byte 2 @ Makuhita
- .byte 1 @ Hariyama
- .byte 1 @ Electrike
- .byte 0 @ Manectric
- .byte 1 @ Numel
- .byte 0 @ Camerupt
- .byte 2 @ Spheal
- .byte 2 @ Sealeo
- .byte 0 @ Walrein
- .byte 1 @ Cacnea
- .byte 1 @ Cacturne
- .byte 2 @ Snorunt
- .byte 0 @ Glalie
- .byte 1 @ Lunatone
- .byte 0 @ Solrock
- .byte 2 @ Azurill
- .byte 0 @ Spoink
- .byte 2 @ Grumpig
- .byte 0 @ Plusle
- .byte 0 @ Minun
- .byte 2 @ Mawile
- .byte 0 @ Meditite
- .byte 0 @ Medicham
- .byte 0 @ Swablu
- .byte 0 @ Altaria
- .byte 0 @ Wynaut
- .byte 0 @ Duskull
- .byte 0 @ Dusclops
- .byte 0 @ Roselia
- .byte 2 @ Slakoth
- .byte 2 @ Vigoroth
- .byte 1 @ Slaking
- .byte 1 @ Gulpin
- .byte 2 @ Swalot
- .byte 1 @ Tropius
- .byte 0 @ Whismur
- .byte 2 @ Loudred
- .byte 2 @ Exploud
- .byte 0 @ Clamperl
- .byte 0 @ Huntail
- .byte 0 @ Gorebyss
- .byte 0 @ Absol
- .byte 0 @ Shuppet
- .byte 0 @ Banette
- .byte 2 @ Seviper
- .byte 0 @ Zangoose
- .byte 1 @ Relicanth
- .byte 2 @ Aron
- .byte 2 @ Lairon
- .byte 2 @ Aggron
- .byte 0 @ Castform
- .byte 0 @ Volbeat
- .byte 2 @ Illumise
- .byte 2 @ Lileep
- .byte 0 @ Cradily
- .byte 0 @ Anorith
- .byte 0 @ Armaldo
- .byte 1 @ Ralts
- .byte 1 @ Kirlia
- .byte 1 @ Gardevoir
- .byte 2 @ Bagon
- .byte 2 @ Shelgon
- .byte 0 @ Salamence
- .byte 0 @ Beldum
- .byte 0 @ Metang
- .byte 0 @ Metagross
- .byte 2 @ Regirock
- .byte 2 @ Regice
- .byte 2 @ Registeel
- .byte 2 @ Kyogre
- .byte 0 @ Groudon
- .byte 1 @ Rayquaza
- .byte 0 @ Latias
- .byte 2 @ Latios
- .byte 0 @ Jirachi
- .byte 0 @ Deoxys
- .byte 0 @ Chimecho
- .byte 1 @ Egg
- .byte 0 @ Unown B
- .byte 0 @ Unown C
- .byte 0 @ Unown D
- .byte 0 @ Unown E
- .byte 0 @ Unown F
- .byte 0 @ Unown G
- .byte 0 @ Unown H
- .byte 0 @ Unown I
- .byte 0 @ Unown J
- .byte 0 @ Unown K
- .byte 0 @ Unown L
- .byte 0 @ Unown M
- .byte 0 @ Unown N
- .byte 0 @ Unown O
- .byte 0 @ Unown P
- .byte 0 @ Unown Q
- .byte 0 @ Unown R
- .byte 0 @ Unown S
- .byte 0 @ Unown T
- .byte 0 @ Unown U
- .byte 0 @ Unown V
- .byte 0 @ Unown W
- .byte 0 @ Unown X
- .byte 0 @ Unown Y
- .byte 0 @ Unown Z
- .byte 0 @ Unown Exclamation Mark
- .byte 0 @ Unown Question Mark
diff --git a/data/graphics/pokemon/icon_palette_table.inc b/data/graphics/pokemon/icon_palette_table.inc
deleted file mode 100644
index d9da61ab2..000000000
--- a/data/graphics/pokemon/icon_palette_table.inc
+++ /dev/null
@@ -1,11 +0,0 @@
- .align 2
-gMonIconPaletteTable:: @ 83BC5B8
- obj_pal gMonIconPalettes + 0 * 32, 56000
- obj_pal gMonIconPalettes + 1 * 32, 56001
- obj_pal gMonIconPalettes + 2 * 32, 56002
-
-@ These palettes are actually part of the title screen BG palette and are not
-@ used for Pokémon icons.
- obj_pal gMonIconPalettes + 3 * 32, 56003
- obj_pal gMonIconPalettes + 4 * 32, 56004
- obj_pal gMonIconPalettes + 5 * 32, 56005
diff --git a/data/graphics/pokemon/icon_table.inc b/data/graphics/pokemon/icon_table.inc
deleted file mode 100644
index eeb064208..000000000
--- a/data/graphics/pokemon/icon_table.inc
+++ /dev/null
@@ -1,442 +0,0 @@
- .align 2
-gMonIconTable:: @ 83BBD20
- .4byte gMonIcon_Bulbasaur
- .4byte gMonIcon_Bulbasaur
- .4byte gMonIcon_Ivysaur
- .4byte gMonIcon_Venusaur
- .4byte gMonIcon_Charmander
- .4byte gMonIcon_Charmeleon
- .4byte gMonIcon_Charizard
- .4byte gMonIcon_Squirtle
- .4byte gMonIcon_Wartortle
- .4byte gMonIcon_Blastoise
- .4byte gMonIcon_Caterpie
- .4byte gMonIcon_Metapod
- .4byte gMonIcon_Butterfree
- .4byte gMonIcon_Weedle
- .4byte gMonIcon_Kakuna
- .4byte gMonIcon_Beedrill
- .4byte gMonIcon_Pidgey
- .4byte gMonIcon_Pidgeotto
- .4byte gMonIcon_Pidgeot
- .4byte gMonIcon_Rattata
- .4byte gMonIcon_Raticate
- .4byte gMonIcon_Spearow
- .4byte gMonIcon_Fearow
- .4byte gMonIcon_Ekans
- .4byte gMonIcon_Arbok
- .4byte gMonIcon_Pikachu
- .4byte gMonIcon_Raichu
- .4byte gMonIcon_Sandshrew
- .4byte gMonIcon_Sandslash
- .4byte gMonIcon_NidoranF
- .4byte gMonIcon_Nidorina
- .4byte gMonIcon_Nidoqueen
- .4byte gMonIcon_NidoranM
- .4byte gMonIcon_Nidorino
- .4byte gMonIcon_Nidoking
- .4byte gMonIcon_Clefairy
- .4byte gMonIcon_Clefable
- .4byte gMonIcon_Vulpix
- .4byte gMonIcon_Ninetales
- .4byte gMonIcon_Jigglypuff
- .4byte gMonIcon_Wigglytuff
- .4byte gMonIcon_Zubat
- .4byte gMonIcon_Golbat
- .4byte gMonIcon_Oddish
- .4byte gMonIcon_Gloom
- .4byte gMonIcon_Vileplume
- .4byte gMonIcon_Paras
- .4byte gMonIcon_Parasect
- .4byte gMonIcon_Venonat
- .4byte gMonIcon_Venomoth
- .4byte gMonIcon_Diglett
- .4byte gMonIcon_Dugtrio
- .4byte gMonIcon_Meowth
- .4byte gMonIcon_Persian
- .4byte gMonIcon_Psyduck
- .4byte gMonIcon_Golduck
- .4byte gMonIcon_Mankey
- .4byte gMonIcon_Primeape
- .4byte gMonIcon_Growlithe
- .4byte gMonIcon_Arcanine
- .4byte gMonIcon_Poliwag
- .4byte gMonIcon_Poliwhirl
- .4byte gMonIcon_Poliwrath
- .4byte gMonIcon_Abra
- .4byte gMonIcon_Kadabra
- .4byte gMonIcon_Alakazam
- .4byte gMonIcon_Machop
- .4byte gMonIcon_Machoke
- .4byte gMonIcon_Machamp
- .4byte gMonIcon_Bellsprout
- .4byte gMonIcon_Weepinbell
- .4byte gMonIcon_Victreebel
- .4byte gMonIcon_Tentacool
- .4byte gMonIcon_Tentacruel
- .4byte gMonIcon_Geodude
- .4byte gMonIcon_Graveler
- .4byte gMonIcon_Golem
- .4byte gMonIcon_Ponyta
- .4byte gMonIcon_Rapidash
- .4byte gMonIcon_Slowpoke
- .4byte gMonIcon_Slowbro
- .4byte gMonIcon_Magnemite
- .4byte gMonIcon_Magneton
- .4byte gMonIcon_Farfetchd
- .4byte gMonIcon_Doduo
- .4byte gMonIcon_Dodrio
- .4byte gMonIcon_Seel
- .4byte gMonIcon_Dewgong
- .4byte gMonIcon_Grimer
- .4byte gMonIcon_Muk
- .4byte gMonIcon_Shellder
- .4byte gMonIcon_Cloyster
- .4byte gMonIcon_Gastly
- .4byte gMonIcon_Haunter
- .4byte gMonIcon_Gengar
- .4byte gMonIcon_Onix
- .4byte gMonIcon_Drowzee
- .4byte gMonIcon_Hypno
- .4byte gMonIcon_Krabby
- .4byte gMonIcon_Kingler
- .4byte gMonIcon_Voltorb
- .4byte gMonIcon_Electrode
- .4byte gMonIcon_Exeggcute
- .4byte gMonIcon_Exeggutor
- .4byte gMonIcon_Cubone
- .4byte gMonIcon_Marowak
- .4byte gMonIcon_Hitmonlee
- .4byte gMonIcon_Hitmonchan
- .4byte gMonIcon_Lickitung
- .4byte gMonIcon_Koffing
- .4byte gMonIcon_Weezing
- .4byte gMonIcon_Rhyhorn
- .4byte gMonIcon_Rhydon
- .4byte gMonIcon_Chansey
- .4byte gMonIcon_Tangela
- .4byte gMonIcon_Kangaskhan
- .4byte gMonIcon_Horsea
- .4byte gMonIcon_Seadra
- .4byte gMonIcon_Goldeen
- .4byte gMonIcon_Seaking
- .4byte gMonIcon_Staryu
- .4byte gMonIcon_Starmie
- .4byte gMonIcon_Mrmime
- .4byte gMonIcon_Scyther
- .4byte gMonIcon_Jynx
- .4byte gMonIcon_Electabuzz
- .4byte gMonIcon_Magmar
- .4byte gMonIcon_Pinsir
- .4byte gMonIcon_Tauros
- .4byte gMonIcon_Magikarp
- .4byte gMonIcon_Gyarados
- .4byte gMonIcon_Lapras
- .4byte gMonIcon_Ditto
- .4byte gMonIcon_Eevee
- .4byte gMonIcon_Vaporeon
- .4byte gMonIcon_Jolteon
- .4byte gMonIcon_Flareon
- .4byte gMonIcon_Porygon
- .4byte gMonIcon_Omanyte
- .4byte gMonIcon_Omastar
- .4byte gMonIcon_Kabuto
- .4byte gMonIcon_Kabutops
- .4byte gMonIcon_Aerodactyl
- .4byte gMonIcon_Snorlax
- .4byte gMonIcon_Articuno
- .4byte gMonIcon_Zapdos
- .4byte gMonIcon_Moltres
- .4byte gMonIcon_Dratini
- .4byte gMonIcon_Dragonair
- .4byte gMonIcon_Dragonite
- .4byte gMonIcon_Mewtwo
- .4byte gMonIcon_Mew
- .4byte gMonIcon_Chikorita
- .4byte gMonIcon_Bayleef
- .4byte gMonIcon_Meganium
- .4byte gMonIcon_Cyndaquil
- .4byte gMonIcon_Quilava
- .4byte gMonIcon_Typhlosion
- .4byte gMonIcon_Totodile
- .4byte gMonIcon_Croconaw
- .4byte gMonIcon_Feraligatr
- .4byte gMonIcon_Sentret
- .4byte gMonIcon_Furret
- .4byte gMonIcon_Hoothoot
- .4byte gMonIcon_Noctowl
- .4byte gMonIcon_Ledyba
- .4byte gMonIcon_Ledian
- .4byte gMonIcon_Spinarak
- .4byte gMonIcon_Ariados
- .4byte gMonIcon_Crobat
- .4byte gMonIcon_Chinchou
- .4byte gMonIcon_Lanturn
- .4byte gMonIcon_Pichu
- .4byte gMonIcon_Cleffa
- .4byte gMonIcon_Igglybuff
- .4byte gMonIcon_Togepi
- .4byte gMonIcon_Togetic
- .4byte gMonIcon_Natu
- .4byte gMonIcon_Xatu
- .4byte gMonIcon_Mareep
- .4byte gMonIcon_Flaaffy
- .4byte gMonIcon_Ampharos
- .4byte gMonIcon_Bellossom
- .4byte gMonIcon_Marill
- .4byte gMonIcon_Azumarill
- .4byte gMonIcon_Sudowoodo
- .4byte gMonIcon_Politoed
- .4byte gMonIcon_Hoppip
- .4byte gMonIcon_Skiploom
- .4byte gMonIcon_Jumpluff
- .4byte gMonIcon_Aipom
- .4byte gMonIcon_Sunkern
- .4byte gMonIcon_Sunflora
- .4byte gMonIcon_Yanma
- .4byte gMonIcon_Wooper
- .4byte gMonIcon_Quagsire
- .4byte gMonIcon_Espeon
- .4byte gMonIcon_Umbreon
- .4byte gMonIcon_Murkrow
- .4byte gMonIcon_Slowking
- .4byte gMonIcon_Misdreavus
- .4byte gMonIcon_UnownA
- .4byte gMonIcon_Wobbuffet
- .4byte gMonIcon_Girafarig
- .4byte gMonIcon_Pineco
- .4byte gMonIcon_Forretress
- .4byte gMonIcon_Dunsparce
- .4byte gMonIcon_Gligar
- .4byte gMonIcon_Steelix
- .4byte gMonIcon_Snubbull
- .4byte gMonIcon_Granbull
- .4byte gMonIcon_Qwilfish
- .4byte gMonIcon_Scizor
- .4byte gMonIcon_Shuckle
- .4byte gMonIcon_Heracross
- .4byte gMonIcon_Sneasel
- .4byte gMonIcon_Teddiursa
- .4byte gMonIcon_Ursaring
- .4byte gMonIcon_Slugma
- .4byte gMonIcon_Magcargo
- .4byte gMonIcon_Swinub
- .4byte gMonIcon_Piloswine
- .4byte gMonIcon_Corsola
- .4byte gMonIcon_Remoraid
- .4byte gMonIcon_Octillery
- .4byte gMonIcon_Delibird
- .4byte gMonIcon_Mantine
- .4byte gMonIcon_Skarmory
- .4byte gMonIcon_Houndour
- .4byte gMonIcon_Houndoom
- .4byte gMonIcon_Kingdra
- .4byte gMonIcon_Phanpy
- .4byte gMonIcon_Donphan
- .4byte gMonIcon_Porygon2
- .4byte gMonIcon_Stantler
- .4byte gMonIcon_Smeargle
- .4byte gMonIcon_Tyrogue
- .4byte gMonIcon_Hitmontop
- .4byte gMonIcon_Smoochum
- .4byte gMonIcon_Elekid
- .4byte gMonIcon_Magby
- .4byte gMonIcon_Miltank
- .4byte gMonIcon_Blissey
- .4byte gMonIcon_Raikou
- .4byte gMonIcon_Entei
- .4byte gMonIcon_Suicune
- .4byte gMonIcon_Larvitar
- .4byte gMonIcon_Pupitar
- .4byte gMonIcon_Tyranitar
- .4byte gMonIcon_Lugia
- .4byte gMonIcon_HoOh
- .4byte gMonIcon_Celebi
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_Treecko
- .4byte gMonIcon_Grovyle
- .4byte gMonIcon_Sceptile
- .4byte gMonIcon_Torchic
- .4byte gMonIcon_Combusken
- .4byte gMonIcon_Blaziken
- .4byte gMonIcon_Mudkip
- .4byte gMonIcon_Marshtomp
- .4byte gMonIcon_Swampert
- .4byte gMonIcon_Poochyena
- .4byte gMonIcon_Mightyena
- .4byte gMonIcon_Zigzagoon
- .4byte gMonIcon_Linoone
- .4byte gMonIcon_Wurmple
- .4byte gMonIcon_Silcoon
- .4byte gMonIcon_Beautifly
- .4byte gMonIcon_Cascoon
- .4byte gMonIcon_Dustox
- .4byte gMonIcon_Lotad
- .4byte gMonIcon_Lombre
- .4byte gMonIcon_Ludicolo
- .4byte gMonIcon_Seedot
- .4byte gMonIcon_Nuzleaf
- .4byte gMonIcon_Shiftry
- .4byte gMonIcon_Nincada
- .4byte gMonIcon_Ninjask
- .4byte gMonIcon_Shedinja
- .4byte gMonIcon_Taillow
- .4byte gMonIcon_Swellow
- .4byte gMonIcon_Shroomish
- .4byte gMonIcon_Breloom
- .4byte gMonIcon_Spinda
- .4byte gMonIcon_Wingull
- .4byte gMonIcon_Pelipper
- .4byte gMonIcon_Surskit
- .4byte gMonIcon_Masquerain
- .4byte gMonIcon_Wailmer
- .4byte gMonIcon_Wailord
- .4byte gMonIcon_Skitty
- .4byte gMonIcon_Delcatty
- .4byte gMonIcon_Kecleon
- .4byte gMonIcon_Baltoy
- .4byte gMonIcon_Claydol
- .4byte gMonIcon_Nosepass
- .4byte gMonIcon_Torkoal
- .4byte gMonIcon_Sableye
- .4byte gMonIcon_Barboach
- .4byte gMonIcon_Whiscash
- .4byte gMonIcon_Luvdisc
- .4byte gMonIcon_Corphish
- .4byte gMonIcon_Crawdaunt
- .4byte gMonIcon_Feebas
- .4byte gMonIcon_Milotic
- .4byte gMonIcon_Carvanha
- .4byte gMonIcon_Sharpedo
- .4byte gMonIcon_Trapinch
- .4byte gMonIcon_Vibrava
- .4byte gMonIcon_Flygon
- .4byte gMonIcon_Makuhita
- .4byte gMonIcon_Hariyama
- .4byte gMonIcon_Electrike
- .4byte gMonIcon_Manectric
- .4byte gMonIcon_Numel
- .4byte gMonIcon_Camerupt
- .4byte gMonIcon_Spheal
- .4byte gMonIcon_Sealeo
- .4byte gMonIcon_Walrein
- .4byte gMonIcon_Cacnea
- .4byte gMonIcon_Cacturne
- .4byte gMonIcon_Snorunt
- .4byte gMonIcon_Glalie
- .4byte gMonIcon_Lunatone
- .4byte gMonIcon_Solrock
- .4byte gMonIcon_Azurill
- .4byte gMonIcon_Spoink
- .4byte gMonIcon_Grumpig
- .4byte gMonIcon_Plusle
- .4byte gMonIcon_Minun
- .4byte gMonIcon_Mawile
- .4byte gMonIcon_Meditite
- .4byte gMonIcon_Medicham
- .4byte gMonIcon_Swablu
- .4byte gMonIcon_Altaria
- .4byte gMonIcon_Wynaut
- .4byte gMonIcon_Duskull
- .4byte gMonIcon_Dusclops
- .4byte gMonIcon_Roselia
- .4byte gMonIcon_Slakoth
- .4byte gMonIcon_Vigoroth
- .4byte gMonIcon_Slaking
- .4byte gMonIcon_Gulpin
- .4byte gMonIcon_Swalot
- .4byte gMonIcon_Tropius
- .4byte gMonIcon_Whismur
- .4byte gMonIcon_Loudred
- .4byte gMonIcon_Exploud
- .4byte gMonIcon_Clamperl
- .4byte gMonIcon_Huntail
- .4byte gMonIcon_Gorebyss
- .4byte gMonIcon_Absol
- .4byte gMonIcon_Shuppet
- .4byte gMonIcon_Banette
- .4byte gMonIcon_Seviper
- .4byte gMonIcon_Zangoose
- .4byte gMonIcon_Relicanth
- .4byte gMonIcon_Aron
- .4byte gMonIcon_Lairon
- .4byte gMonIcon_Aggron
- .4byte gMonIcon_Castform
- .4byte gMonIcon_Volbeat
- .4byte gMonIcon_Illumise
- .4byte gMonIcon_Lileep
- .4byte gMonIcon_Cradily
- .4byte gMonIcon_Anorith
- .4byte gMonIcon_Armaldo
- .4byte gMonIcon_Ralts
- .4byte gMonIcon_Kirlia
- .4byte gMonIcon_Gardevoir
- .4byte gMonIcon_Bagon
- .4byte gMonIcon_Shelgon
- .4byte gMonIcon_Salamence
- .4byte gMonIcon_Beldum
- .4byte gMonIcon_Metang
- .4byte gMonIcon_Metagross
- .4byte gMonIcon_Regirock
- .4byte gMonIcon_Regice
- .4byte gMonIcon_Registeel
- .4byte gMonIcon_Kyogre
- .4byte gMonIcon_Groudon
- .4byte gMonIcon_Rayquaza
- .4byte gMonIcon_Latias
- .4byte gMonIcon_Latios
- .4byte gMonIcon_Jirachi
- .4byte gMonIcon_Deoxys
- .4byte gMonIcon_Chimecho
- .4byte gMonIcon_Egg
- .4byte gMonIcon_UnownB
- .4byte gMonIcon_UnownC
- .4byte gMonIcon_UnownD
- .4byte gMonIcon_UnownE
- .4byte gMonIcon_UnownF
- .4byte gMonIcon_UnownG
- .4byte gMonIcon_UnownH
- .4byte gMonIcon_UnownI
- .4byte gMonIcon_UnownJ
- .4byte gMonIcon_UnownK
- .4byte gMonIcon_UnownL
- .4byte gMonIcon_UnownM
- .4byte gMonIcon_UnownN
- .4byte gMonIcon_UnownO
- .4byte gMonIcon_UnownP
- .4byte gMonIcon_UnownQ
- .4byte gMonIcon_UnownR
- .4byte gMonIcon_UnownS
- .4byte gMonIcon_UnownT
- .4byte gMonIcon_UnownU
- .4byte gMonIcon_UnownV
- .4byte gMonIcon_UnownW
- .4byte gMonIcon_UnownX
- .4byte gMonIcon_UnownY
- .4byte gMonIcon_UnownZ
- .4byte gMonIcon_UnownExclamationMark
- .4byte gMonIcon_UnownQuestionMark
diff --git a/data/item.s b/data/item.s
deleted file mode 100644
index 0c2aa8593..000000000
--- a/data/item.s
+++ /dev/null
@@ -1,10 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-@ 83C2028
- .include "data/text/item_descriptions.inc"
-
-@ 83C5564
- .include "data/items.inc"
diff --git a/data/items.inc b/data/items.inc
deleted file mode 100644
index 0074a6bfa..000000000
--- a/data/items.inc
+++ /dev/null
@@ -1,5236 +0,0 @@
- .align 2
-gItems:: @ 83C5564
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MASTER BALL$", 14
- .2byte ITEM_MASTER_BALL
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_MasterBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 0
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 0
-
- .string "ULTRA BALL$", 14
- .2byte ITEM_ULTRA_BALL
- .2byte 1200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_UltraBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 1
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 1
-
- .string "GREAT BALL$", 14
- .2byte ITEM_GREAT_BALL
- .2byte 600 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_GreatBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 2
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 2
-
- .string "POKé BALL$", 14
- .2byte ITEM_POKE_BALL
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PokeBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 3
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 3
-
- .string "SAFARI BALL$", 14
- .2byte ITEM_SAFARI_BALL
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_SafariBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 4
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 4
-
- .string "NET BALL$", 14
- .2byte ITEM_NET_BALL
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_NetBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 5
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 5
-
- .string "DIVE BALL$", 14
- .2byte ITEM_DIVE_BALL
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_DiveBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 6
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 6
-
- .string "NEST BALL$", 14
- .2byte ITEM_NEST_BALL
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_NestBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 7
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 7
-
- .string "REPEAT BALL$", 14
- .2byte ITEM_REPEAT_BALL
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RepeatBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 8
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 8
-
- .string "TIMER BALL$", 14
- .2byte ITEM_TIMER_BALL
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TimerBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 9
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 9
-
- .string "LUXURY BALL$", 14
- .2byte ITEM_LUXURY_BALL
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_LuxuryBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 10
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 10
-
- .string "PREMIER BALL$", 14
- .2byte ITEM_PREMIER_BALL
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PremierBall
- .byte 0
- .byte 0
- .byte POCKET_POKE_BALLS
- .byte 11
- .4byte NULL
- .4byte 2
- .4byte ItemUseInBattle_PokeBall
- .4byte 11
-
- .string "POTION$", 14
- .2byte ITEM_POTION
- .2byte 300 @ price
- .byte HOLD_EFFECT_NONE
- .byte 20
- .4byte gItemDescription_Potion
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "ANTIDOTE$", 14
- .2byte ITEM_ANTIDOTE
- .2byte 100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Antidote
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "BURN HEAL$", 14
- .2byte ITEM_BURN_HEAL
- .2byte 250 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BurnHeal
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "ICE HEAL$", 14
- .2byte ITEM_ICE_HEAL
- .2byte 250 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_IceHeal
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "AWAKENING$", 14
- .2byte ITEM_AWAKENING
- .2byte 250 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Awakening
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "PARLYZ HEAL$", 14
- .2byte ITEM_PARALYZE_HEAL
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_ParalyzeHeal
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "FULL RESTORE$", 14
- .2byte ITEM_FULL_RESTORE
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 255
- .4byte gItemDescription_FullRestore
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "MAX POTION$", 14
- .2byte ITEM_MAX_POTION
- .2byte 2500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 255
- .4byte gItemDescription_MaxPotion
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "HYPER POTION$", 14
- .2byte ITEM_HYPER_POTION
- .2byte 1200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 200
- .4byte gItemDescription_HyperPotion
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "SUPER POTION$", 14
- .2byte ITEM_SUPER_POTION
- .2byte 700 @ price
- .byte HOLD_EFFECT_NONE
- .byte 50
- .4byte gItemDescription_SuperPotion
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "FULL HEAL$", 14
- .2byte ITEM_FULL_HEAL
- .2byte 600 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_FullHeal
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "REVIVE$", 14
- .2byte ITEM_REVIVE
- .2byte 1500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Revive
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "MAX REVIVE$", 14
- .2byte ITEM_MAX_REVIVE
- .2byte 4000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_MaxRevive
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "FRESH WATER$", 14
- .2byte ITEM_FRESH_WATER
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 50
- .4byte gItemDescription_FreshWater
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "SODA POP$", 14
- .2byte ITEM_SODA_POP
- .2byte 300 @ price
- .byte HOLD_EFFECT_NONE
- .byte 60
- .4byte gItemDescription_SodaPop
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "LEMONADE$", 14
- .2byte ITEM_LEMONADE
- .2byte 350 @ price
- .byte HOLD_EFFECT_NONE
- .byte 80
- .4byte gItemDescription_Lemonade
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "MOOMOO MILK$", 14
- .2byte ITEM_MOOMOO_MILK
- .2byte 500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 100
- .4byte gItemDescription_MoomooMilk
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "ENERGYPOWDER$", 14
- .2byte ITEM_ENERGY_POWDER
- .2byte 500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_EnergyPowder
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "ENERGY ROOT$", 14
- .2byte ITEM_ENERGY_ROOT
- .2byte 800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_EnergyRoot
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "HEAL POWDER$", 14
- .2byte ITEM_HEAL_POWDER
- .2byte 450 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HealPowder
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "REVIVAL HERB$", 14
- .2byte ITEM_REVIVAL_HERB
- .2byte 2800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RevivalHerb
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "ETHER$", 14
- .2byte ITEM_ETHER
- .2byte 1200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 10
- .4byte gItemDescription_Ether
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_PPRecovery
- .4byte 1
- .4byte ItemUseInBattle_PPRecovery
- .4byte 0
-
- .string "MAX ETHER$", 14
- .2byte ITEM_MAX_ETHER
- .2byte 2000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 255
- .4byte gItemDescription_MaxEther
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_PPRecovery
- .4byte 1
- .4byte ItemUseInBattle_PPRecovery
- .4byte 0
-
- .string "ELIXIR$", 14
- .2byte ITEM_ELIXIR
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 10
- .4byte gItemDescription_Elixir
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_PPRecovery
- .4byte 1
- .4byte ItemUseInBattle_PPRecovery
- .4byte 0
-
- .string "MAX ELIXIR$", 14
- .2byte ITEM_MAX_ELIXIR
- .2byte 4500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 255
- .4byte gItemDescription_MaxElixir
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_PPRecovery
- .4byte 1
- .4byte ItemUseInBattle_PPRecovery
- .4byte 0
-
- .string "LAVA COOKIE$", 14
- .2byte ITEM_LAVA_COOKIE
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_LavaCookie
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "BLUE FLUTE$", 14
- .2byte ITEM_BLUE_FLUTE
- .2byte 100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BlueFlute
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "YELLOW FLUTE$", 14
- .2byte ITEM_YELLOW_FLUTE
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_YellowFlute
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "RED FLUTE$", 14
- .2byte ITEM_RED_FLUTE
- .2byte 300 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RedFlute
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "BLACK FLUTE$", 14
- .2byte ITEM_BLACK_FLUTE
- .2byte 400 @ price
- .byte HOLD_EFFECT_NONE
- .byte 50
- .4byte gItemDescription_BlackFlute
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_BlackWhiteFlute
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "WHITE FLUTE$", 14
- .2byte ITEM_WHITE_FLUTE
- .2byte 500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 150
- .4byte gItemDescription_WhiteFlute
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_BlackWhiteFlute
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BERRY JUICE$", 14
- .2byte ITEM_BERRY_JUICE
- .2byte 100 @ price
- .byte HOLD_EFFECT_RESTORE_HP
- .byte 20
- .4byte gItemDescription_BerryJuice
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "SACRED ASH$", 14
- .2byte ITEM_SACRED_ASH
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_SacredAsh
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_SacredAsh
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SHOAL SALT$", 14
- .2byte ITEM_SHOAL_SALT
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_ShoalSalt
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SHOAL SHELL$", 14
- .2byte ITEM_SHOAL_SHELL
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_ShoalShell
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RED SHARD$", 14
- .2byte ITEM_RED_SHARD
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RedShard
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BLUE SHARD$", 14
- .2byte ITEM_BLUE_SHARD
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BlueShard
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "YELLOW SHARD$", 14
- .2byte ITEM_YELLOW_SHARD
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_YellowShard
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "GREEN SHARD$", 14
- .2byte ITEM_GREEN_SHARD
- .2byte 200 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_GreenShard
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HP UP$", 14
- .2byte ITEM_HP_UP
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HPUp
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "PROTEIN$", 14
- .2byte ITEM_PROTEIN
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Protein
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "IRON$", 14
- .2byte ITEM_IRON
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Iron
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "CARBOS$", 14
- .2byte ITEM_CARBOS
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Carbos
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "CALCIUM$", 14
- .2byte ITEM_CALCIUM
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Calcium
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RARE CANDY$", 14
- .2byte ITEM_RARE_CANDY
- .2byte 4800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RareCandy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_RareCandy
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "PP UP$", 14
- .2byte ITEM_PP_UP
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PPUp
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_PPUp
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "ZINC$", 14
- .2byte ITEM_ZINC
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Zinc
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "PP MAX$", 14
- .2byte ITEM_PP_MAX
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PPMax
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_PPUp
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "GUARD SPEC.$", 14
- .2byte ITEM_GUARD_SPEC
- .2byte 700 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_GuardSpec
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_StatIncrease
- .4byte 0
-
- .string "DIRE HIT$", 14
- .2byte ITEM_DIRE_HIT
- .2byte 650 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_DireHit
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_StatIncrease
- .4byte 0
-
- .string "X ATTACK$", 14
- .2byte ITEM_X_ATTACK
- .2byte 500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_XAttack
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_StatIncrease
- .4byte 0
-
- .string "X DEFEND$", 14
- .2byte ITEM_X_DEFEND
- .2byte 550 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_XDefend
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_StatIncrease
- .4byte 0
-
- .string "X SPEED$", 14
- .2byte ITEM_X_SPEED
- .2byte 350 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_XSpeed
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_StatIncrease
- .4byte 0
-
- .string "X ACCURACY$", 14
- .2byte ITEM_X_ACCURACY
- .2byte 950 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_XAccuracy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_StatIncrease
- .4byte 0
-
- .string "X SPECIAL$", 14
- .2byte ITEM_X_SPECIAL
- .2byte 350 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_XSpecial
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_StatIncrease
- .4byte 0
-
- .string "POKé DOLL$", 14
- .2byte ITEM_POKE_DOLL
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PokeDoll
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_Escape
- .4byte 0
-
- .string "FLUFFY TAIL$", 14
- .2byte ITEM_FLUFFY_TAIL
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_FluffyTail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 2
- .4byte ItemUseInBattle_Escape
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SUPER REPEL$", 14
- .2byte ITEM_SUPER_REPEL
- .2byte 500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 200
- .4byte gItemDescription_SuperRepel
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_Repel
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MAX REPEL$", 14
- .2byte ITEM_MAX_REPEL
- .2byte 700 @ price
- .byte HOLD_EFFECT_NONE
- .byte 250
- .4byte gItemDescription_MaxRepel
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_Repel
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "ESCAPE ROPE$", 14
- .2byte ITEM_ESCAPE_ROPE
- .2byte 550 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_EscapeRope
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 2
- .4byte ItemUseOutOfBattle_EscapeRope
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "REPEL$", 14
- .2byte ITEM_REPEL
- .2byte 350 @ price
- .byte HOLD_EFFECT_NONE
- .byte 100
- .4byte gItemDescription_Repel
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_Repel
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SUN STONE$", 14
- .2byte ITEM_SUN_STONE
- .2byte 2100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_SunStone
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_EvolutionStone
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MOON STONE$", 14
- .2byte ITEM_MOON_STONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_MoonStone
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_EvolutionStone
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "FIRE STONE$", 14
- .2byte ITEM_FIRE_STONE
- .2byte 2100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_FireStone
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_EvolutionStone
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "THUNDERSTONE$", 14
- .2byte ITEM_THUNDER_STONE
- .2byte 2100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_ThunderStone
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_EvolutionStone
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "WATER STONE$", 14
- .2byte ITEM_WATER_STONE
- .2byte 2100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_WaterStone
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_EvolutionStone
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LEAF STONE$", 14
- .2byte ITEM_LEAF_STONE
- .2byte 2100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_LeafStone
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 1
- .4byte ItemUseOutOfBattle_EvolutionStone
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TINYMUSHROOM$", 14
- .2byte ITEM_TINY_MUSHROOM
- .2byte 500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TinyMushroom
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BIG MUSHROOM$", 14
- .2byte ITEM_BIG_MUSHROOM
- .2byte 5000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BigMushroom
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "PEARL$", 14
- .2byte ITEM_PEARL
- .2byte 1400 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Pearl
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BIG PEARL$", 14
- .2byte ITEM_BIG_PEARL
- .2byte 7500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BigPearl
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "STARDUST$", 14
- .2byte ITEM_STARDUST
- .2byte 2000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Stardust
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "STAR PIECE$", 14
- .2byte ITEM_STAR_PIECE
- .2byte 9800 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_StarPiece
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "NUGGET$", 14
- .2byte ITEM_NUGGET
- .2byte 10000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Nugget
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HEART SCALE$", 14
- .2byte ITEM_HEART_SCALE
- .2byte 100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HeartScale
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "ORANGE MAIL$", 14
- .2byte ITEM_ORANGE_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_OrangeMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HARBOR MAIL$", 14
- .2byte ITEM_HARBOR_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HarborMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 1
-
- .string "GLITTER MAIL$", 14
- .2byte ITEM_GLITTER_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_GlitterMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 2
-
- .string "MECH MAIL$", 14
- .2byte ITEM_MECH_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_MechMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 3
-
- .string "WOOD MAIL$", 14
- .2byte ITEM_WOOD_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_WoodMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 4
-
- .string "WAVE MAIL$", 14
- .2byte ITEM_WAVE_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_WaveMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 5
-
- .string "BEAD MAIL$", 14
- .2byte ITEM_BEAD_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BeadMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 6
-
- .string "SHADOW MAIL$", 14
- .2byte ITEM_SHADOW_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_ShadowMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 7
-
- .string "TROPIC MAIL$", 14
- .2byte ITEM_TROPIC_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TropicMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 8
-
- .string "DREAM MAIL$", 14
- .2byte ITEM_DREAM_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_DreamMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 9
-
- .string "FAB MAIL$", 14
- .2byte ITEM_FAB_MAIL
- .2byte 50 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_FabMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 10
-
- .string "RETRO MAIL$", 14
- .2byte ITEM_RETRO_MAIL
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RetroMail
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 0
- .4byte ItemUseOutOfBattle_Mail
- .4byte 0
- .4byte NULL
- .4byte 11
-
- .string "CHERI BERRY$", 14
- .2byte ITEM_CHERI_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CURE_PAR
- .byte 0
- .4byte gItemDescription_CheriBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "CHESTO BERRY$", 14
- .2byte ITEM_CHESTO_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CURE_SLP
- .byte 0
- .4byte gItemDescription_ChestoBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "PECHA BERRY$", 14
- .2byte ITEM_PECHA_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CURE_PSN
- .byte 0
- .4byte gItemDescription_PechaBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "RAWST BERRY$", 14
- .2byte ITEM_RAWST_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CURE_BRN
- .byte 0
- .4byte gItemDescription_RawstBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "ASPEAR BERRY$", 14
- .2byte ITEM_ASPEAR_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CURE_FRZ
- .byte 0
- .4byte gItemDescription_AspearBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "LEPPA BERRY$", 14
- .2byte ITEM_LEPPA_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_RESTORE_PP
- .byte 10
- .4byte gItemDescription_LeppaBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_PPRecovery
- .4byte 1
- .4byte ItemUseInBattle_PPRecovery
- .4byte 0
-
- .string "ORAN BERRY$", 14
- .2byte ITEM_ORAN_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_RESTORE_HP
- .byte 10
- .4byte gItemDescription_OranBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "PERSIM BERRY$", 14
- .2byte ITEM_PERSIM_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CURE_CONFUSION
- .byte 0
- .4byte gItemDescription_PersimBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "LUM BERRY$", 14
- .2byte ITEM_LUM_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CURE_STATUS
- .byte 0
- .4byte gItemDescription_LumBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "SITRUS BERRY$", 14
- .2byte ITEM_SITRUS_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_RESTORE_HP
- .byte 30
- .4byte gItemDescription_SitrusBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 1
- .4byte ItemUseOutOfBattle_Medicine
- .4byte 1
- .4byte ItemUseInBattle_Medicine
- .4byte 0
-
- .string "FIGY BERRY$", 14
- .2byte ITEM_FIGY_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CONFUSE_SPICY
- .byte 8
- .4byte gItemDescription_FigyBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "WIKI BERRY$", 14
- .2byte ITEM_WIKI_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CONFUSE_DRY
- .byte 8
- .4byte gItemDescription_WikiBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MAGO BERRY$", 14
- .2byte ITEM_MAGO_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CONFUSE_SWEET
- .byte 8
- .4byte gItemDescription_MagoBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "AGUAV BERRY$", 14
- .2byte ITEM_AGUAV_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CONFUSE_BITTER
- .byte 8
- .4byte gItemDescription_AguavBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "IAPAPA BERRY$", 14
- .2byte ITEM_IAPAPA_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CONFUSE_SOUR
- .byte 8
- .4byte gItemDescription_IapapaBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RAZZ BERRY$", 14
- .2byte ITEM_RAZZ_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RazzBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BLUK BERRY$", 14
- .2byte ITEM_BLUK_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BlukBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "NANAB BERRY$", 14
- .2byte ITEM_NANAB_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_NanabBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "WEPEAR BERRY$", 14
- .2byte ITEM_WEPEAR_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_WepearBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "PINAP BERRY$", 14
- .2byte ITEM_PINAP_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PinapBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "POMEG BERRY$", 14
- .2byte ITEM_POMEG_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PomegBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "KELPSY BERRY$", 14
- .2byte ITEM_KELPSY_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_KelpsyBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "QUALOT BERRY$", 14
- .2byte ITEM_QUALOT_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_QualotBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HONDEW BERRY$", 14
- .2byte ITEM_HONDEW_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HondewBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "GREPA BERRY$", 14
- .2byte ITEM_GREPA_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_GrepaBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TAMATO BERRY$", 14
- .2byte ITEM_TAMATO_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TamatoBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "CORNN BERRY$", 14
- .2byte ITEM_CORNN_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_CornnBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MAGOST BERRY$", 14
- .2byte ITEM_MAGOST_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_MagostBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RABUTA BERRY$", 14
- .2byte ITEM_RABUTA_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RabutaBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "NOMEL BERRY$", 14
- .2byte ITEM_NOMEL_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_NomelBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SPELON BERRY$", 14
- .2byte ITEM_SPELON_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_SpelonBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "PAMTRE BERRY$", 14
- .2byte ITEM_PAMTRE_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PamtreBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "WATMEL BERRY$", 14
- .2byte ITEM_WATMEL_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_WatmelBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "DURIN BERRY$", 14
- .2byte ITEM_DURIN_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_DurinBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BELUE BERRY$", 14
- .2byte ITEM_BELUE_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BelueBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LIECHI BERRY$", 14
- .2byte ITEM_LIECHI_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_ATTACK_UP
- .byte 4
- .4byte gItemDescription_LiechiBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "GANLON BERRY$", 14
- .2byte ITEM_GANLON_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_DEFENSE_UP
- .byte 4
- .4byte gItemDescription_GanlonBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SALAC BERRY$", 14
- .2byte ITEM_SALAC_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_SPEED_UP
- .byte 4
- .4byte gItemDescription_SalacBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "PETAYA BERRY$", 14
- .2byte ITEM_PETAYA_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_SP_ATTACK_UP
- .byte 4
- .4byte gItemDescription_PetayaBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "APICOT BERRY$", 14
- .2byte ITEM_APICOT_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_SP_DEFENSE_UP
- .byte 4
- .4byte gItemDescription_ApicotBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LANSAT BERRY$", 14
- .2byte ITEM_LANSAT_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_CRITICAL_UP
- .byte 4
- .4byte gItemDescription_LansatBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "STARF BERRY$", 14
- .2byte ITEM_STARF_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_RANDOM_STAT_UP
- .byte 4
- .4byte gItemDescription_StarfBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "ENIGMA BERRY$", 14
- .2byte ITEM_ENIGMA_BERRY
- .2byte 20 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_EnigmaBerry
- .byte 0
- .byte 0
- .byte POCKET_BERRIES
- .byte 4
- .4byte ItemUseOutOfBattle_EnigmaBerry
- .4byte 1
- .4byte ItemUseInBattle_EnigmaBerry
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BRIGHTPOWDER$", 14
- .2byte ITEM_BRIGHT_POWDER
- .2byte 10 @ price
- .byte HOLD_EFFECT_EVASION_UP
- .byte 10
- .4byte gItemDescription_BrightPowder
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "WHITE HERB$", 14
- .2byte ITEM_WHITE_HERB
- .2byte 100 @ price
- .byte HOLD_EFFECT_RESTORE_STATS
- .byte 0
- .4byte gItemDescription_WhiteHerb
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MACHO BRACE$", 14
- .2byte ITEM_MACHO_BRACE
- .2byte 3000 @ price
- .byte HOLD_EFFECT_MACHO_BRACE
- .byte 0
- .4byte gItemDescription_MachoBrace
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "EXP. SHARE$", 14
- .2byte ITEM_EXP_SHARE
- .2byte 3000 @ price
- .byte HOLD_EFFECT_EXP_SHARE
- .byte 0
- .4byte gItemDescription_ExpShare
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "QUICK CLAW$", 14
- .2byte ITEM_QUICK_CLAW
- .2byte 100 @ price
- .byte HOLD_EFFECT_QUICK_CLAW
- .byte 20
- .4byte gItemDescription_QuickClaw
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SOOTHE BELL$", 14
- .2byte ITEM_SOOTHE_BELL
- .2byte 100 @ price
- .byte HOLD_EFFECT_HAPPINESS_UP
- .byte 0
- .4byte gItemDescription_SootheBell
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MENTAL HERB$", 14
- .2byte ITEM_MENTAL_HERB
- .2byte 100 @ price
- .byte HOLD_EFFECT_CURE_ATTRACT
- .byte 0
- .4byte gItemDescription_MentalHerb
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "CHOICE BAND$", 14
- .2byte ITEM_CHOICE_BAND
- .2byte 100 @ price
- .byte HOLD_EFFECT_CHOICE_BAND
- .byte 0
- .4byte gItemDescription_ChoiceBand
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "KING’S ROCK$", 14
- .2byte ITEM_KINGS_ROCK
- .2byte 100 @ price
- .byte HOLD_EFFECT_FLINCH
- .byte 10
- .4byte gItemDescription_KingsRock
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SILVERPOWDER$", 14
- .2byte ITEM_SILVER_POWDER
- .2byte 100 @ price
- .byte HOLD_EFFECT_BUG_POWER
- .byte 10
- .4byte gItemDescription_SilverPowder
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "AMULET COIN$", 14
- .2byte ITEM_AMULET_COIN
- .2byte 100 @ price
- .byte HOLD_EFFECT_DOUBLE_PRIZE
- .byte 10
- .4byte gItemDescription_AmuletCoin
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "CLEANSE TAG$", 14
- .2byte ITEM_CLEANSE_TAG
- .2byte 200 @ price
- .byte HOLD_EFFECT_REPEL
- .byte 0
- .4byte gItemDescription_CleanseTag
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SOUL DEW$", 14
- .2byte ITEM_SOUL_DEW
- .2byte 200 @ price
- .byte HOLD_EFFECT_SOUL_DEW
- .byte 0
- .4byte gItemDescription_SoulDew
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "DEEPSEATOOTH$", 14
- .2byte ITEM_DEEP_SEA_TOOTH
- .2byte 200 @ price
- .byte HOLD_EFFECT_DEEP_SEA_TOOTH
- .byte 0
- .4byte gItemDescription_DeepSeaTooth
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "DEEPSEASCALE$", 14
- .2byte ITEM_DEEP_SEA_SCALE
- .2byte 200 @ price
- .byte HOLD_EFFECT_DEEP_SEA_SCALE
- .byte 0
- .4byte gItemDescription_DeepSeaScale
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SMOKE BALL$", 14
- .2byte ITEM_SMOKE_BALL
- .2byte 200 @ price
- .byte HOLD_EFFECT_CAN_ALWAYS_RUN
- .byte 0
- .4byte gItemDescription_SmokeBall
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "EVERSTONE$", 14
- .2byte ITEM_EVERSTONE
- .2byte 200 @ price
- .byte HOLD_EFFECT_PREVENT_EVOLVE
- .byte 0
- .4byte gItemDescription_Everstone
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "FOCUS BAND$", 14
- .2byte ITEM_FOCUS_BAND
- .2byte 200 @ price
- .byte HOLD_EFFECT_FOCUS_BAND
- .byte 10
- .4byte gItemDescription_FocusBand
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LUCKY EGG$", 14
- .2byte ITEM_LUCKY_EGG
- .2byte 200 @ price
- .byte HOLD_EFFECT_LUCKY_EGG
- .byte 0
- .4byte gItemDescription_LuckyEgg
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SCOPE LENS$", 14
- .2byte ITEM_SCOPE_LENS
- .2byte 200 @ price
- .byte HOLD_EFFECT_SCOPE_LENS
- .byte 0
- .4byte gItemDescription_ScopeLens
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "METAL COAT$", 14
- .2byte ITEM_METAL_COAT
- .2byte 100 @ price
- .byte HOLD_EFFECT_STEEL_POWER
- .byte 10
- .4byte gItemDescription_MetalCoat
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LEFTOVERS$", 14
- .2byte ITEM_LEFTOVERS
- .2byte 200 @ price
- .byte HOLD_EFFECT_LEFTOVERS
- .byte 10
- .4byte gItemDescription_Leftovers
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "DRAGON SCALE$", 14
- .2byte ITEM_DRAGON_SCALE
- .2byte 2100 @ price
- .byte HOLD_EFFECT_DRAGON_SCALE
- .byte 10
- .4byte gItemDescription_DragonScale
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LIGHT BALL$", 14
- .2byte ITEM_LIGHT_BALL
- .2byte 100 @ price
- .byte HOLD_EFFECT_LIGHT_BALL
- .byte 0
- .4byte gItemDescription_LightBall
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SOFT SAND$", 14
- .2byte ITEM_SOFT_SAND
- .2byte 100 @ price
- .byte HOLD_EFFECT_GROUND_POWER
- .byte 10
- .4byte gItemDescription_SoftSand
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HARD STONE$", 14
- .2byte ITEM_HARD_STONE
- .2byte 100 @ price
- .byte HOLD_EFFECT_ROCK_POWER
- .byte 10
- .4byte gItemDescription_HardStone
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MIRACLE SEED$", 14
- .2byte ITEM_MIRACLE_SEED
- .2byte 100 @ price
- .byte HOLD_EFFECT_GRASS_POWER
- .byte 10
- .4byte gItemDescription_MiracleSeed
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BLACKGLASSES$", 14
- .2byte ITEM_BLACK_GLASSES
- .2byte 100 @ price
- .byte HOLD_EFFECT_DARK_POWER
- .byte 10
- .4byte gItemDescription_BlackGlasses
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BLACK BELT$", 14
- .2byte ITEM_BLACK_BELT
- .2byte 100 @ price
- .byte HOLD_EFFECT_FIGHTING_POWER
- .byte 10
- .4byte gItemDescription_BlackBelt
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MAGNET$", 14
- .2byte ITEM_MAGNET
- .2byte 100 @ price
- .byte HOLD_EFFECT_ELECTRIC_POWER
- .byte 10
- .4byte gItemDescription_Magnet
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MYSTIC WATER$", 14
- .2byte ITEM_MYSTIC_WATER
- .2byte 100 @ price
- .byte HOLD_EFFECT_WATER_POWER
- .byte 10
- .4byte gItemDescription_MysticWater
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SHARP BEAK$", 14
- .2byte ITEM_SHARP_BEAK
- .2byte 100 @ price
- .byte HOLD_EFFECT_FLYING_POWER
- .byte 10
- .4byte gItemDescription_SharpBeak
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "POISON BARB$", 14
- .2byte ITEM_POISON_BARB
- .2byte 100 @ price
- .byte HOLD_EFFECT_POISON_POWER
- .byte 10
- .4byte gItemDescription_PoisonBarb
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "NEVERMELTICE$", 14
- .2byte ITEM_NEVER_MELT_ICE
- .2byte 100 @ price
- .byte HOLD_EFFECT_ICE_POWER
- .byte 10
- .4byte gItemDescription_NeverMeltIce
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SPELL TAG$", 14
- .2byte ITEM_SPELL_TAG
- .2byte 100 @ price
- .byte HOLD_EFFECT_GHOST_POWER
- .byte 10
- .4byte gItemDescription_SpellTag
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TWISTEDSPOON$", 14
- .2byte ITEM_TWISTED_SPOON
- .2byte 100 @ price
- .byte HOLD_EFFECT_PSYCHIC_POWER
- .byte 10
- .4byte gItemDescription_TwistedSpoon
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "CHARCOAL$", 14
- .2byte ITEM_CHARCOAL
- .2byte 9800 @ price
- .byte HOLD_EFFECT_FIRE_POWER
- .byte 10
- .4byte gItemDescription_Charcoal
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "DRAGON FANG$", 14
- .2byte ITEM_DRAGON_FANG
- .2byte 100 @ price
- .byte HOLD_EFFECT_DRAGON_POWER
- .byte 10
- .4byte gItemDescription_DragonFang
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SILK SCARF$", 14
- .2byte ITEM_SILK_SCARF
- .2byte 100 @ price
- .byte HOLD_EFFECT_NORMAL_POWER
- .byte 10
- .4byte gItemDescription_SilkScarf
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "UP-GRADE$", 14
- .2byte ITEM_UP_GRADE
- .2byte 2100 @ price
- .byte HOLD_EFFECT_UP_GRADE
- .byte 0
- .4byte gItemDescription_UpGrade
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SHELL BELL$", 14
- .2byte ITEM_SHELL_BELL
- .2byte 200 @ price
- .byte HOLD_EFFECT_SHELL_BELL
- .byte 8
- .4byte gItemDescription_ShellBell
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SEA INCENSE$", 14
- .2byte ITEM_SEA_INCENSE
- .2byte 9600 @ price
- .byte HOLD_EFFECT_WATER_POWER
- .byte 5
- .4byte gItemDescription_SeaIncense
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LAX INCENSE$", 14
- .2byte ITEM_LAX_INCENSE
- .2byte 9600 @ price
- .byte HOLD_EFFECT_EVASION_UP
- .byte 5
- .4byte gItemDescription_LaxIncense
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LUCKY PUNCH$", 14
- .2byte ITEM_LUCKY_PUNCH
- .2byte 10 @ price
- .byte HOLD_EFFECT_LUCKY_PUNCH
- .byte 0
- .4byte gItemDescription_LuckyPunch
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "METAL POWDER$", 14
- .2byte ITEM_METAL_POWDER
- .2byte 10 @ price
- .byte HOLD_EFFECT_METAL_POWDER
- .byte 0
- .4byte gItemDescription_MetalPowder
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "THICK CLUB$", 14
- .2byte ITEM_THICK_CLUB
- .2byte 500 @ price
- .byte HOLD_EFFECT_THICK_CLUB
- .byte 0
- .4byte gItemDescription_ThickClub
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "STICK$", 14
- .2byte ITEM_STICK
- .2byte 200 @ price
- .byte HOLD_EFFECT_STICK
- .byte 0
- .4byte gItemDescription_Stick
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RED SCARF$", 14
- .2byte ITEM_RED_SCARF
- .2byte 100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RedScarf
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BLUE SCARF$", 14
- .2byte ITEM_BLUE_SCARF
- .2byte 100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BlueScarf
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "PINK SCARF$", 14
- .2byte ITEM_PINK_SCARF
- .2byte 100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PinkScarf
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "GREEN SCARF$", 14
- .2byte ITEM_GREEN_SCARF
- .2byte 100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_GreenScarf
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "YELLOW SCARF$", 14
- .2byte ITEM_YELLOW_SCARF
- .2byte 100 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_YellowScarf
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "MACH BIKE$", 14
- .2byte ITEM_MACH_BIKE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_MachBike
- .byte 1
- .byte 1
- .byte POCKET_KEY_ITEMS
- .byte 2
- .4byte ItemUseOutOfBattle_Bike
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "COIN CASE$", 14
- .2byte ITEM_COIN_CASE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_CoinCase
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CoinCase
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "ITEMFINDER$", 14
- .2byte ITEM_ITEMFINDER
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Itemfinder
- .byte 1
- .byte 1
- .byte POCKET_KEY_ITEMS
- .byte 2
- .4byte ItemUseOutOfBattle_Itemfinder
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "OLD ROD$", 14
- .2byte ITEM_OLD_ROD
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_OldRod
- .byte 1
- .byte 1
- .byte POCKET_KEY_ITEMS
- .byte 2
- .4byte ItemUseOutOfBattle_Rod
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "GOOD ROD$", 14
- .2byte ITEM_GOOD_ROD
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_GoodRod
- .byte 1
- .byte 1
- .byte POCKET_KEY_ITEMS
- .byte 2
- .4byte ItemUseOutOfBattle_Rod
- .4byte 0
- .4byte NULL
- .4byte 1
-
- .string "SUPER ROD$", 14
- .2byte ITEM_SUPER_ROD
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_SuperRod
- .byte 1
- .byte 1
- .byte POCKET_KEY_ITEMS
- .byte 2
- .4byte ItemUseOutOfBattle_Rod
- .4byte 0
- .4byte NULL
- .4byte 2
-
- .string "S.S. TICKET$", 14
- .2byte ITEM_SS_TICKET
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_SSTicket
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "CONTEST PASS$", 14
- .2byte ITEM_CONTEST_PASS
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_ContestPass
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "WAILMER PAIL$", 14
- .2byte ITEM_WAILMER_PAIL
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_WailmerPail
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 2
- .4byte ItemUseOutOfBattle_WailmerPail
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "DEVON GOODS$", 14
- .2byte ITEM_DEVON_GOODS
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_DevonGoods
- .byte 2
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SOOT SACK$", 14
- .2byte ITEM_SOOT_SACK
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_SootSack
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BASEMENT KEY$", 14
- .2byte ITEM_BASEMENT_KEY
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BasementKey
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "ACRO BIKE$", 14
- .2byte ITEM_ACRO_BIKE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_AcroBike
- .byte 1
- .byte 1
- .byte POCKET_KEY_ITEMS
- .byte 2
- .4byte ItemUseOutOfBattle_Bike
- .4byte 0
- .4byte NULL
- .4byte 1
-
- .string "{POKEBLOCK} CASE$", 14
- .2byte ITEM_POKEBLOCK_CASE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_PokeblockCase
- .byte 1
- .byte 1
- .byte POCKET_KEY_ITEMS
- .byte 3
- .4byte ItemUseOutOfBattle_PokeblockCase
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "LETTER$", 14
- .2byte ITEM_LETTER
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Letter
- .byte 2
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "EON TICKET$", 14
- .2byte ITEM_EON_TICKET
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_EonTicket
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 1
-
- .string "RED ORB$", 14
- .2byte ITEM_RED_ORB
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RedOrb
- .byte 2
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "BLUE ORB$", 14
- .2byte ITEM_BLUE_ORB
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_BlueOrb
- .byte 2
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "SCANNER$", 14
- .2byte ITEM_SCANNER
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Scanner
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "GO-GOGGLES$", 14
- .2byte ITEM_GO_GOGGLES
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_GoGoggles
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "METEORITE$", 14
- .2byte ITEM_METEORITE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Meteorite
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RM. 1 KEY$", 14
- .2byte ITEM_ROOM_1_KEY
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Room1Key
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RM. 2 KEY$", 14
- .2byte ITEM_ROOM_2_KEY
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Room2Key
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RM. 4 KEY$", 14
- .2byte ITEM_ROOM_4_KEY
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Room4Key
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "RM. 6 KEY$", 14
- .2byte ITEM_ROOM_6_KEY
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Room6Key
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "STORAGE KEY$", 14
- .2byte ITEM_STORAGE_KEY
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_StorageKey
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "ROOT FOSSIL$", 14
- .2byte ITEM_ROOT_FOSSIL
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_RootFossil
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "CLAW FOSSIL$", 14
- .2byte ITEM_CLAW_FOSSIL
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_ClawFossil
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "DEVON SCOPE$", 14
- .2byte ITEM_DEVON_SCOPE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_DevonScope
- .byte 1
- .byte 0
- .byte POCKET_KEY_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM01$", 14
- .2byte ITEM_TM01
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM01
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM02$", 14
- .2byte ITEM_TM02
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM02
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM03$", 14
- .2byte ITEM_TM03
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM03
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM04$", 14
- .2byte ITEM_TM04
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM04
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM05$", 14
- .2byte ITEM_TM05
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM05
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM06$", 14
- .2byte ITEM_TM06
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM06
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM07$", 14
- .2byte ITEM_TM07
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM07
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM08$", 14
- .2byte ITEM_TM08
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM08
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM09$", 14
- .2byte ITEM_TM09
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM09
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM10$", 14
- .2byte ITEM_TM10
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM10
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM11$", 14
- .2byte ITEM_TM11
- .2byte 2000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM11
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM12$", 14
- .2byte ITEM_TM12
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM12
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM13$", 14
- .2byte ITEM_TM13
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM13
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM14$", 14
- .2byte ITEM_TM14
- .2byte 5500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM14
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM15$", 14
- .2byte ITEM_TM15
- .2byte 7500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM15
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM16$", 14
- .2byte ITEM_TM16
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM16
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM17$", 14
- .2byte ITEM_TM17
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM17
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM18$", 14
- .2byte ITEM_TM18
- .2byte 2000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM18
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM19$", 14
- .2byte ITEM_TM19
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM19
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM20$", 14
- .2byte ITEM_TM20
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM20
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM21$", 14
- .2byte ITEM_TM21
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM21
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM22$", 14
- .2byte ITEM_TM22
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM22
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM23$", 14
- .2byte ITEM_TM23
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM23
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM24$", 14
- .2byte ITEM_TM24
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM24
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM25$", 14
- .2byte ITEM_TM25
- .2byte 5500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM25
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM26$", 14
- .2byte ITEM_TM26
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM26
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM27$", 14
- .2byte ITEM_TM27
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM27
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM28$", 14
- .2byte ITEM_TM28
- .2byte 2000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM28
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM29$", 14
- .2byte ITEM_TM29
- .2byte 2000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM29
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM30$", 14
- .2byte ITEM_TM30
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM30
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM31$", 14
- .2byte ITEM_TM31
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM31
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM32$", 14
- .2byte ITEM_TM32
- .2byte 2000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM32
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM33$", 14
- .2byte ITEM_TM33
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM33
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM34$", 14
- .2byte ITEM_TM34
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM34
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM35$", 14
- .2byte ITEM_TM35
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM35
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM36$", 14
- .2byte ITEM_TM36
- .2byte 1000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM36
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM37$", 14
- .2byte ITEM_TM37
- .2byte 2000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM37
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM38$", 14
- .2byte ITEM_TM38
- .2byte 5500 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM38
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM39$", 14
- .2byte ITEM_TM39
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM39
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM40$", 14
- .2byte ITEM_TM40
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM40
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM41$", 14
- .2byte ITEM_TM41
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM41
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM42$", 14
- .2byte ITEM_TM42
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM42
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM43$", 14
- .2byte ITEM_TM43
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM43
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM44$", 14
- .2byte ITEM_TM44
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM44
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM45$", 14
- .2byte ITEM_TM45
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM45
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM46$", 14
- .2byte ITEM_TM46
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM46
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM47$", 14
- .2byte ITEM_TM47
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM47
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM48$", 14
- .2byte ITEM_TM48
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM48
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM49$", 14
- .2byte ITEM_TM49
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM49
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "TM50$", 14
- .2byte ITEM_TM50
- .2byte 3000 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_TM50
- .byte 0
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HM01$", 14
- .2byte ITEM_HM01
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HM01
- .byte 1
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HM02$", 14
- .2byte ITEM_HM02
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HM02
- .byte 1
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HM03$", 14
- .2byte ITEM_HM03
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HM03
- .byte 1
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HM04$", 14
- .2byte ITEM_HM04
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HM04
- .byte 1
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HM05$", 14
- .2byte ITEM_HM05
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HM05
- .byte 1
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HM06$", 14
- .2byte ITEM_HM06
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HM06
- .byte 1
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HM07$", 14
- .2byte ITEM_HM07
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HM07
- .byte 1
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "HM08$", 14
- .2byte ITEM_HM08
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_HM08
- .byte 1
- .byte 0
- .byte POCKET_TM_HM
- .byte 1
- .4byte ItemUseOutOfBattle_TMHM
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
-
- .string "????????$", 14
- .2byte ITEM_NONE
- .2byte 0 @ price
- .byte HOLD_EFFECT_NONE
- .byte 0
- .4byte gItemDescription_Dummy
- .byte 0
- .byte 0
- .byte POCKET_ITEMS
- .byte 4
- .4byte ItemUseOutOfBattle_CannotUse
- .4byte 0
- .4byte NULL
- .4byte 0
diff --git a/data/menu_helpers.s b/data/menu_helpers.s
deleted file mode 100644
index 29d42cb4b..000000000
--- a/data/menu_helpers.s
+++ /dev/null
@@ -1,102 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gSpriteImage_83E5808:: @ 83E5808
- .incbin "graphics/unknown_sprites/83E59A0/0.4bpp"
-
- .align 2
-gSpriteImage_83E5848:: @ 83E5848
- .incbin "graphics/unknown_sprites/83E59A0/1.4bpp"
-
- .align 2
-gSpriteImage_83E5888:: @ 83E5888
- .incbin "graphics/unknown_sprites/83E59B0/0.4bpp"
-
- .align 2
-gSpriteImage_83E58C8:: @ 83E58C8
- .incbin "graphics/unknown_sprites/83E59B0/1.4bpp"
-
- .align 2
-gSpriteImage_83E5908:: @ 83E5908
- .incbin "graphics/unknown_sprites/83E59C0/0.4bpp"
-
- .align 2
-gSpriteImage_83E5928:: @ 83E5928
- .incbin "graphics/unknown_sprites/83E59C0/1.4bpp"
-
- .align 2
-Palette_3E5948: @ 83E5948
- .incbin "graphics/interface/83E5948.gbapal"
-
- .align 2
-gUnknown_083E5968:: @ 83E5968
- obj_pal Palette_3E5948, 6
-
- .align 2
-gOamData_83E5970:: @ 83E5970
- .2byte 0x0000
- .2byte 0x0000
- .2byte 0x0001
-
- .align 2
-gOamData_83E5978:: @ 83E5978
- .2byte 0x4000
- .2byte 0x0000
- .2byte 0x0001
-
- .align 2
-gOamData_83E5980:: @ 83E5980
- .2byte 0x8000
- .2byte 0x0000
- .2byte 0x0001
-
- .align 2
-gSpriteAnim_83E5988:: @ 83E5988
- obj_image_anim_frame 0, 0
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83E5990:: @ 83E5990
- obj_image_anim_frame 1, 0
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_83E5998:: @ 83E5998
- .4byte gSpriteAnim_83E5988
- .4byte gSpriteAnim_83E5990
-
- .align 2
-gSpriteImageTable_83E59A0:: @ 83E59A0
- obj_frame_tiles gSpriteImage_83E5808, 0x40
- obj_frame_tiles gSpriteImage_83E5848, 0x40
-
- .align 2
-gSpriteImageTable_83E59B0:: @ 83E59B0
- obj_frame_tiles gSpriteImage_83E5888, 0x40
- obj_frame_tiles gSpriteImage_83E58C8, 0x40
-
- .align 2
-gSpriteImageTable_83E59C0:: @ 83E59C0
- obj_frame_tiles gSpriteImage_83E5908, 0x20
- obj_frame_tiles gSpriteImage_83E5928, 0x20
-
- .align 2
-gSpriteTemplate_83E59D0:: @ 83E59D0
- spr_template 0xFFFF, 6, gOamData_83E5978, gSpriteAnimTable_83E5998, gSpriteImageTable_83E59A0, gDummySpriteAffineAnimTable, sub_80F9834
-
- .align 2
-gSpriteTemplate_83E59E8:: @ 83E59E8
- spr_template 0xFFFF, 6, gOamData_83E5980, gSpriteAnimTable_83E5998, gSpriteImageTable_83E59B0, gDummySpriteAffineAnimTable, sub_80F9834
-
- .align 2
-gSpriteTemplate_83E5A00:: @ 83E5A00
- spr_template 0xFFFF, 6, gOamData_83E5970, gSpriteAnimTable_83E5998, gSpriteImageTable_83E59C0, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_083E5A18:: @ 83E5A18
- .string "{PALETTE 0}$"
-
-gUnknown_083E5A1C:: @ 83E5A1C
- .string "▶$"
diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s
new file mode 100644
index 000000000..171c35b4e
--- /dev/null
+++ b/data/mystery_event_script_cmd_table.s
@@ -0,0 +1,22 @@
+ .section script_data, "aw", %progbits
+
+ .align 2
+gMysteryEventScriptCmdTable:: @ 81DCAF4
+ .4byte MEScrCmd_nop
+ .4byte MEScrCmd_checkcompat
+ .4byte MEScrCmd_end
+ .4byte MEScrCmd_setmsg
+ .4byte MEScrCmd_setstatus
+ .4byte MEScrCmd_runscript
+ .4byte MEScrCmd_initramscript
+ .4byte MEScrCmd_setenigmaberry
+ .4byte MEScrCmd_giveribbon
+ .4byte MEScrCmd_givenationaldex
+ .4byte MEScrCmd_addrareword
+ .4byte MEScrCmd_setrecordmixinggift
+ .4byte MEScrCmd_givepokemon
+ .4byte MEScrCmd_addtrainer
+ .4byte MEScrCmd_enableresetrtc
+ .4byte MEScrCmd_checksum
+ .4byte MEScrCmd_crc
+gMysteryEventScriptCmdTableEnd::
diff --git a/data/option_menu.s b/data/option_menu.s
deleted file mode 100644
index cb517cc89..000000000
--- a/data/option_menu.s
+++ /dev/null
@@ -1,13 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_0839F5FC:: @ 839F5FC
- .incbin "graphics/misc/option_menu_text.gbapal"
-
-@ note: this is only used in the Japanese release
- .align 2
-gUnknown_0839F63C:: @ 839F63C
- .incbin "graphics/misc/option_menu_equals_sign.4bpp"
diff --git a/data/pokemon_icon.s b/data/pokemon_icon.s
deleted file mode 100644
index ff5aa33dc..000000000
--- a/data/pokemon_icon.s
+++ /dev/null
@@ -1,92 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-@ 83BBD20
- .include "data/graphics/pokemon/icon_table.inc"
-
-@ 83BC400
- .include "data/graphics/pokemon/icon_palette_indices.inc"
-
-@ 83BC5B8
- .include "data/graphics/pokemon/icon_palette_table.inc"
-
- .align 2
-gOamData_83BC5E8:: @ 83BC5E8
- .2byte 0x0000
- .2byte 0x8000
- .2byte 0x0400
-
- .align 2
-gSpriteAnim_83BC5F0:: @ 83BC5F0
- obj_image_anim_frame 0, 6
- obj_image_anim_frame 1, 6
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_83BC5FC:: @ 83BC5FC
- obj_image_anim_frame 0, 8
- obj_image_anim_frame 1, 8
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_83BC608:: @ 83BC608
- obj_image_anim_frame 0, 14
- obj_image_anim_frame 1, 14
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_83BC614:: @ 83BC614
- obj_image_anim_frame 0, 22
- obj_image_anim_frame 1, 22
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_83BC620:: @ 83BC620
- obj_image_anim_frame 0, 29
- obj_image_anim_frame 0, 29
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnimTable_83BC62C:: @ 83BC62C
- .4byte gSpriteAnim_83BC5F0
- .4byte gSpriteAnim_83BC5FC
- .4byte gSpriteAnim_83BC608
- .4byte gSpriteAnim_83BC614
- .4byte gSpriteAnim_83BC620
-
- .align 2
-gSpriteAffineAnim_83BC640:: @ 83BC640
- obj_rot_scal_anim_frame 0x0, 0x0, 0, 10
- obj_rot_scal_anim_end
-
- .align 2
-gSpriteAffineAnim_83BC650:: @ 83BC650
- obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 122
- obj_rot_scal_anim_end
-
- .align 2
-gSpriteAffineAnimTable_83BC660:: @ 83BC660
- .4byte gSpriteAffineAnim_83BC640
- .4byte gSpriteAffineAnim_83BC650
-
- .align 1
-gSpriteImageSizes:: @ 83BC668
- @ square
- .2byte 0x20 @ 1×1
- .2byte 0x80 @ 2×2
- .2byte 0x200 @ 4×4
- .2byte 0x800 @ 8×8
-
- @ horizontal rectangle
- .2byte 0x40 @ 2×1
- .2byte 0x80 @ 4×1
- .2byte 0x100 @ 4×2
- .2byte 0x400 @ 8×4
-
- @ vertical rectangle
- .2byte 0x40 @ 1×2
- .2byte 0x80 @ 1×4
- .2byte 0x100 @ 2×4
- .2byte 0x400 @ 4×8
diff --git a/data/record_mixing.s b/data/record_mixing.s
deleted file mode 100644
index 8b46e1ed3..000000000
--- a/data/record_mixing.s
+++ /dev/null
@@ -1,68 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-recordMixingSecretBases:: @ 83D026C
- @ gSaveBlock1.secretBases
- .4byte gSaveBlock1 + 0x1A08
-
- .align 2
-recordMixingTvShows:: @ 83D0270
- @ gSaveBlock1.tvShows
- .4byte gSaveBlock1 + 0x2738
-
- .align 2
-gUnknown_083D0274:: @ 83D0274
- .4byte gSaveBlock1 + 0x2ABC
-
- .align 2
-gUnknown_083D0278:: @ 83D0278
- .4byte gSaveBlock1 + 0x2D94
-
- .align 2
-recordMixingEasyChatPairs:: @ 83D027C
- @ gSaveBlock1.easyChatPairs
- .4byte gSaveBlock1 + 0x2DD4
-
- .align 2
-gUnknown_083D0280:: @ 83D0280
- .4byte gUnknown_02038738
-
- .align 2
-gUnknown_083D0284:: @ 83D0284
- .4byte gSaveBlock2+0xA8
-
-gUnknown_083D0288:: @ 83D0288
- .byte 1, 0
-
-gUnknown_083D028A:: @ 83D028A
- .byte 1, 2, 0
- .byte 2, 0, 1
-
-gUnknown_083D0290:: @ 83D0290
- .byte 1, 0, 3, 2
- .byte 3, 0, 1, 2
- .byte 2, 0, 3, 1
- .byte 1, 3, 0, 2
- .byte 2, 3, 0, 1
- .byte 3, 2, 0, 1
- .byte 1, 2, 3, 0
- .byte 2, 3, 1, 0
- .byte 3, 2, 1, 0
-
-gUnknown_083D02B4:: @ 83D02B4
- .byte 0, 1
- .byte 1, 2
- .byte 2, 0
-
-gUnknown_083D02BA:: @ 83D02BA
- .byte 0, 1
- .byte 2, 3
-
- .byte 0, 2
- .byte 1, 3
-
- .byte 0, 3
- .byte 2, 1
diff --git a/data/region_map.s b/data/region_map.s
deleted file mode 100644
index d4d13f194..000000000
--- a/data/region_map.s
+++ /dev/null
@@ -1,259 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gPokenavCursor_Pal::
- .incbin "graphics/pokenav/cursor.gbapal"
-
- .align 2
-gUnknown_083E5AF0:: @ 83E5AF0
- .incbin "graphics/pokenav/cursor_small.4bpp.lz"
-
- .align 2
-gUnknown_083E5B34:: @ 83E5B34
- .incbin "graphics/pokenav/cursor_large.4bpp.lz"
-
- .align 2
-gRegionMapBrendanIconPalette:: @ 83E5C20
- .incbin "graphics/pokenav/brendan_icon.gbapal"
-
- .align 2
-gRegionMapBrendanIconTiles:: @ 83E5C40
- .incbin "graphics/pokenav/brendan_icon.4bpp"
-
- .align 2
-gRegionMapMayIconPalette:: @ 83E5CC0
- .incbin "graphics/pokenav/may_icon.gbapal"
-
- .align 2
-gRegionMapMayIconTiles:: @ 83E5CE0
- .incbin "graphics/pokenav/may_icon.4bpp"
-
- .align 2
-gUnknown_083E5D60:: @ 83E5D60
- .incbin "graphics/pokenav/region_map.gbapal", 0xE0, 0x40
-
- .align 2
-gUnknown_083E5DA0:: @ 83E5DA0
- .incbin "graphics/pokenav/region_map.8bpp.lz"
-
- .align 2
-gUnknown_083E6B04:: @ 83E6B04
- .incbin "graphics/pokenav/region_map_map.bin.lz"
-
-@ 83E6E50
- .include "data/region_map_sections.inc"
-
-@ 83E6FF4
- .include "data/region_map_locations.inc"
-
-gUnknown_083E7684:: @ 83E7684
- .2byte 50, 39
- .2byte 51, 41
- .2byte 52, 42
- .2byte 53, 43
- .2byte 54, 14
- .2byte 69, 43
- .2byte 66, 12
- .2byte 79, 49
- .2byte 59, 19
- .2byte 76, 27
- .2byte 65, 37
- .2byte 85, 46
- .2byte 88, 88
-
- .align 2
-gOamData_83E76B8:: @ 83E76B8
- .2byte 0x0000
- .2byte 0x4000
- .2byte 0x0400
-
- .align 2
-gSpriteAnim_83E76C0:: @ 83E76C0
- obj_image_anim_frame 0, 20
- obj_image_anim_frame 4, 20
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_83E76CC:: @ 83E76CC
- obj_image_anim_frame 0, 10
- obj_image_anim_frame 16, 10
- obj_image_anim_frame 32, 10
- obj_image_anim_frame 16, 10
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnimTable_83E76E0:: @ 83E76E0
- .4byte gSpriteAnim_83E76C0
- .4byte gSpriteAnim_83E76CC
-
- .align 2
-gUnknown_083E76E8:: @ 83E76E8
- obj_pal gPokenavCursor_Pal, 0x0000
-
- .align 2
-gSpriteTemplate_83E76F0:: @ 83E76F0
- spr_template 0, 0, gOamData_83E76B8, gSpriteAnimTable_83E76E0, NULL, gDummySpriteAffineAnimTable, sub_80FBAF0
-
- .align 2
-gOamData_083E7708:: @ 83E7708
- .2byte 0x0000
- .2byte 0x4000
- .2byte 0x0800
-
- .align 2
-gSpriteAnim_83E7710: @ 83E7710
- obj_image_anim_frame 0, 5
- obj_image_anim_end
-
-gSpriteAnimTable_083E7718:: @ 83E7718 ANIMCMD
- .4byte gSpriteAnim_83E7710
-
-gUnknown_083E771C:: @ 83E771C
- .incbin "graphics/pokenav/map_frame.gbapal"
-
-gUnknown_083E773C:: @ 83E773C
- .incbin "graphics/pokenav/map_frame.4bpp.lz"
-
-gUnknown_083E7774:: @ 83E7774
- .incbin "graphics/pokenav/map_frame.bin.lz"
-
- .align 2
-gPokenavMapMisc_Pal::
- .incbin "graphics/pokenav/map_misc.gbapal"
-
-gUnknown_083E784C:: @ 83E784C
- .incbin "graphics/pokenav/map_misc.4bpp.lz"
-
-gUnknown_083E7920:: @ 83E7920
- .byte 0, 9, 1
- .byte 0, 10, 14
- .byte 0, 11, 15
- .byte 0, 12, 16
- .byte 0, 13, 17
- .byte 0, 14, 18
- .byte 0, 15, 19
- .byte 0, 0, 3
- .byte 0, 1, 4
- .byte 0, 2, 5
- .byte 0, 3, 6
- .byte 0, 4, 7
- .byte 0, 5, 8
- .byte 0, 6, 9
- .byte 0, 7, 10
- .byte 0, 8, 11
- .byte 0, 16, 0
- .byte 0, 17, 0
- .byte 0, 18, 0
- .byte 0, 19, 0
- .byte 0, 20, 0
- .byte 0, 21, 0
- .byte 0, 22, 0
- .byte 0, 23, 0
- .byte 0, 24, 0
- .byte 0, 25, 0
- .byte 0, 26, 0
- .byte 0, 27, 0
- .byte 0, 28, 0
- .byte 0, 29, 0
- .byte 0, 30, 0
- .byte 0, 31, 0
- .byte 0, 32, 0
- .byte 0, 33, 0
- .byte 0, 34, 0
- .byte 0, 35, 0
- .byte 0, 36, 0
- .byte 0, 37, 0
- .byte 0, 38, 0
- .byte 0, 39, 0
- .byte 0, 40, 0
- .byte 0, 41, 0
- .byte 0, 42, 0
- .byte 0, 43, 0
- .byte 0, 44, 0
- .byte 0, 45, 0
- .byte 0, 46, 0
- .byte 0, 47, 0
- .byte 0, 48, 0
- .byte 0, 49, 0
-
- .align 2
-Unknown_3E79B8: @ 83E79B8
- .4byte OtherText_PokeLeague
- .4byte OtherText_PokeCenter
-
- .align 2
-gUnknown_083E79C0:: @ 83E79C0
- .4byte Unknown_3E79B8
- .2byte 0xF
- .2byte 0x854
-
-@ XXX: what is this?
- .align 2
- .4byte 0x2000000
-
- .align 2
-gUnknown_083E79CC:: @ 83E79CC
- obj_pal gPokenavMapMisc_Pal, 0x0002
-
- .align 2
-gUnknown_083E79D4:: @ 83E79D4
- .2byte 2120, 58
- .2byte 65535, 88
-
- .align 2
-gOamData_83E79DC:: @ 83E79DC
- .2byte 0x0000
- .2byte 0x0000
- .2byte 0x0800
-
- .align 2
-gSpriteAnim_83E79E4:: @ 83E79E4
- obj_image_anim_frame 0, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83E79EC:: @ 83E79EC
- obj_image_anim_frame 1, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83E79F4:: @ 83E79F4
- obj_image_anim_frame 3, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83E79FC:: @ 83E79FC
- obj_image_anim_frame 5, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83E7A04:: @ 83E7A04
- obj_image_anim_frame 6, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83E7A0C:: @ 83E7A0C
- obj_image_anim_frame 8, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83E7A14:: @ 83E7A14
- obj_image_anim_frame 10, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_83E7A1C:: @ 83E7A1C
- .4byte gSpriteAnim_83E79E4
- .4byte gSpriteAnim_83E79EC
- .4byte gSpriteAnim_83E79F4
- .4byte gSpriteAnim_83E79FC
- .4byte gSpriteAnim_83E7A04
- .4byte gSpriteAnim_83E7A0C
- .4byte gSpriteAnim_83E7A14
-
- .align 2
-gSpriteTemplate_83E7A38:: @ 83E7A38
- spr_template 2, 2, gOamData_83E79DC, gSpriteAnimTable_83E7A1C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/region_map_locations.inc b/data/region_map_locations.inc
deleted file mode 100644
index 389b5aa0c..000000000
--- a/data/region_map_locations.inc
+++ /dev/null
@@ -1,327 +0,0 @@
-gMapName_LittlerootTown: @ 83E6FF4
- .string "LITTLEROOT{NAME_END} TOWN$"
-
-gMapName_OldaleTown: @ 83E7006
- .string "OLDALE{NAME_END} TOWN$"
-
-gMapName_DewfordTown: @ 83E7014
- .string "DEWFORD{NAME_END} TOWN$"
-
-gMapName_LavaridgeTown: @ 83E7023
- .string "LAVARIDGE{NAME_END} TOWN$"
-
-gMapName_FallarborTown: @ 83E7034
- .string "FALLARBOR{NAME_END} TOWN$"
-
-gMapName_VerdanturfTown: @ 83E7045
- .string "VERDANTURF{NAME_END} TOWN$"
-
-gMapName_PacifidlogTown: @ 83E7057
- .string "PACIFIDLOG{NAME_END} TOWN$"
-
-gMapName_PetalburgCity: @ 83E7069
- .string "PETALBURG{NAME_END} CITY$"
-
-gMapName_SlateportCity: @ 83E707A
- .string "SLATEPORT{NAME_END} CITY$"
-
-gMapName_MauvilleCity: @ 83E708B
- .string "MAUVILLE{NAME_END} CITY$"
-
-gMapName_RustboroCity: @ 83E709B
- .string "RUSTBORO{NAME_END} CITY$"
-
-gMapName_FortreeCity: @ 83E70AB
- .string "FORTREE{NAME_END} CITY$"
-
-gMapName_LilycoveCity: @ 83E70BA
- .string "LILYCOVE{NAME_END} CITY$"
-
-gMapName_MossdeepCity: @ 83E70CA
- .string "MOSSDEEP{NAME_END} CITY$"
-
-gMapName_SootopolisCity: @ 83E70DA
- .string "SOOTOPOLIS{NAME_END} CITY$"
-
-gMapName_EverGrandeCity: @ 83E70EC
- .string "EVER GRANDE{NAME_END} CITY$"
-
-gMapName_Route101: @ 83E70FF
- .string "ROUTE 101$"
-
-gMapName_Route102: @ 83E7109
- .string "ROUTE 102$"
-
-gMapName_Route103: @ 83E7113
- .string "ROUTE 103$"
-
-gMapName_Route104: @ 83E711D
- .string "ROUTE 104$"
-
-gMapName_Route105: @ 83E7127
- .string "ROUTE 105$"
-
-gMapName_Route106: @ 83E7131
- .string "ROUTE 106$"
-
-gMapName_Route107: @ 83E713B
- .string "ROUTE 107$"
-
-gMapName_Route108: @ 83E7145
- .string "ROUTE 108$"
-
-gMapName_Route109: @ 83E714F
- .string "ROUTE 109$"
-
-gMapName_Route110: @ 83E7159
- .string "ROUTE 110$"
-
-gMapName_Route111: @ 83E7163
- .string "ROUTE 111$"
-
-gMapName_Route112: @ 83E716D
- .string "ROUTE 112$"
-
-gMapName_Route113: @ 83E7177
- .string "ROUTE 113$"
-
-gMapName_Route114: @ 83E7181
- .string "ROUTE 114$"
-
-gMapName_Route115: @ 83E718B
- .string "ROUTE 115$"
-
-gMapName_Route116: @ 83E7195
- .string "ROUTE 116$"
-
-gMapName_Route117: @ 83E719F
- .string "ROUTE 117$"
-
-gMapName_Route118: @ 83E71A9
- .string "ROUTE 118$"
-
-gMapName_Route119: @ 83E71B3
- .string "ROUTE 119$"
-
-gMapName_Route120: @ 83E71BD
- .string "ROUTE 120$"
-
-gMapName_Route121: @ 83E71C7
- .string "ROUTE 121$"
-
-gMapName_Route122: @ 83E71D1
- .string "ROUTE 122$"
-
-gMapName_Route123: @ 83E71DB
- .string "ROUTE 123$"
-
-gMapName_Route124: @ 83E71E5
- .string "ROUTE 124$"
-
-gMapName_Route125: @ 83E71EF
- .string "ROUTE 125$"
-
-gMapName_Route126: @ 83E71F9
- .string "ROUTE 126$"
-
-gMapName_Route127: @ 83E7203
- .string "ROUTE 127$"
-
-gMapName_Route128: @ 83E720D
- .string "ROUTE 128$"
-
-gMapName_Route129: @ 83E7217
- .string "ROUTE 129$"
-
-gMapName_Route130: @ 83E7221
- .string "ROUTE 130$"
-
-gMapName_Route131: @ 83E722B
- .string "ROUTE 131$"
-
-gMapName_Route132: @ 83E7235
- .string "ROUTE 132$"
-
-gMapName_Route133: @ 83E723F
- .string "ROUTE 133$"
-
-gMapName_Route134: @ 83E7249
- .string "ROUTE 134$"
-
-gMapName_Underwater: @ 83E7253
- .string "UNDERWATER$"
-
-gMapName_GraniteCave: @ 83E725E
- .string "GRANITE CAVE$"
-
-gMapName_MtChimney: @ 83E726B
- .string "MT. CHIMNEY$"
-
-gMapName_SafariZone: @ 83E7277
- .string "SAFARI ZONE$"
-
-gMapName_BattleTower: @ 83E7283
- .string "BATTLE TOWER$"
-
-gMapName_PetalburgWoods: @ 83E7290
- .string "PETALBURG WOODS$"
-
-gMapName_RusturfTunnel: @ 83E72A0
- .string "RUSTURF TUNNEL$"
-
-gMapName_AbandonedShip: @ 83E72AF
- .string "ABANDONED SHIP$"
-
-gMapName_NewMauville: @ 83E72BE
- .string "NEW MAUVILLE$"
-
-gMapName_MeteorFalls: @ 83E72CB
- .string "METEOR FALLS$"
-
-gMapName_MtPyre: @ 83E72D8
- .string "MT. PYRE$"
-
-gMapName_EvilTeamHideout: @ 83E72E1
- .string "{EVIL_TEAM} HIDEOUT$"
-
-gMapName_ShoalCave: @ 83E72EC
- .string "SHOAL CAVE$"
-
-gMapName_SeafloorCavern: @ 83E72F7
- .string "SEAFLOOR CAVERN$"
-
-gMapName_VictoryRoad: @ 83E7307
- .string "VICTORY ROAD$"
-
-gMapName_MirageIsland: @ 83E7314
- .string "MIRAGE ISLAND$"
-
-gMapName_CaveOfOrigin: @ 83E7322
- .string "CAVE OF ORIGIN$"
-
-gMapName_SouthernIsland: @ 83E7331
- .string "SOUTHERN ISLAND$"
-
-gMapName_FieryPath: @ 83E7341
- .string "FIERY PATH$"
-
-gMapName_JaggedPass: @ 83E734C
- .string "JAGGED PASS$"
-
-gMapName_SealedChamber: @ 83E7358
- .string "SEALED CHAMBER$"
-
-gMapName_ScorchedSlab: @ 83E7367
- .string "SCORCHED SLAB$"
-
-gMapName_IslandCave: @ 83E7375
- .string "ISLAND CAVE$"
-
-gMapName_DesertRuins: @ 83E7381
- .string "DESERT RUINS$"
-
-gMapName_AncientTomb: @ 83E738E
- .string "ANCIENT TOMB$"
-
-gMapName_InsideOfTruck: @ 83E739B
- .string "INSIDE OF TRUCK$"
-
-gMapName_SkyPillar: @ 83E73AB
- .string "SKY PILLAR$"
-
-gMapName_SecretBase: @ 83E73B6
- .string "SECRET BASE$"
-
-gMapName_None: @ 83E73C2
- .string "$"
-
- .align 2
-gRegionMapLocations:: @ 83E73C4
- region_map_location 4, 11, 1, 1, LittlerootTown
- region_map_location 4, 9, 1, 1, OldaleTown
- region_map_location 2, 14, 1, 1, DewfordTown
- region_map_location 5, 3, 1, 1, LavaridgeTown
- region_map_location 3, 0, 1, 1, FallarborTown
- region_map_location 4, 6, 1, 1, VerdanturfTown
- region_map_location 17, 10, 1, 1, PacifidlogTown
- region_map_location 1, 9, 1, 1, PetalburgCity
- region_map_location 8, 10, 1, 2, SlateportCity
- region_map_location 8, 6, 2, 1, MauvilleCity
- region_map_location 0, 5, 1, 2, RustboroCity
- region_map_location 12, 0, 1, 1, FortreeCity
- region_map_location 18, 3, 2, 1, LilycoveCity
- region_map_location 24, 5, 2, 1, MossdeepCity
- region_map_location 21, 7, 1, 1, SootopolisCity
- region_map_location 27, 8, 1, 2, EverGrandeCity
- region_map_location 4, 10, 1, 1, Route101
- region_map_location 2, 9, 2, 1, Route102
- region_map_location 4, 8, 4, 1, Route103
- region_map_location 0, 7, 1, 3, Route104
- region_map_location 0, 10, 1, 3, Route105
- region_map_location 0, 13, 2, 1, Route106
- region_map_location 3, 14, 3, 1, Route107
- region_map_location 6, 14, 2, 1, Route108
- region_map_location 8, 12, 1, 3, Route109
- region_map_location 8, 7, 1, 3, Route110
- region_map_location 8, 0, 1, 6, Route111
- region_map_location 6, 3, 2, 1, Route112
- region_map_location 4, 0, 4, 1, Route113
- region_map_location 1, 0, 2, 3, Route114
- region_map_location 0, 2, 1, 3, Route115
- region_map_location 1, 5, 4, 1, Route116
- region_map_location 5, 6, 3, 1, Route117
- region_map_location 10, 6, 2, 1, Route118
- region_map_location 11, 0, 1, 6, Route119
- region_map_location 13, 0, 1, 4, Route120
- region_map_location 14, 3, 4, 1, Route121
- region_map_location 16, 4, 1, 2, Route122
- region_map_location 12, 6, 5, 1, Route123
- region_map_location 20, 3, 4, 3, Route124
- region_map_location 24, 3, 2, 2, Route125
- region_map_location 20, 6, 3, 3, Route126
- region_map_location 23, 6, 3, 3, Route127
- region_map_location 23, 9, 4, 1, Route128
- region_map_location 24, 10, 2, 1, Route129
- region_map_location 21, 10, 3, 1, Route130
- region_map_location 18, 10, 3, 1, Route131
- region_map_location 15, 10, 2, 1, Route132
- region_map_location 12, 10, 3, 1, Route133
- region_map_location 9, 10, 3, 1, Route134
- region_map_location 20, 3, 4, 3, Underwater
- region_map_location 20, 6, 3, 3, Underwater
- region_map_location 23, 6, 3, 3, Underwater
- region_map_location 23, 9, 4, 1, Underwater
- region_map_location 21, 7, 1, 1, Underwater
- region_map_location 1, 13, 1, 1, GraniteCave
- region_map_location 6, 2, 1, 1, MtChimney
- region_map_location 16, 2, 1, 1, SafariZone
- region_map_location 22, 12, 1, 1, BattleTower
- region_map_location 0, 8, 1, 1, PetalburgWoods
- region_map_location 2, 5, 1, 1, RusturfTunnel
- region_map_location 6, 14, 1, 1, AbandonedShip
- region_map_location 8, 7, 1, 1, NewMauville
- region_map_location 0, 3, 1, 1, MeteorFalls
- region_map_location 1, 2, 1, 1, MeteorFalls
- region_map_location 16, 4, 1, 1, MtPyre
- region_map_location 19, 3, 1, 1, EvilTeamHideout
- region_map_location 24, 4, 1, 1, ShoalCave
- region_map_location 24, 9, 1, 1, SeafloorCavern
- region_map_location 24, 9, 1, 1, Underwater
- region_map_location 27, 9, 1, 1, VictoryRoad
- region_map_location 17, 10, 1, 1, MirageIsland
- region_map_location 21, 7, 1, 1, CaveOfOrigin
- region_map_location 12, 14, 1, 1, SouthernIsland
- region_map_location 6, 3, 1, 1, FieryPath
- region_map_location 7, 3, 1, 1, FieryPath
- region_map_location 6, 3, 1, 1, JaggedPass
- region_map_location 7, 2, 1, 1, JaggedPass
- region_map_location 11, 10, 1, 1, SealedChamber
- region_map_location 11, 10, 1, 1, Underwater
- region_map_location 13, 0, 1, 1, ScorchedSlab
- region_map_location 0, 10, 1, 1, IslandCave
- region_map_location 8, 3, 1, 1, DesertRuins
- region_map_location 13, 2, 1, 1, AncientTomb
- region_map_location 0, 0, 1, 1, InsideOfTruck
- region_map_location 19, 10, 1, 1, SkyPillar
- region_map_location 0, 0, 1, 1, SecretBase
- region_map_location 0, 0, 1, 1, None
diff --git a/data/region_map_sections.inc b/data/region_map_sections.inc
deleted file mode 100644
index 6336eac0e..000000000
--- a/data/region_map_sections.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-gRegionMapSections:: @ 83E6E50
- .byte 0x58,0x1D,0x1D,0x04,0x1C,0x1C,0x1C,0x1C,0x1A,0x58,0x58,0x22,0x0B,0x23,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58
- .byte 0x58,0x1D,0x58,0x58,0x58,0x58,0x38,0x38,0x1A,0x58,0x58,0x22,0x58,0x23,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58
- .byte 0x1E,0x1D,0x58,0x58,0x58,0x58,0x38,0x38,0x1A,0x58,0x58,0x22,0x58,0x23,0x58,0x58,0x39,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58
- .byte 0x1E,0x58,0x58,0x58,0x58,0x03,0x1B,0x1B,0x1A,0x58,0x58,0x22,0x58,0x23,0x24,0x24,0x24,0x24,0x0C,0x0C,0x27,0x27,0x27,0x27,0x28,0x28,0x58,0x58
- .byte 0x1E,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x1A,0x58,0x58,0x22,0x58,0x58,0x58,0x58,0x25,0x58,0x58,0x58,0x27,0x27,0x27,0x27,0x28,0x28,0x58,0x58
- .byte 0x0A,0x1F,0x1F,0x1F,0x1F,0x58,0x58,0x58,0x1A,0x58,0x58,0x22,0x58,0x58,0x58,0x58,0x25,0x58,0x58,0x58,0x27,0x27,0x27,0x27,0x0D,0x0D,0x58,0x58
- .byte 0x0A,0x58,0x58,0x58,0x05,0x20,0x20,0x20,0x09,0x09,0x21,0x21,0x26,0x26,0x26,0x26,0x26,0x58,0x58,0x58,0x29,0x29,0x29,0x2A,0x2A,0x2A,0x58,0x58
- .byte 0x13,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x19,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x29,0x0E,0x29,0x2A,0x2A,0x2A,0x58,0x58
- .byte 0x13,0x58,0x58,0x58,0x12,0x12,0x12,0x12,0x19,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x29,0x29,0x29,0x2A,0x2A,0x2A,0x58,0x0F
- .byte 0x13,0x07,0x11,0x11,0x01,0x58,0x58,0x58,0x19,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x2B,0x2B,0x2B,0x2B,0x0F
- .byte 0x14,0x58,0x58,0x58,0x10,0x58,0x58,0x58,0x08,0x31,0x31,0x31,0x30,0x30,0x30,0x2F,0x2F,0x06,0x2E,0x2E,0x2E,0x2D,0x2D,0x2D,0x2C,0x2C,0x58,0x58
- .byte 0x14,0x58,0x58,0x58,0x00,0x58,0x58,0x58,0x08,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58
- .byte 0x14,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x18,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x3A,0x58,0x58,0x58,0x58,0x58
- .byte 0x15,0x15,0x15,0x58,0x58,0x58,0x58,0x58,0x18,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58
- .byte 0x58,0x58,0x02,0x16,0x16,0x16,0x17,0x17,0x18,0x58,0x58,0x58,0x49,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58
diff --git a/data/rom_8080874.s b/data/rom_8080874.s
deleted file mode 100644
index 220ec5f96..000000000
--- a/data/rom_8080874.s
+++ /dev/null
@@ -1,18 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 1
-gUnknown_0839ACDC:: @ 839ACDC
- .2byte 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0
-
- .align 2
-gUnknown_0839ACE8:: @ 839ACE8
- .4byte 4
-
- .align 2
-gUnknown_0839ACEC:: @ 839ACEC
- .4byte REG_WIN0H
- .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
- .4byte 1
diff --git a/data/script_funcs.s b/data/script_funcs.s
deleted file mode 100644
index 23d7a76f5..000000000
--- a/data/script_funcs.s
+++ /dev/null
@@ -1,22 +0,0 @@
- .section script_data, "aw", %progbits
-
- .align 2
-gScriptFuncs:: @ 81DCAF4
- .4byte sub_81263D0
- .4byte sub_8126380
- .4byte script_status_stop_and_ret_1
- .4byte sub_81263E4
- .4byte sub_81263D4
- .4byte sub_812641C
- .4byte sub_8126524
- .4byte sub_8126438
- .4byte sub_81264F0
- .4byte sub_812658C
- .4byte sub_81265B0
- .4byte sub_81265DC
- .4byte sub_8126608
- .4byte sub_8126714
- .4byte sub_8126754
- .4byte sub_8126778
- .4byte sub_81267C0
-gScriptFuncs_End::
diff --git a/data/scripts/bard.inc b/data/scripts/bard.inc
index a30045fc8..3f25b100f 100644
--- a/data/scripts/bard.inc
+++ b/data/scripts/bard.inc
@@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744
- special 97
+ special sub_80F7B14
switch RESULT
case 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE784
case 1, MauvilleCity_PokemonCenter_1F_EventScript_1AE845
@@ -20,9 +20,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE784:: @ 81AE784
MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5:: @ 81AE7A5
setvar 0x8004, 0
- special 103
+ special sub_80F7C54
pause 60
- special 98
+ special sub_80F7B2C
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AED, 4
@@ -51,12 +51,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1:: @ 81AE7F1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BD0, 4
setvar 0x8004, 1
- special 103
+ special sub_80F7C54
pause 60
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BFA, 5
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1
- special 99
+ special sub_80F7B40
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C23, 4
release
end
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index fcf32d15d..1bbe7d355 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,5 +1,5 @@
BerryTreeScript:: @ 81A14DD
- special 43
+ special FieldObjectInteractionGetBerryTreeData
switch 0x8004
case 255, Route102_EventScript_1A1533
case 0, Route102_EventScript_1A153D
@@ -21,7 +21,7 @@ Route102_EventScript_1A1533:: @ 81A1533
Route102_EventScript_1A153D:: @ 81A153D
lock
faceplayer
- specialval RESULT, 49
+ specialval RESULT, PlayerHasBerries
compare RESULT, 1
jumpeq Route102_EventScript_1A1558
message Route102_Text_1A16B6
@@ -41,7 +41,7 @@ Route102_EventScript_1A1558:: @ 81A1558
Route102_EventScript_1A1577:: @ 81A1577
fadescreen 1
closebutton
- special 44
+ special sub_80B4EE4
waitstate
compare ITEM_ID, 0
jumpeq Route102_EventScript_1A1593
@@ -108,10 +108,10 @@ Route102_EventScript_1A15F9:: @ 81A15F9
jumpeq Route102_EventScript_1A164B
Route102_EventScript_1A161D:: @ 81A161D
- special 46
+ special FieldObjectInteractionPickBerryTree
compare 0x8004, 0
jumpeq Route102_EventScript_1A1642
- special 47
+ special FieldObjectInteractionRemoveBerryTree
message Route102_Text_1A17FD
fanfare 387
waittext
@@ -139,7 +139,7 @@ Route102_EventScript_1A164B:: @ 81A164B
gUnknown_081A1654:: @ 81A1654
lockall
- special 43
+ special FieldObjectInteractionGetBerryTreeData
call Route102_EventScript_1A16A9
releaseall
end
@@ -159,14 +159,14 @@ Route102_EventScript_1A168D:: @ 81A168D
end
gUnknown_081A168F:: @ 81A168F
- special 43
+ special FieldObjectInteractionGetBerryTreeData
lockall
Route102_EventScript_1A1693:: @ 81A1693
message Route102_Text_1A1912
waittext
- special 48
- special 94
+ special FieldObjectInteractionWaterBerryTree
+ special DoWateringBerryTreeAnim
waitstate
message Route102_Text_1A1925
waittext
@@ -175,7 +175,7 @@ Route102_EventScript_1A1693:: @ 81A1693
end
Route102_EventScript_1A16A9:: @ 81A16A9
- special 45
+ special FieldObjectInteractionPlantBerryTree
inccounter GAME_STAT_PLANTED_BERRIES
message Route102_Text_1A16FB
waittext
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index c8f701d95..4a919c597 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -86,7 +86,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88
.2byte 0
OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2
- special 31
+ special CloseLink
setvar 0x4087, 0
move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmove 0
@@ -99,7 +99,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9
return
OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA
- special 31
+ special CloseLink
setvar 0x4087, 0
compare 0x8007, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C
@@ -120,13 +120,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17
lockall
call OldaleTown_PokemonCenter_2F_EventScript_1A3E30
setmaptile 8, 3, 605, 1
- special 142
+ special DrawWholeMapView
hidebox 0, 0, 29, 19
releaseall
end
OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
- special 31
+ special CloseLink
setvar 0x4087, 0
compare 0x8007, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C
@@ -148,14 +148,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
OldaleTown_PokemonCenter_2F_EventScript_1A3E7B:: @ 81A3E7B
call OldaleTown_PokemonCenter_2F_EventScript_1A3DB2
setmaptile 11, 3, 605, 1
- special 142
+ special DrawWholeMapView
end
OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D
lockall
call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA
setmaptile 5, 3, 605, 1
- special 142
+ special DrawWholeMapView
hidebox 0, 0, 29, 19
releaseall
end
@@ -199,7 +199,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
message OldaleTown_PokemonCenter_2F_Text_1A490C
waittext
- special 28
+ special sub_808347C
waitstate
compare RESULT, 1
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3F5E
@@ -215,14 +215,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5
OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
- special 0
- special 39
- special 331
+ special HealPlayerParty
+ special SavePlayerParty
+ special LoadPlayerBag
copyvar 0x4087, 0x8004
message2 OldaleTown_PokemonCenter_2F_Text_1A4A22
waittext
setmaptile 5, 3, 514, 0
- special 142
+ special DrawWholeMapView
pause 60
move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmove 0
@@ -239,16 +239,16 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
release
compare 0x8004, 5
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD
- special 1
+ special SetCableClubWarp
warp SingleBattleColosseum, 255, 6, 8
- special 2
+ special DoCableClubWarp
waitstate
end
OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD
- special 1
+ special SetCableClubWarp
warp DoubleBattleColosseum, 255, 5, 8
- special 2
+ special DoCableClubWarp
waitstate
end
@@ -280,7 +280,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C
return
OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042
- special 61
+ special CheckForAlivePartyMons
compare RESULT, 0
jumpif 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056
setvar 0x8004, 2
@@ -304,28 +304,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068
jump OldaleTown_PokemonCenter_2F_EventScript_1A432D
OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4C03
waittext
waitbutton
jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0
OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4BCC
waittext
waitbutton
jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0
OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4B95
waittext
waitbutton
jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0
OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4C38
waittext
waitbutton
@@ -366,7 +366,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
message OldaleTown_PokemonCenter_2F_Text_1A490C
waittext
- special 29
+ special sub_80834E4
waitstate
compare RESULT, 1
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4166
@@ -387,7 +387,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
message2 OldaleTown_PokemonCenter_2F_Text_1A4A22
waittext
setmaptile 8, 3, 514, 0
- special 142
+ special DrawWholeMapView
pause 60
move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmove 0
@@ -405,10 +405,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
jump OldaleTown_PokemonCenter_2F_EventScript_1A4325
OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB
- specialval RESULT, 131
+ specialval RESULT, CalculatePlayerPartyCount
compare RESULT, 2
jumpif 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1
- specialval RESULT, 339
+ specialval RESULT, GetNameOfEnigmaBerryInPlayerParty
compare RESULT, 1
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A41EE
setvar RESULT, 1
@@ -460,9 +460,9 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
message OldaleTown_PokemonCenter_2F_Text_1A490C
waittext
- special 30
+ special sub_808350C
waitstate
- special 341
+ special sub_80835D8
waitstate
compare RESULT, 1
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4294
@@ -485,7 +485,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
message2 OldaleTown_PokemonCenter_2F_Text_1A4A22
waittext
setmaptile 11, 3, 514, 0
- special 142
+ special DrawWholeMapView
pause 60
move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmove 0
@@ -503,7 +503,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
jump OldaleTown_PokemonCenter_2F_EventScript_1A4325
OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4AC8
waittext
waitbutton
@@ -511,7 +511,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9
end
OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4A85
waittext
waitbutton
@@ -519,7 +519,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5
end
OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4A30
waittext
waitbutton
@@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301
end
OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4B1D
waittext
waitbutton
@@ -535,7 +535,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D
end
OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4B59
waittext
waitbutton
@@ -543,13 +543,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319
end
OldaleTown_PokemonCenter_2F_EventScript_1A4325:: @ 81A4325
- special 1
- special 2
+ special SetCableClubWarp
+ special DoCableClubWarp
waitstate
end
OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D
- special 31
+ special CloseLink
message OldaleTown_PokemonCenter_2F_Text_1A4B6C
waittext
waitbutton
@@ -597,7 +597,7 @@ OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361
gUnknown_081A4363:: @ 81A4363
lockall
- special 196
+ special ShowLinkBattleRecords
waitbutton
hidebox 0, 0, 29, 19
releaseall
@@ -605,57 +605,57 @@ gUnknown_081A4363:: @ 81A4363
SingleBattleColosseum_EventScript_1A436F:: @ 81A436F
setvar 0x8005, 0
- special 32
+ special sub_8083B90
waitstate
end
SingleBattleColosseum_EventScript_1A4379:: @ 81A4379
setvar 0x8005, 1
- special 32
+ special sub_8083B90
waitstate
end
DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383
fadescreen 1
- special 41
+ special sub_80C5568
waitstate
compare RESULT, 0
jumpeq DoubleBattleColosseum_EventScript_1A43EF
setvar 0x8005, 0
- special 32
+ special sub_8083B90
waitstate
end
DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E
fadescreen 1
- special 41
+ special sub_80C5568
waitstate
compare RESULT, 0
jumpeq DoubleBattleColosseum_EventScript_1A43EF
setvar 0x8005, 1
- special 32
+ special sub_8083B90
waitstate
end
DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9
fadescreen 1
- special 41
+ special sub_80C5568
waitstate
compare RESULT, 0
jumpeq DoubleBattleColosseum_EventScript_1A43EF
setvar 0x8005, 2
- special 32
+ special sub_8083B90
waitstate
end
DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4
fadescreen 1
- special 41
+ special sub_80C5568
waitstate
compare RESULT, 0
jumpeq DoubleBattleColosseum_EventScript_1A43EF
setvar 0x8005, 3
- special 32
+ special sub_8083B90
waitstate
end
@@ -664,31 +664,31 @@ DoubleBattleColosseum_EventScript_1A43EF:: @ 81A43EF
TradeCenter_EventScript_1A43F0:: @ 81A43F0
setvar 0x8005, 0
- special 33
+ special sub_8083B5C
waitstate
end
TradeCenter_EventScript_1A43FA:: @ 81A43FA
setvar 0x8005, 1
- special 33
+ special sub_8083B5C
waitstate
end
@ 81A4404
setvar 0x8005, 2
- special 33
+ special sub_8083B5C
waitstate
end
@ 81A440E
setvar 0x8005, 3
- special 33
+ special sub_8083B5C
waitstate
end
RecordCorner_EventScript_1A4418:: @ 81A4418
setvar 0x8005, 0
- special 27
+ special sub_80B929C
waitstate
compare 0x4001, 0
jumpif 5, RecordCorner_EventScript_1A446C
@@ -696,7 +696,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418
RecordCorner_EventScript_1A442D:: @ 81A442D
setvar 0x8005, 1
- special 27
+ special sub_80B929C
waitstate
compare 0x4001, 0
jumpif 5, RecordCorner_EventScript_1A446C
@@ -704,7 +704,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D
RecordCorner_EventScript_1A4442:: @ 81A4442
setvar 0x8005, 2
- special 27
+ special sub_80B929C
waitstate
compare 0x4001, 0
jumpif 5, RecordCorner_EventScript_1A446C
@@ -712,7 +712,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442
RecordCorner_EventScript_1A4457:: @ 81A4457
setvar 0x8005, 3
- special 27
+ special sub_80B929C
waitstate
compare 0x4001, 0
jumpif 5, RecordCorner_EventScript_1A446C
@@ -731,7 +731,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479
waittext
waitbutton
fadescreen 1
- special 42
+ special sub_8083BDC
waitstate
end
@@ -740,7 +740,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487
waittext
waitbutton
fadescreen 1
- special 42
+ special sub_8083BDC
waitstate
end
@@ -752,40 +752,40 @@ TradeRoom_TooBusyToNotice:: @ 81A4495
end
SingleBattleColosseum_EventScript_1A449E:: @ 81A449E
- special 295
+ special sub_8064EAC
message SingleBattleColosseum_Text_1A4D7E
waittext
waitbutton
- special 296
+ special sub_8064ED4
closebutton
end
TradeCenter_EventScript_1A44AD:: @ 81A44AD
- special 295
+ special sub_8064EAC
message TradeCenter_Text_1A4DAB
waittext
waitbutton
- special 296
+ special sub_8064ED4
closebutton
end
RecordCorner_EventScript_1A44BC:: @ 81A44BC
compare 0x4000, 0
jumpif 5, RecordCorner_EventScript_1A44D6
- special 295
+ special sub_8064EAC
message RecordCorner_Text_1A4DD7
waittext
waitbutton
- special 296
+ special sub_8064ED4
closebutton
end
RecordCorner_EventScript_1A44D6:: @ 81A44D6
- special 295
+ special sub_8064EAC
message RecordCorner_Text_1A4DF7
waittext
waitbutton
- special 296
+ special sub_8064ED4
closebutton
end
@@ -799,11 +799,11 @@ TradeRoom_PromptToCancelLink:: @ 81A44E5
TradeRoom_TerminateLink:: @ 81A44FE
message2 TradeRoom_TerminatingLink
waittext
- special 5
+ special sub_80839D0
end
gUnknown_081A4508:: @ 81A4508
- special 4
- special 3
+ special sub_80839A4
+ special sub_80810DC
waitstate
end
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index a8b134c0b..1952264d2 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -122,7 +122,7 @@ FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048
choosecontestpkmn
compare 0x8004, 255
jumpeq FallarborTown_ContestLobby_EventScript_1A5097
- special 84
+ special sub_80C43F4
compare RESULT, 0
jumpeq FallarborTown_ContestLobby_EventScript_1A50C8
compare RESULT, 1
@@ -337,7 +337,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311
return
LinkContestRoom1_EventScript_1A5323:: @ 81A5323
- special 81
+ special sub_80C4C64
addvar 0x8006, 1
buffernum 1, 0x8006
lockall
@@ -352,7 +352,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323
releaseall
addvar 0x8006, -1
playsfx 15
- special 320
+ special ShowContestEntryMonPic
call LinkContestRoom1_EventScript_1A535E
return
@@ -430,7 +430,7 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5
return
LinkContestRoom1_EventScript_1A5455:: @ 81A5455
- special 87
+ special sub_80C47A0
compare 0x4088, 1
callif 1, LinkContestRoom1_EventScript_1A555A
compare 0x4088, 2
@@ -463,7 +463,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455
LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB
setvar RESULT, 8
- special 340
+ special ScriptRandom
compare RESULT, 0
callif 1, LinkContestRoom1_EventScript_1A5760
compare RESULT, 1
@@ -725,7 +725,7 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880
closebutton
release
disappear 13
- special 321
+ special sub_80C5164
switch 0x8006
case 0, LinkContestRoom1_EventScript_1A58BA
case 1, LinkContestRoom1_EventScript_1A58C7
@@ -857,7 +857,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2
return
LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC
- special 76
+ special sub_80C47C0
switch 0x8005
case 0, LinkContestRoom1_EventScript_1A5A31
case 1, LinkContestRoom1_EventScript_1A5A37
@@ -882,8 +882,8 @@ LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43
return
LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49
- special 79
- special 80
+ special sub_80C47F0
+ special sub_80C4858
addvar 0x8005, 1
buffernum 1, 0x8005
addvar 0x8005, -1
@@ -1006,7 +1006,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
setvar 0x4001, 0
call LinkContestRoom1_EventScript_1A5A90
pause 30
- special 134
+ special sub_80C4CF8
compare 0x8004, 1
jumpeq LinkContestRoom1_EventScript_1A5C46
return
@@ -1015,19 +1015,19 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6
inccounter GAME_STAT_WON_CONTEST
msgbox LinkContestRoom1_Text_1A6DF1, 3
pause 90
- special 134
+ special sub_80C4CF8
compare 0x8004, 1
jumpeq LinkContestRoom1_EventScript_1A5C46
return
LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12
- specialval RESULT, 88
+ specialval RESULT, sub_80C4440
compare RESULT, 1
jumpeq LinkContestRoom1_EventScript_1A5C23
return
LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23
- special 76
+ special sub_80C47C0
compare 0x8005, 3
jumpeq LinkContestRoom1_EventScript_1A5C32
return
@@ -1052,7 +1052,7 @@ LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46
LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C
pause 60
call LinkContestRoom1_EventScript_1A5C6A
- special 134
+ special sub_80C4CF8
compare 0x8004, 1
jumpeq LinkContestRoom1_EventScript_1A5C64
closebutton
@@ -1063,8 +1063,8 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64
return
LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A
- special 77
- special 76
+ special sub_80C496C
+ special sub_80C47C0
comparevars 0x8004, 0x8005
jumpeq LinkContestRoom1_EventScript_1A5C7C
return
@@ -1110,7 +1110,7 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8
return
LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5
- special 76
+ special sub_80C47C0
compare 0x8005, 3
jumpeq LinkContestRoom1_EventScript_1A5CFC
msgbox LinkContestRoom1_Text_1A6DF1, 3
@@ -1120,7 +1120,7 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC
compare 0x4088, 2
callif 1, LinkContestRoom1_EventScript_1A5C42
inccounter GAME_STAT_WON_CONTEST
- specialval RESULT, 88
+ specialval RESULT, sub_80C4440
compare RESULT, 0
jumpeq LinkContestRoom1_EventScript_1A5D5B
compare CONTEST_RANK, 3
@@ -1141,7 +1141,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B
return
LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
- special 89
+ special sub_80C44C0
inccounter GAME_STAT_RECEIVED_RIBBONS
setflag 2107
lockall
@@ -1149,7 +1149,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
fanfare 370
msgbox LinkContestRoom1_Text_1A6D96, 4
waitfanfare
- special 80
+ special sub_80C4858
msgbox LinkContestRoom1_Text_1A6DAC, 4
releaseall
return
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 1e248ba9f..b5b3d4670 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -1,8 +1,8 @@
Route117_EventScript_1B222D:: @ 81B222D
lock
faceplayer
- special 181
- specialval RESULT, 182
+ special sp0B5_daycare
+ specialval RESULT, sp0B6_daycare
compare RESULT, 1
jumpeq Route117_EventScript_1B2262
compare RESULT, 2
@@ -22,12 +22,12 @@ Route117_EventScript_1B2262:: @ 81B2262
jumpeq Route117_EventScript_1B2298
msgbox Route117_Text_1B2745, 4
clearflag 134
- special 183
+ special sub_8041E7C
release
end
Route117_EventScript_1B2298:: @ 81B2298
- specialval RESULT, 131
+ specialval RESULT, CalculatePlayerPartyCount
compare RESULT, 6
jumpif 5, Route117_EventScript_1B22B2
msgbox Route117_Text_1B2766, 4
@@ -41,13 +41,13 @@ Route117_EventScript_1B22B2:: @ 81B22B2
waittext
waitbutton
msgbox Route117_Text_1B27CD, 4
- special 184
+ special sp0B8_daycare
clearflag 134
release
end
Route117_EventScript_1B22CD:: @ 81B22CD
- specialval RESULT, 195
+ specialval RESULT, sub_8042B4C
compare RESULT, 1
callif 1, Route117_EventScript_1B22DE
return
@@ -57,7 +57,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE
return
Route117_EventScript_1B22E7:: @ 81B22E7
- special 181
+ special sp0B5_daycare
msgbox Route117_Text_1B2710, 4
setvar 0x8004, 0
call Route117_EventScript_1B22CD
@@ -65,10 +65,10 @@ Route117_EventScript_1B22E7:: @ 81B22E7
end
Route117_EventScript_1B22FE:: @ 81B22FE
- special 181
+ special sp0B5_daycare
msgbox Route117_Text_1B2897, 4
- special 185
- special 141
+ special sp0B9_daycare_relationship_comment
+ special ShowFieldMessageStringVar4
waittext
waitbutton
setvar 0x8004, 0
@@ -81,7 +81,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE
Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327
lock
faceplayer
- specialval RESULT, 182
+ specialval RESULT, sp0B6_daycare
compare RESULT, 1
jumpeq Route117_PokemonDayCare_EventScript_1B2407
compare RESULT, 2
@@ -96,26 +96,26 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327
end
Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
- specialval RESULT, 132
+ specialval RESULT, sub_8095B6C
compare RESULT, 1
jumpeq Route117_PokemonDayCare_EventScript_1B23F3
msgbox Route117_PokemonDayCare_Text_1B2947, 4
fadescreen 1
- special 188
+ special ChooseSendDaycareMon
waitstate
compare 0x8004, 255
jumpeq Route117_PokemonDayCare_EventScript_1B23D0
- specialval RESULT, 133
+ specialval RESULT, sub_8095C10
compare RESULT, 0
jumpeq Route117_PokemonDayCare_EventScript_1B23FD
- specialval 0x8005, 186
+ specialval 0x8005, sub_8042328
checksound
pokecry 0x8005, 0
msgbox Route117_PokemonDayCare_Text_1B296E, 4
waitpokecry
- special 187
+ special Daycare_SendPokemon_Special
inccounter GAME_STAT_USED_DAYCARE
- specialval RESULT, 182
+ specialval RESULT, sp0B6_daycare
compare RESULT, 2
jumpeq Route117_PokemonDayCare_EventScript_1B23DA
release
@@ -153,7 +153,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411
return
Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A
- specialval RESULT, 190
+ specialval RESULT, sub_80417B8
compare RESULT, 0
callif 5, Route117_PokemonDayCare_EventScript_1B2411
return
@@ -172,14 +172,14 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B
end
Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469
- specialval RESULT, 131
+ specialval RESULT, CalculatePlayerPartyCount
compare RESULT, 6
jumpeq Route117_PokemonDayCare_EventScript_1B2539
- specialval RESULT, 182
+ specialval RESULT, sp0B6_daycare
setvar 0x8004, 0
compare RESULT, 2
jumpeq Route117_PokemonDayCare_EventScript_1B24A8
- special 189
+ special ShowDaycareLevelMenu
waitstate
copyvar 0x8004, RESULT
compare RESULT, 2
@@ -188,7 +188,7 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469
end
Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8
- special 191
+ special sub_8041770
msgbox Route117_PokemonDayCare_Text_1B2B49, 5
compare RESULT, 1
jumpeq Route117_PokemonDayCare_EventScript_1B24C4
@@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8
end
Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4
- specialval RESULT, 197
+ specialval RESULT, sub_80B7CE8
compare RESULT, 1
jumpeq Route117_PokemonDayCare_EventScript_1B24DE
msgbox Route117_PokemonDayCare_Text_1B2A30, 4
@@ -206,15 +206,15 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4
Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE
move 1, Route117_PokemonDayCare_Movement_1B2543
waitmove 0
- specialval RESULT, 192
- special 198
+ specialval RESULT, sub_8041648
+ special sub_80B7D0C
playsfx 95
msgbox Route117_PokemonDayCare_Text_1B2B75, 4
checksound
pokecry RESULT, 0
msgbox Route117_PokemonDayCare_Text_1B2B93, 4
waitpokecry
- specialval RESULT, 182
+ specialval RESULT, sp0B6_daycare
compare RESULT, 2
jumpeq Route117_PokemonDayCare_EventScript_1B2520
jump Route117_PokemonDayCare_EventScript_1B23D0
@@ -271,12 +271,12 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
end
@ 81B2591
- special 189
+ special ShowDaycareLevelMenu
waitstate
compare RESULT, 2
jumpeq Route117_PokemonDayCare_EventScript_1B23D0
copyvar 0x8004, RESULT
- specialval RESULT, 192
+ specialval RESULT, sub_8041648
msgbox Route117_PokemonDayCare_Text_1B2B75, 4
msgbox Route117_PokemonDayCare_Text_1B2A76, 4
release
@@ -285,7 +285,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
Event_EggHatch:: @ 81B25BC
lockall
msgbox UnknownString_81B2C68, 4
- special 194
+ special EggHatch
waitstate
releaseall
end
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index f008e892b..67a0920fa 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -2,7 +2,7 @@ Route111_EventScript_1AE313:: @ 81AE313
Route118_EventScript_1AE313:: @ 81AE313
Route120_EventScript_1AE313:: @ 81AE313
settrainerflag OPPONENT_GABBY_AND_TY_6
- specialval RESULT, 172
+ specialval RESULT, GabbyAndTyGetBattleNum
switch RESULT
case 0, Route111_EventScript_1AE384
case 1, Route111_EventScript_1AE38A
@@ -200,8 +200,8 @@ Route120_EventScript_1AE582:: @ 81AE582
end
Route111_EventScript_1AE5A2:: @ 81AE5A2
- special 174
- special 179
+ special GabbyAndTyBeforeInterview
+ special GabbyAndTySetScriptVarsToFieldObjectLocalIds
compare FACING, 2
callif 1, Route111_EventScript_1AE5E0
compare FACING, 1
@@ -234,8 +234,8 @@ Route111_EventScript_1AE5FD:: @ 81AE5FD
Route111_EventScript_1AE60F:: @ 81AE60F
Route118_EventScript_1AE60F:: @ 81AE60F
Route120_EventScript_1AE60F:: @ 81AE60F
- special 174
- special 179
+ special GabbyAndTyBeforeInterview
+ special GabbyAndTySetScriptVarsToFieldObjectLocalIds
compare FACING, 2
callif 1, Route111_EventScript_1AE5E0
compare FACING, 1
@@ -244,11 +244,11 @@ Route120_EventScript_1AE60F:: @ 81AE60F
callif 1, Route111_EventScript_1AE5FD
checkflag 1
jumpeq Route111_EventScript_1AE73A
- specialval RESULT, 177
+ specialval RESULT, GabbyAndTyGetLastQuote
compare RESULT, 0
jumpeq Route111_EventScript_1AE69F
msgbox Route111_Text_1AC10A, 4
- specialval RESULT, 178
+ specialval RESULT, sub_80BDD18
switch RESULT
case 0, Route111_EventScript_1AE6AD
case 1, Route111_EventScript_1AE6BB
@@ -310,7 +310,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3
compare RESULT, 0
jumpeq Route111_EventScript_1AE72D
msgbox Route111_Text_1AC487, 4
- special 173
+ special sub_80BDC14
setflag 1
release
end
diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc
index 3cd57ad6e..263589fe9 100644
--- a/data/scripts/giddy.inc
+++ b/data/scripts/giddy.inc
@@ -9,7 +9,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C
- special 106
+ special sub_80F7CC8
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E
compare RESULT, 0
@@ -17,7 +17,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26
- special 106
+ special sub_80F7CC8
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40
compare RESULT, 0
@@ -30,8 +30,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E
- special 105
- special 141
+ special sub_80F7CF4
+ special ShowFieldMessageStringVar4
waittext
yesnobox 20, 8
compare RESULT, 1
diff --git a/data/scripts/hipster.inc b/data/scripts/hipster.inc
index 833bb1605..3e24e4868 100644
--- a/data/scripts/hipster.inc
+++ b/data/scripts/hipster.inc
@@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845
faceplayer
setflag 2054
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4
- special 100
+ special sub_80F7C70
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4
@@ -11,7 +11,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A
- special 102
+ special sub_80F7C90
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4
@@ -20,6 +20,6 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A
MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4
- special 101
+ special sub_80F7C84
release
end
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
index e6b6a8f3d..b0ae966ad 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
@@ -38,7 +38,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3
removeitem ITEM_STORAGE_KEY, 1
setflag 239
call AbandonedShip_Corridors_B1F_EventScript_15E9C0
- special 142
+ special DrawWholeMapView
releaseall
end
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
index 4b634106a..8cb2aed22 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
@@ -70,7 +70,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
removeitem ITEM_ROOM_1_KEY, 1
setflag 240
call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -86,7 +86,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
removeitem ITEM_ROOM_2_KEY, 1
setflag 241
call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -102,7 +102,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
removeitem ITEM_ROOM_4_KEY, 1
setflag 242
call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -118,7 +118,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98
removeitem ITEM_ROOM_6_KEY, 1
setflag 243
call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
- special 142
+ special DrawWholeMapView
releaseall
end
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
index 5e90673fe..5c4c050a0 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
@@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
setanimation 1, 10
setanimation 2, 0
doanimation 54
- specialval RESULT, 290
+ specialval RESULT, sub_810F4D4
compare RESULT, 0
callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B
checkanimation 54
@@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4
end
AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5
- specialval RESULT, 288
+ specialval RESULT, sub_810F488
compare RESULT, 1
jumpeq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA
pause 20
@@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
setanimation 1, 3
setanimation 2, 0
doanimation 54
- specialval RESULT, 291
+ specialval RESULT, sub_810F4FC
compare RESULT, 0
callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B
checkanimation 54
@@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
setanimation 1, 6
setanimation 2, 0
doanimation 54
- specialval RESULT, 289
+ specialval RESULT, sub_810F4B0
compare RESULT, 0
callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B
checkanimation 54
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
index b2525d62e..a6ccdc43c 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
+++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
@@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67
AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68
trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq AbandonedShip_Rooms2_1F_EventScript_15EA93
msgbox AbandonedShip_Rooms2_1F_Text_198835, 6
@@ -16,7 +16,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93
AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE
trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq AbandonedShip_Rooms2_1F_EventScript_15EAD9
msgbox AbandonedShip_Rooms2_1F_Text_198934, 6
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index f8eba6a9d..7ba7540c4 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -64,7 +64,7 @@ AncientTomb_EventScript_15F050:: @ 815F050
setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
setflag 937
setflag 2145
- special 313
+ special StartBattle_Regi
waitstate
clearflag 2145
release
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
index d991b8853..176d8e8e8 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
@@ -12,35 +12,35 @@ BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB
waitmove 0
BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
- special 232
+ special sub_81347F8
reappear 1
move 1, BattleTower_BattleRoom_Movement_160AC0
waitmove 0
- special 234
+ special sub_8135474
msgbox 0x20234cc, 4
waittext
closebutton
- special 0
+ special HealPlayerParty
setvar 0x8004, 0
setvar 0x8005, 0
- special 236
+ special sub_813556C
waitstate
switch RESULT
case 1, BattleTower_BattleRoom_EventScript_160961
- special 40
+ special LoadPlayerParty
setvar 0x8004, 0
setvar 0x8005, 5
- special 237
+ special sub_8135668
setvar 0x8004, 14
- special 237
+ special sub_8135668
setvar 0x8004, 3
- special 170
+ special sub_810FF60
warp BattleTower_Lobby, 255, 6, 6
waitstate
BattleTower_BattleRoom_EventScript_160961:: @ 8160961
setvar 0x8004, 6
- special 237
+ special sub_8135668
switch RESULT
case 8, BattleTower_BattleRoom_EventScript_160A56
move 1, BattleTower_BattleRoom_Movement_160AC6
@@ -51,12 +51,12 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961
move 255, BattleTower_BattleRoom_Movement_160ABC
waitmove 0
msgbox BattleTower_BattleRoom_Text_19ACDC, 4
- special 40
- special 39
- special 239
+ special LoadPlayerParty
+ special SavePlayerParty
+ special sub_8135A14
fanfare 368
waitfanfare
- special 0
+ special HealPlayerParty
BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
msgbox BattleTower_BattleRoom_Text_19AD09, 5
@@ -88,25 +88,25 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C
jump BattleTower_BattleRoom_EventScript_1608FA
BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56
- special 40
+ special LoadPlayerParty
setvar 0x8004, 0
setvar 0x8005, 4
- special 237
+ special sub_8135668
setvar 0x8004, 2
setvar 0x8005, 1
- special 237
+ special sub_8135668
setvar 0x8004, 7
- special 237
+ special sub_8135668
setvar 0x8004, 14
- special 237
+ special sub_8135668
setvar 0x8004, 3
- special 170
+ special sub_810FF60
warp BattleTower_Lobby, 255, 6, 6
waitstate
BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
setvar 0x8004, 2
- special 240
+ special sub_8135BA0
message BattleTower_BattleRoom_Text_1C6CE1
pause 60
waittext
@@ -116,7 +116,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1
fadescreen 1
- special 241
+ special sub_8135C38
end
BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7
diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc
index 7a79cc4e9..408e7485e 100644
--- a/data/scripts/maps/BattleTower_Elevator.inc
+++ b/data/scripts/maps/BattleTower_Elevator.inc
@@ -12,7 +12,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4
move 1, BattleTower_Elevator_Movement_160835
move 255, BattleTower_Elevator_Movement_160839
waitmove 0
- special 273
+ special sub_810EBEC
waitstate
pause 64
move 1, BattleTower_Elevator_Movement_16083D
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index cee3d7cec..8cd3639a5 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -6,30 +6,30 @@ BattleTower_Lobby_MapScripts:: @ 816027E
.byte 0
BattleTower_Lobby_MapScript1_160293:: @ 8160293
- special 338
+ special sub_813610C
call BattleTower_Lobby_EventScript_16029C
end
BattleTower_Lobby_EventScript_16029C:: @ 816029C
setvar 0x8004, 10
- special 237
+ special sub_8135668
checkflag 238
jumpeq BattleTower_Lobby_EventScript_1602E4
checkflag 237
jumpeq BattleTower_Lobby_EventScript_1602CD
- specialval 0x8007, 247
+ specialval 0x8007, sub_810F404
compare 0x8007, 50
jumpif 0, BattleTower_Lobby_EventScript_1602E4
clearflag 941
- special 329
+ special sub_810F8FC
return
BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
- specialval 0x8007, 247
+ specialval 0x8007, sub_810F404
compare 0x8007, 100
jumpif 0, BattleTower_Lobby_EventScript_1602E4
clearflag 941
- special 329
+ special sub_810F8FC
return
BattleTower_Lobby_EventScript_1602E4:: @ 81602E4
@@ -58,7 +58,7 @@ BattleTower_Lobby_MapScript2_160302:: @ 8160302
.2byte 0
BattleTower_Lobby_EventScript_16032C:: @ 816032C
- special 231
+ special sub_8134548
end
BattleTower_Lobby_EventScript_160330:: @ 8160330
@@ -76,10 +76,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
message BattleTower_Lobby_Text_19A487
waittext
setvar 0x8004, 0
- special 238
+ special sub_81358A4
compare RESULT, 6
jumpeq BattleTower_Lobby_EventScript_16037D
- special 244
+ special sub_8135E50
compare RESULT, 0
jumpeq BattleTower_Lobby_EventScript_16037D
message BattleTower_Lobby_Text_19A6BE
@@ -90,26 +90,26 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
BattleTower_Lobby_EventScript_16037D:: @ 816037D
setvar 0x8004, 8
- special 238
+ special sub_81358A4
compare RESULT, 1
jumpeq BattleTower_Lobby_EventScript_1603AD
message BattleTower_Lobby_Text_19A589
waittext
setvar 0x8004, 13
- special 237
- special 242
+ special sub_8135668
+ special sub_8135D84
setvar 0x8004, 3
- special 240
+ special sub_8135BA0
playsfx 55
checksound
BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
setvar 0x8004, 0
setvar 0x8005, 3
- special 237
+ special sub_8135668
message BattleTower_Lobby_Text_19A4BB
waittext
- special 243
+ special sub_8135DEC
switch RESULT
case 0, BattleTower_Lobby_EventScript_160408
message BattleTower_Lobby_Text_19A506
@@ -117,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
fanfare 370
waitfanfare
setvar 0x8004, 9
- special 238
+ special sub_81358A4
compare RESULT, 49
jumpif 5, BattleTower_Lobby_EventScript_1603F8
msgbox BattleTower_Lobby_Text_19A617, 4
@@ -145,9 +145,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419
message BattleTower_Lobby_Text_19A589
waittext
setvar 0x8004, 13
- special 237
+ special sub_8135668
setvar 0x8004, 0
- special 240
+ special sub_8135BA0
playsfx 55
checksound
msgbox BattleTower_Lobby_Text_199FA9, 4
@@ -165,15 +165,15 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B
message BattleTower_Lobby_Text_19A5CE
waittext
setvar 0x8004, 1
- special 240
+ special sub_8135BA0
playsfx 55
checksound
setvar 0x8004, 8
setvar 0x8005, 0
- special 237
+ special sub_8135668
setvar 0x4000, 5
- special 39
- special 239
+ special SavePlayerParty
+ special sub_8135A14
msgbox BattleTower_Lobby_Text_19A0A8, 4
closebutton
call BattleTower_Lobby_EventScript_160664
@@ -185,10 +185,10 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E
lock
faceplayer
setvar 0x8004, 0
- special 238
+ special sub_81358A4
compare RESULT, 6
jumpeq BattleTower_Lobby_EventScript_160342
- special 39
+ special SavePlayerParty
msgbox BattleTower_Lobby_Text_199F2C, 4
BattleTower_Lobby_EventScript_1604BE:: @ 81604BE
@@ -208,16 +208,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
switch RESULT
case 2, BattleTower_Lobby_EventScript_160652
case 127, BattleTower_Lobby_EventScript_160652
- special 233
+ special CheckPartyBattleTowerBanlist
compare 0x8004, 1
jumpeq BattleTower_Lobby_EventScript_16060D
setvar 0x8004, 1
copyvar 0x8005, RESULT
copyvar 0x8006, RESULT
- special 237
+ special sub_8135668
msgbox BattleTower_Lobby_Text_19A07B, 4
fadescreen 1
- special 245
+ special ChooseBattleTowerPlayerParty
waitstate
compare RESULT, 0
jumpeq BattleTower_Lobby_EventScript_16064F
@@ -229,17 +229,17 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
BattleTower_Lobby_EventScript_160587:: @ 8160587
setvar 0x8004, 5
- special 237
+ special sub_8135668
setvar 0x4000, 0
setvar 0x8004, 11
- special 237
+ special sub_8135668
setvar 0x8004, 0
setvar 0x8005, 1
- special 237
+ special sub_8135668
setvar 0x8004, 8
setvar 0x8005, 0
- special 237
- special 40
+ special sub_8135668
+ special LoadPlayerParty
closebutton
pause 2
call BattleTower_Lobby_EventScript_19F806
@@ -248,8 +248,8 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
compare RESULT, 0
jumpeq BattleTower_Lobby_EventScript_160642
inccounter GAME_STAT_ENTERED_BATTLE_TOWER
- special 39
- special 239
+ special SavePlayerParty
+ special sub_8135A14
setvar 0x40bc, 1
msgbox BattleTower_Lobby_Text_19A0A8, 4
closebutton
@@ -277,16 +277,16 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635
BattleTower_Lobby_EventScript_160642:: @ 8160642
setvar 0x8004, 12
- special 237
+ special sub_8135668
jump BattleTower_Lobby_EventScript_160652
BattleTower_Lobby_EventScript_16064F:: @ 816064F
- special 40
+ special LoadPlayerParty
BattleTower_Lobby_EventScript_160652:: @ 8160652
msgbox BattleTower_Lobby_Text_199FA9, 4
setvar 0x8004, 11
- special 237
+ special sub_8135668
BattleTower_Lobby_EventScript_160662:: @ 8160662
release
@@ -378,7 +378,7 @@ BattleTower_Lobby_EventScript_16071E:: @ 816071E
BattleTower_Lobby_EventScript_160727:: @ 8160727
lockall
- special 283
+ special ShowBattleTowerRecords
waitbutton
hidebox 0, 0, 29, 19
releaseall
@@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733
end
BattleTower_Lobby_EventScript_160773:: @ 8160773
- specialval RESULT, 247
+ specialval RESULT, sub_810F404
compare RESULT, 100
jumpif 0, BattleTower_Lobby_EventScript_1607C5
msgbox BattleTower_Lobby_Text_19AAC4, 4
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index e9f23ff5a..023892d36 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -35,7 +35,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
closebutton
setweather 0
doweather
- special 284
+ special WaitWeather
waitstate
playsfx 209
setanimation 0, 9
@@ -49,9 +49,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
setvar RESULT, 2
.endif
playsfx 107
- special 281
+ special sub_80818A4
waitstate
- special 282
+ special sub_80818FC
waitstate
move 1, CaveOfOrigin_B4F_Movement_15DE7D
waitmove 0
@@ -62,10 +62,10 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
pause 40
waitpokecry
setflag 2145
- special 311
+ special StartBattle_GroudonKyogre
waitstate
clearflag 2145
- specialval RESULT, 180
+ specialval RESULT, sub_810E300
compare RESULT, 1
callif 1, CaveOfOrigin_B4F_EventScript_15DE73
setflag 816
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index d5787d792..df40fc126 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -64,7 +64,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85
setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
setflag 935
setflag 2145
- special 313
+ special StartBattle_Regi
waitstate
clearflag 2145
release
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
index 0b25e0aba..28d396a3e 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/scripts/maps/DewfordTown_Hall.inc
@@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293
lock
faceplayer
call DewfordTown_Hall_EventScript_1A0102
- special 127
+ special sub_80FA5E4
compare RESULT, 1
jumpeq DewfordTown_Hall_EventScript_1532B2
msgbox DewfordTown_Hall_Text_1754C9, 4
@@ -29,7 +29,7 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD
lock
faceplayer
call DewfordTown_Hall_EventScript_1A0102
- special 128
+ special sub_80EB83C
msgbox DewfordTown_Hall_Text_1755F9, 5
compare RESULT, 1
jumpeq DewfordTown_Hall_EventScript_1532F6
@@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_153353:: @ 8153353
DewfordTown_Hall_EventScript_153363:: @ 8153363
lockall
call DewfordTown_Hall_EventScript_1A0102
- special 129
+ special sub_80FA648
switch RESULT
case 0, DewfordTown_Hall_EventScript_1533CA
case 4, DewfordTown_Hall_EventScript_1533CA
@@ -133,7 +133,7 @@ DewfordTown_Hall_EventScript_1533FE:: @ 81533FE
DewfordTown_Hall_EventScript_15340A:: @ 815340A
call DewfordTown_Hall_EventScript_1A0102
- special 129
+ special sub_80FA648
switch RESULT
case 0, DewfordTown_Hall_EventScript_153470
case 1, DewfordTown_Hall_EventScript_153470
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index 0e5dc21b0..bddcfa74b 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
@@ -48,7 +48,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
playsfx 8
setmaptile 6, 1, 838, 0
setmaptile 6, 2, 839, 0
- special 142
+ special DrawWholeMapView
msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4
closebutton
playsfx 8
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
index c16bd544f..d10957a8e 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
@@ -56,7 +56,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
setvar 0x8004, 0
- special 170
+ special sub_810FF60
setflag 1248
call EverGrandeCity_DrakesRoom_EventScript_1A0693
msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
index 2e7099110..175990328 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
@@ -53,7 +53,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41
sethealplace 1
fadescreendelay 1, 24
- special 272
+ special GameClear
waitstate
releaseall
end
@@ -61,7 +61,7 @@ EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41
EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D
sethealplace 2
fadescreendelay 1, 24
- special 272
+ special GameClear
waitstate
releaseall
end
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc
index 706d9aa5f..ed67d922d 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
@@ -11,7 +11,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD
setvar CONTEST_RANK, 1
call FallarborTown_ContestLobby_EventScript_1A4E92
call FallarborTown_ContestLobby_EventScript_1539F8
- special 83
+ special sub_80C4BF0
call FallarborTown_ContestLobby_EventScript_15FBDB
setvar 0x4088, 2
warp LinkContestRoom1, 255, 7, 5
@@ -25,13 +25,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8
playsfx 71
setmaptile 4, 2, 545, 1
setmaptile 4, 3, 609, 1
- special 142
+ special DrawWholeMapView
move 1, FallarborTown_ContestLobby_Movement_153A7F
waitmove 0
playsfx 71
setmaptile 4, 2, 721, 1
setmaptile 4, 3, 729, 1
- special 142
+ special DrawWholeMapView
pause 20
move 1, FallarborTown_ContestLobby_Movement_153A8C
waitmove 0
@@ -114,7 +114,7 @@ FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB
FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2
lockall
- special 259
+ special ShowBerryBlenderRecordWindow
waitbutton
hidebox 0, 0, 29, 19
releaseall
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc
index 179f281af..1351b96d3 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/scripts/maps/FallarborTown_House2.inc
@@ -24,11 +24,11 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6
FallarborTown_House2_EventScript_153CE4:: @ 8153CE4
msgbox FallarborTown_House2_Text_177C3F, 4
- special 219
+ special sub_80F9A4C
waitstate
compare 0x8004, 255
jumpeq FallarborTown_House2_EventScript_153D60
- special 328
+ special sub_80FA148
compare RESULT, 1
jumpeq FallarborTown_House2_EventScript_153D52
compare 0x8005, 0
@@ -38,7 +38,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4
FallarborTown_House2_EventScript_153D1A:: @ 8153D1A
msgbox FallarborTown_House2_Text_177C5D, 4
- special 224
+ special sub_8132670
waitstate
compare 0x8004, 0
jumpeq FallarborTown_House2_EventScript_153CE4
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index 1bf6b0825..44f5890a2 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -4,7 +4,7 @@ FortreeCity_Gym_MapScripts:: @ 8157ED3
.byte 0
FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE
- special 201
+ special RotatingGate_InitPuzzle
end
FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2
@@ -12,7 +12,7 @@ FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2
.2byte 0
FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC
- special 202
+ special RotatingGate_InitPuzzleAndGraphics
end
FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc
index 0ae6e3fbd..f5bda05ab 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/scripts/maps/FortreeCity_House1.inc
@@ -8,25 +8,25 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13
jumpeq FortreeCity_House1_EventScript_157EAD
setvar 0x8008, 1
copyvar 0x8004, 0x8008
- specialval RESULT, 252
+ specialval RESULT, sub_804D89C
copyvar 0x8009, RESULT
msgbox FortreeCity_House1_Text_18568C, 5
compare RESULT, 0
jumpeq FortreeCity_House1_EventScript_157E95
- special 159
+ special sub_80F9A0C
waitstate
copyvar 0x800a, 0x8004
compare 0x8004, 255
jumpeq FortreeCity_House1_EventScript_157E95
copyvar 0x8005, 0x800a
- specialval RESULT, 255
+ specialval RESULT, sub_804DB2C
copyvar 0x800b, RESULT
comparevars RESULT, 0x8009
jumpif 5, FortreeCity_House1_EventScript_157E9F
copyvar 0x8004, 0x8008
copyvar 0x8005, 0x800a
- special 253
- special 254
+ special sub_804DB68
+ special sub_804E174
waitstate
bufferpoke 0, 0x8009
msgbox FortreeCity_House1_Text_1856F7, 4
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index c5d932a91..b16f386d8 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -38,7 +38,7 @@ gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19
setmaptile 7, 20, 562, 1
setmaptile 8, 20, 563, 0
setmaptile 9, 20, 564, 1
- special 142
+ special DrawWholeMapView
playsfx SE_BAN
setflag 2129
end
@@ -48,7 +48,7 @@ IslandCave_EventScript_15EF59:: @ 815EF59
checkflag 2129
jumpeq IslandCave_EventScript_15EF72
braillemsg IslandCave_Braille_1C54FC
- special 280
+ special DoBrailleWait
waitstate
jump IslandCave_EventScript_15EF95
end
@@ -63,7 +63,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C
braillemsg IslandCave_Braille_1C54FC
checkflag 2129
jumpeq IslandCave_EventScript_15EF95
- special 280
+ special DoBrailleWait
waitstate
jump IslandCave_EventScript_15EF95
end
@@ -84,7 +84,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D
setwildbattle SPECIES_REGICE, 40, ITEM_NONE
setflag 936
setflag 2145
- special 313
+ special StartBattle_Regi
waitstate
clearflag 2145
release
diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc
index 3ae0882c5..151f1ec79 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/scripts/maps/JaggedPass.inc
@@ -24,7 +24,7 @@ JaggedPass_EventScript_15D285:: @ 815D285
JaggedPass_EventScript_15D29C:: @ 815D29C
trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq JaggedPass_EventScript_15D2C3
msgbox JaggedPass_Text_195F04, 6
@@ -37,7 +37,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3
JaggedPass_EventScript_15D2DA:: @ 815D2DA
trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq JaggedPass_EventScript_15D301
msgbox JaggedPass_Text_196077, 6
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index a71bd4854..685e44d58 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -236,7 +236,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E
step_end
LavaridgeTown_EventScript_14E710:: @ 814E710
- specialval RESULT, 287
+ specialval RESULT, player_get_direction_lower_nybble
compare RESULT, 1
jumpeq LavaridgeTown_EventScript_14E721
end
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index ae36e33b5..b688107ce 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -172,7 +172,7 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79
LilycoveCity_EventScript_14CC82:: @ 814CC82
lockall
- specialval 0x8004, 137
+ specialval 0x8004, sub_80C4D50
switch 0x8004
case 0, LilycoveCity_EventScript_14CCA2
msgbox LilycoveCity_Text_168EA4, 4
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 419e04a8f..3c8cc5bdf 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -41,9 +41,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
closebutton
- special 135
+ special sub_80C4CEC
setvar 0x4099, 0
- specialval RESULT, 91
+ specialval RESULT, GiveMonArtistRibbon
compare RESULT, 1
callif 1, LilycoveCity_ContestLobby_EventScript_158948
move 4, LilycoveCity_ContestLobby_Movement_158A43
@@ -69,7 +69,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918
LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
inccounter GAME_STAT_RECEIVED_RIBBONS
- special 80
+ special sub_80C4858
move 4, LilycoveCity_ContestLobby_Movement_158A4E
waitmove 0
playsfx 21
@@ -87,7 +87,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
return
LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
- specialval 0x8004, 137
+ specialval 0x8004, sub_80C4D50
switch 0x8004
case 1, LilycoveCity_ContestLobby_EventScript_1589D6
case 2, LilycoveCity_ContestLobby_EventScript_1589DA
@@ -214,9 +214,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
closebutton
- special 135
+ special sub_80C4CEC
setvar 0x4099, 0
- specialval RESULT, 91
+ specialval RESULT, GiveMonArtistRibbon
compare RESULT, 1
callif 1, LilycoveCity_ContestLobby_EventScript_158B18
move 11, LilycoveCity_ContestLobby_Movement_158B6D
@@ -242,7 +242,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8
LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
inccounter GAME_STAT_RECEIVED_RIBBONS
- special 80
+ special sub_80C4858
move 11, LilycoveCity_ContestLobby_Movement_158B78
waitmove 0
playsfx 21
@@ -363,7 +363,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
choosecontestpkmn
compare 0x8004, 255
jumpeq LilycoveCity_ContestLobby_EventScript_158CEA
- special 84
+ special sub_80C43F4
compare RESULT, 0
jumpeq LilycoveCity_ContestLobby_EventScript_158C96
compare RESULT, 1
@@ -418,7 +418,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24
message LilycoveCity_ContestLobby_Text_1887C7
waittext
copyvar 0x8004, RESULT
- special 92
+ special sub_808363C
waitstate
compare RESULT, 3
jumpeq LilycoveCity_ContestLobby_EventScript_158D90
@@ -441,7 +441,7 @@ LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82
end
LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
- special 31
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_18878D, 4
closebutton
releaseall
@@ -449,7 +449,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
end
LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
- special 31
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
closebutton
releaseall
@@ -457,7 +457,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
end
LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
- special 31
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_18881F, 4
closebutton
releaseall
@@ -470,7 +470,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
end
LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
- special 77
+ special sub_80C496C
addvar 0x8004, 1
buffernum 1, 32772
message2 LilycoveCity_ContestLobby_Text_188845
@@ -482,7 +482,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE
call LilycoveCity_ContestLobby_EventScript_158E0B
setvar 0x4086, 1
- special 86
+ special sub_80C4F70
setvar 0x4088, 5
setvar CONTEST_RANK, 3
call LilycoveCity_ContestLobby_EventScript_158F08
@@ -499,13 +499,13 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
playsfx 71
setmaptile 9, 2, 545, 1
setmaptile 9, 3, 609, 1
- special 142
+ special DrawWholeMapView
move 2, LilycoveCity_ContestLobby_Movement_158EA0
waitmove 0
playsfx 71
setmaptile 9, 2, 721, 1
setmaptile 9, 3, 729, 1
- special 142
+ special DrawWholeMapView
pause 20
move 2, LilycoveCity_ContestLobby_Movement_158EAE
waitmove 0
@@ -568,14 +568,14 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE
step_end
LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
- specialval RESULT, 90
+ specialval RESULT, sub_80C5044
compare RESULT, 1
jumpeq LilycoveCity_ContestLobby_EventScript_158EE8
setvar 0x800b, 8
setvar CONTEST_RANK, 3
call LilycoveCity_ContestLobby_EventScript_1A4E92
call LilycoveCity_ContestLobby_EventScript_158F86
- special 83
+ special sub_80C4BF0
call LilycoveCity_ContestLobby_EventScript_15FBDB
setvar 0x4088, 4
call LilycoveCity_ContestLobby_EventScript_158F08
@@ -603,31 +603,31 @@ LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08
LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45
warp3 LinkContestRoom4, 255, 7, 5
- special 300
+ special sub_8081334
waitstate
return
LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52
warp3 LinkContestRoom2, 255, 7, 5
- special 300
+ special sub_8081334
waitstate
return
LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F
warp3 LinkContestRoom6, 255, 7, 5
- special 300
+ special sub_8081334
waitstate
return
LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C
warp3 LinkContestRoom5, 255, 7, 5
- special 300
+ special sub_8081334
waitstate
return
LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79
warp3 LinkContestRoom3, 255, 7, 5
- special 300
+ special sub_8081334
waitstate
return
@@ -638,13 +638,13 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
playsfx 71
setmaptile 4, 2, 545, 1
setmaptile 4, 3, 609, 1
- special 142
+ special DrawWholeMapView
move 1, LilycoveCity_ContestLobby_Movement_15900F
waitmove 0
playsfx 71
setmaptile 4, 2, 721, 1
setmaptile 4, 3, 729, 1
- special 142
+ special DrawWholeMapView
pause 20
move 1, LilycoveCity_ContestLobby_Movement_15901C
waitmove 0
@@ -764,7 +764,7 @@ LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084
LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D
SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D
lockall
- special 259
+ special ShowBerryBlenderRecordWindow
waitbutton
hidebox 0, 0, 29, 19
releaseall
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index d2a86e0a5..dcf74b77c 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
callif 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
checkflag 2
callif 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
- specialval RESULT, 335
+ specialval RESULT, sub_8090FC0
compare RESULT, 1
jumpeq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0
release
@@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
message LilycoveCity_CoveLilyMotel_2F_Text_18708F
waittext
call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
- special 264
+ special sub_810D6A4
waitstate
release
end
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index c82cc6428..74b746633 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
@@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
checkflag 2
callif 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
copyvar 0x8005, 0x4043
- special 306
+ special sub_810E944
message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6
waittext
multichoice 0, 0, 57, 0
@@ -74,11 +74,11 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8
hidebox 0, 0, 29, 19
move LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845
waitmove 0
- special 273
+ special sub_810EBEC
waitstate
setflag 2
return
LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF
- special 216
+ special SetDepartmentStoreFloorVar
return
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index 325c56330..feff49c42 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
@@ -19,17 +19,17 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
setflag 2250
message LilycoveCity_DepartmentStore_1F_Text_1C4CC6
waittext
- special 257
+ special RetrieveLotteryNumber
copyvar 0x8008, RESULT
- special 337
+ special sub_810F9AC
msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4
move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843
waitmove 0
playsfx 4
- special 217
- special 258
+ special DoLotteryCornerComputerEffect
+ special PickLotteryCornerTicket
pause 220
- special 218
+ special EndLotteryCornerComputerEffect
pause 10
move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839
waitmove 0
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index 2f4e4352e..f8ff8f9f3 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -135,7 +135,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
callif 1, LilycoveCity_Harbor_EventScript_1599CE
pause 30
spriteinvisible 255, 0, 0
- special 0
+ special HealPlayerParty
setvar 0x8004, 2
call LilycoveCity_Harbor_EventScript_1A040E
warp SouthernIsland_Exterior, 255, 13, 22
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index 2e6d6698f..b3564ebf5 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
@@ -98,7 +98,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
lockall
checkflag 236
jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158793
- specialval 0x8004, 137
+ specialval 0x8004, sub_80C4D50
switch 0x8004
case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
index c9b026060..6adea2eb2 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
@@ -14,23 +14,23 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4
- special 159
+ special sub_80F9A0C
waitstate
compare 0x8004, 255
jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B7B
- special 328
+ special sub_80FA148
compare RESULT, 1
jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71
- special 223
+ special sub_80F9F3C
compare RESULT, 1
jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
fadescreen 1
- special 220
+ special sub_80F9EEC
fadescreen 0
compare 0x8005, 4
jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
- special 222
+ special sub_80F9F84
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5
switch RESULT
case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53
@@ -39,7 +39,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
end
LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
- special 221
+ special sub_80FA0DC
fanfare 378
waitfanfare
msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4
@@ -47,7 +47,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
end
LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
- special 222
+ special sub_80F9F84
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
releaseall
end
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
index 9ac66f98e..e503ef4ec 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
@@ -68,37 +68,37 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412
end
LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429
- special 167
+ special sub_810FCE8
setvar 0x8004, 8
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 0
callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5
setvar 0x8004, 9
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 0
callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD
setvar 0x8004, 10
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 0
callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5
setvar 0x8004, 11
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 0
callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED
setvar 0x8004, 12
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 0
callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5
setvar 0x8004, 13
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 0
callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD
setvar 0x8004, 14
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 0
callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505
setvar 0x8004, 15
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 0
callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D
end
@@ -147,13 +147,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F
lock
faceplayer
setvar 0x8004, 13
- special 165
+ special sub_810FDAC
compare 0x4095, 0
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 7
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159592
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4
@@ -161,7 +161,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F
end
LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159588
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4
@@ -187,13 +187,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6
lock
faceplayer
setvar 0x8004, 8
- special 165
+ special sub_810FDAC
compare 0x4095, 0
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159613
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 7
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159609
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4
@@ -201,7 +201,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6
end
LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4
@@ -227,13 +227,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D
lock
faceplayer
setvar 0x8004, 9
- special 165
+ special sub_810FDAC
compare 0x4095, 0
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 7
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159680
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4
@@ -241,7 +241,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D
end
LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159676
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4
@@ -267,13 +267,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694
lock
faceplayer
setvar 0x8004, 10
- special 165
+ special sub_810FDAC
compare 0x4095, 0
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159701
- specialval RESULT, 163
+ specialval RESULT, sub_810FD60
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 7
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4
@@ -281,7 +281,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694
end
LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4
@@ -307,11 +307,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B
lock
faceplayer
setvar 0x8004, 11
- special 165
- specialval RESULT, 163
+ special sub_810FDAC
+ specialval RESULT, sub_810FD60
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 7
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159763
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4
@@ -319,7 +319,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B
end
LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159759
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4
@@ -340,11 +340,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D
lock
faceplayer
setvar 0x8004, 12
- special 165
- specialval RESULT, 163
+ special sub_810FDAC
+ specialval RESULT, sub_810FD60
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 7
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4
@@ -352,7 +352,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D
end
LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4
@@ -373,11 +373,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF
lock
faceplayer
setvar 0x8004, 14
- special 165
- specialval RESULT, 163
+ special sub_810FDAC
+ specialval RESULT, sub_810FD60
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159803
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 7
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159827
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4
@@ -385,7 +385,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF
end
LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4
@@ -406,11 +406,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831
lock
faceplayer
setvar 0x8004, 15
- special 165
- specialval RESULT, 163
+ special sub_810FDAC
+ specialval RESULT, sub_810FD60
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159865
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 7
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159889
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4
@@ -418,7 +418,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831
end
LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865
- specialval RESULT, 164
+ specialval RESULT, sub_810FCB0
compare RESULT, 1
jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F
msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index 81692acc5..2a4f77529 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -207,7 +207,7 @@ LittlerootTown_EventScript_14D708:: @ 814D708
end
LittlerootTown_EventScript_14D722:: @ 814D722
- special 148
+ special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_16ADF2, 4
release
end
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index 9816734d0..69206566a 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
@@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744
move 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F
move 4, LittlerootTown_BrendansHouse_1F_Movement_152782
waitmove 0
- special 149
+ special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4
setflag 87
setvar 0x4082, 2
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index 0c6ec79f7..0803cd512 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
@@ -59,10 +59,10 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E
LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837
setvar 0x8004, 1
- special 214
+ special DoPCTurnOnEffect
playsfx SE_PC_ON
msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4
- special 249
+ special BedroomPC
waitstate
releaseall
end
@@ -70,7 +70,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837
gBrendanHouse_TurnPCOff:: @ 8152850
setvar 0x8004, 1
playsfx SE_PC_OFF
- special 215
+ special DoPCTurnOffEffect
releaseall
end
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index 2b9ad42ef..5f7f20d63 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -98,7 +98,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982
move 255, LittlerootTown_MaysHouse_1F_Movement_1A0843
move 4, LittlerootTown_MaysHouse_1F_Movement_1529C0
waitmove 0
- special 149
+ special GetRivalSonDaughterString
msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4
setflag 87
setvar 0x408c, 2
@@ -141,7 +141,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A17
compare 0x408d, 3
jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A2B
- special 149
+ special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4
release
end
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index 1aca3f86e..85a41caff 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -207,10 +207,10 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
setvar 0x8004, 2
- special 214
+ special DoPCTurnOnEffect
playsfx SE_PC_ON
msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
- special 249
+ special BedroomPC
waitstate
releaseall
end
@@ -218,6 +218,6 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
gMayHouse_TurnPCOff:: @ 8152C75
setvar 0x8004, 2
playsfx SE_PC_OFF
- special 215
+ special DoPCTurnOffEffect
releaseall
end
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc
index cb3b8505b..5436bf38a 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/scripts/maps/MauvilleCity_BikeShop.inc
@@ -58,7 +58,7 @@ MauvilleCity_BikeShop_EventScript_156847:: @ 8156847
MauvilleCity_BikeShop_EventScript_156861:: @ 8156861
msgbox MauvilleCity_BikeShop_Text_181362, 4
- special 130
+ special SwapRegisteredBike
release
end
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc
index a0aab4238..f20a7dacd 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
@@ -525,7 +525,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 0
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 1
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 2
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 3
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 4
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 5
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 6
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 7
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 8
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 9
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 10
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
@@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295
compare RESULT, 0
jumpeq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 11
- specialval RESULT, 286
+ specialval RESULT, sub_810F424
pokecasino RESULT
releaseall
end
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc
index 9abac00d7..bd5c119f3 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -47,24 +47,24 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B
MauvilleCity_Gym_EventScript_15657D:: @ 815657D
setvar 0x8004, 0
- special 140
+ special MauvilleGymSpecial1
jump MauvilleCity_Gym_EventScript_156491
end
MauvilleCity_Gym_EventScript_15658B:: @ 815658B
setvar 0x8004, 1
- special 140
+ special MauvilleGymSpecial1
jump MauvilleCity_Gym_EventScript_156491
end
MauvilleCity_Gym_EventScript_156599:: @ 8156599
setvar 0x8004, 2
- special 140
+ special MauvilleGymSpecial1
jump MauvilleCity_Gym_EventScript_156491
end
MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7
- special 144
+ special MauvilleGymSpecial3
end
MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB
@@ -89,8 +89,8 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
callif 1, MauvilleCity_Gym_EventScript_1A00FB
setvar 0x8008, 3
call MauvilleCity_Gym_EventScript_1A01C0
- special 144
- special 142
+ special MauvilleGymSpecial3
+ special DrawWholeMapView
playsfx 44
jump MauvilleCity_Gym_EventScript_15661D
end
@@ -143,9 +143,9 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695
end
MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA
- special 139
- special 140
- special 142
+ special MauvilleGymSpecial2
+ special MauvilleGymSpecial1
+ special DrawWholeMapView
playsfx 44
checkflag 99
jumpeq MauvilleCity_Gym_EventScript_1566E1
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
index b943b9c8f..b2b5dabd4 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
@@ -9,7 +9,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357
end
MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365
- special 104
+ special sub_80F83D0
end
MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369
diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc
index 6c239043d..8e45c34ae 100644
--- a/data/scripts/maps/MeteorFalls_1F_2R.inc
+++ b/data/scripts/maps/MeteorFalls_1F_2R.inc
@@ -3,7 +3,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678
MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679
trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq MeteorFalls_1F_2R_EventScript_15C6A0
msgbox MeteorFalls_1F_2R_Text_193A60, 6
@@ -16,7 +16,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0
MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7
trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq MeteorFalls_1F_2R_EventScript_15C6E2
msgbox MeteorFalls_1F_2R_Text_193C35, 6
@@ -29,7 +29,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2
MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD
trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq MeteorFalls_1F_2R_EventScript_15C728
msgbox MeteorFalls_1F_2R_Text_193D9A, 6
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index c56adb1f3..14836f3e0 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -5,7 +5,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52
.byte 0
MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62
- special 246
+ special sub_813601C
compare RESULT, 1
callif 1, MossdeepCity_GameCorner_1F_EventScript_15AC71
end
@@ -16,7 +16,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71
return
MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84
- special 246
+ special sub_813601C
compare RESULT, 0
callif 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E
compare 0x40c0, 0
@@ -55,7 +55,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5
callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B
compare 0x40c0, 3
callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD34
- special 40
+ special LoadPlayerParty
setvar 0x40c0, 0
releaseall
end
@@ -91,8 +91,8 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42
end
MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
- special 39
- special 285
+ special SavePlayerParty
+ special sub_810F414
msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5
compare RESULT, 0
jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8
@@ -102,13 +102,13 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5
compare RESULT, 0
callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8
- special 40
+ special LoadPlayerParty
call MossdeepCity_GameCorner_1F_EventScript_19F806
compare RESULT, 0
jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8
hidebox 0, 0, 15, 10
- special 39
- special 248
+ special SavePlayerParty
+ special ReducePlayerPartyToThree
msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4
closebutton
compare FACING, 2
@@ -123,7 +123,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
end
MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8
- special 40
+ special LoadPlayerParty
msgbox MossdeepCity_GameCorner_1F_Text_18E698, 4
release
end
@@ -131,7 +131,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8
MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5
msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, 4
fadescreen 1
- special 41
+ special sub_80C5568
waitstate
return
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index a733093f9..a5a013d5f 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -4,7 +4,7 @@ MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55
.byte 0
MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60
- special 322
+ special sub_8134AB4
end
MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64
@@ -15,12 +15,12 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
lockall
move 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9
waitmove 0
- special 235
+ special sub_81360C0
msgbox 0x20234cc, 4
closebutton
setvar 0x8004, 2
setvar 0x8005, 0
- special 236
+ special sub_813556C
waitstate
compare RESULT, 3
callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5
@@ -29,10 +29,10 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
compare RESULT, 2
callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE
closebutton
- special 0
+ special HealPlayerParty
move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
waitmove 0
- special 40
+ special LoadPlayerParty
setvar 0x4001, 1
warp MossdeepCity_GameCorner_1F, 255, 3, 1
waitstate
@@ -46,14 +46,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5
MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3
setvar 0x40c0, 1
- special 141
+ special ShowFieldMessageStringVar4
waittext
waitbutton
return
MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE
setvar 0x40c0, 2
- special 141
+ special ShowFieldMessageStringVar4
waittext
waitbutton
return
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index 192f9e396..20f43a150 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -93,7 +93,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA
end
MossdeepCity_Gym_EventScript_15A619:: @ 815A619
- special 142
+ special DrawWholeMapView
playsfx 36
releaseall
end
diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc
index d83e49643..319dfba8e 100644
--- a/data/scripts/maps/MossdeepCity_House1.inc
+++ b/data/scripts/maps/MossdeepCity_House1.inc
@@ -6,7 +6,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F
faceplayer
bufferfirstpoke 0
msgbox MossdeepCity_House1_Text_18D465, 4
- specialval RESULT, 277
+ specialval RESULT, GetPokeblockNameByMonNature
compare RESULT, 0
jumpeq MossdeepCity_House1_EventScript_15A855
msgbox MossdeepCity_House1_Text_18D475, 4
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc
index bc8f44400..12dc941e7 100644
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ b/data/scripts/maps/MossdeepCity_House4.inc
@@ -18,10 +18,10 @@ MossdeepCity_House4_EventScript_15AB46:: @ 815AB46
MossdeepCity_House4_EventScript_15AB50:: @ 815AB50
lock
faceplayer
- special 7
+ special sub_80BB63C
compare RESULT, 0
jumpeq MossdeepCity_House4_EventScript_15AB6D
- special 278
+ special GetSecretBaseNearbyMapName
msgbox MossdeepCity_House4_Text_18E17E, 4
release
end
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
index 3b3a7f083..db31e4c62 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
@@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B
lock
faceplayer
checkdailyflags
- specialval RESULT, 256
+ specialval RESULT, GetWeekCount
buffernum 0, RESULT
compare RESULT, 0
callif 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
index b7a43328b..fdebcf102 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/scripts/maps/MtChimney.inc
@@ -440,7 +440,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA
MtChimney_EventScript_15D1E3:: @ 815D1E3
trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq MtChimney_EventScript_15D20A
msgbox MtChimney_Text_195A04, 6
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
index c00914f2e..24101b0cb 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
@@ -47,8 +47,8 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
setvar 0x8004, 1
setvar 0x40a3, 2
inccounter GAME_STAT_RODE_CABLE_CAR
- special 151
- special 152
+ special CableCarWarp
+ special sub_8123218
waitstate
release
end
diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc
index 3729079bb..657b4ef15 100644
--- a/data/scripts/maps/MtPyre_6F.inc
+++ b/data/scripts/maps/MtPyre_6F.inc
@@ -3,7 +3,7 @@ MtPyre_6F_MapScripts:: @ 815D447
MtPyre_6F_EventScript_15D448:: @ 815D448
trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq MtPyre_6F_EventScript_15D46F
msgbox MtPyre_6F_Text_196A4C, 6
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc
index dc5885939..547fc72e7 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/scripts/maps/NewMauville_Entrance.inc
@@ -39,7 +39,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC
setmaptile 3, 1, 715, 1
setmaptile 4, 1, 716, 0
setmaptile 5, 1, 717, 1
- special 142
+ special DrawWholeMapView
playsfx 20
setvar 0x40ba, 1
releaseall
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc
index 29c42e460..b088b8e7d 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/scripts/maps/NewMauville_Inside.inc
@@ -33,7 +33,7 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA
setvar 0x4002, 0
playsfx 21
call NewMauville_Inside_EventScript_15E5DA
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -43,7 +43,7 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2
setvar 0x4002, 1
playsfx 21
call NewMauville_Inside_EventScript_15E728
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -145,7 +145,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B
setmaptile 33, 3, 757, 1
setmaptile 34, 3, 758, 1
setmaptile 35, 3, 759, 1
- special 142
+ special DrawWholeMapView
return
NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc
index b95a41ceb..e45f09de4 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
@@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
checkflag 300
callif 0, PacifidlogTown_House2_EventScript_1541D7
setflag 300
- specialval RESULT, 230
+ specialval RESULT, GetLeadMonFriendshipScore
compare RESULT, 4
jumpif 4, PacifidlogTown_House2_EventScript_1541EC
- specialval RESULT, 230
+ specialval RESULT, GetLeadMonFriendshipScore
compare RESULT, 2
jumpif 4, PacifidlogTown_House2_EventScript_15421B
jump PacifidlogTown_House2_EventScript_154225
@@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4
checkflag 299
jumpif 0, PacifidlogTown_House2_EventScript_1A14DC
- specialval RESULT, 334
+ specialval RESULT, sub_810F908
compare RESULT, 0
callif 1, PacifidlogTown_House2_EventScript_1541E8
return
@@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
compare RESULT, 0
jumpeq PacifidlogTown_House2_EventScript_1A029B
setflag 299
- special 333
+ special sub_810F950
msgbox PacifidlogTown_House2_Text_179283, 4
release
end
@@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225
compare RESULT, 0
jumpeq PacifidlogTown_House2_EventScript_1A029B
setflag 299
- special 333
+ special sub_810F950
msgbox PacifidlogTown_House2_Text_179283, 4
release
end
PacifidlogTown_House2_EventScript_154254:: @ 8154254
- specialval RESULT, 334
+ specialval RESULT, sub_810F908
buffernum 0, RESULT
msgbox PacifidlogTown_House2_Text_1792F2, 4
release
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc
index 7ee815f07..6ab9a09b0 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/scripts/maps/PacifidlogTown_House3.inc
@@ -8,25 +8,25 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E
jumpeq PacifidlogTown_House3_EventScript_154338
setvar 0x8008, 2
copyvar 0x8004, 0x8008
- specialval RESULT, 252
+ specialval RESULT, sub_804D89C
copyvar 0x8009, RESULT
msgbox PacifidlogTown_House3_Text_17940E, 5
compare RESULT, 0
jumpeq PacifidlogTown_House3_EventScript_154320
- special 159
+ special sub_80F9A0C
waitstate
copyvar 0x800a, 0x8004
compare 0x8004, 255
jumpeq PacifidlogTown_House3_EventScript_154320
copyvar 0x8005, 0x800a
- specialval RESULT, 255
+ specialval RESULT, sub_804DB2C
copyvar 0x800b, RESULT
comparevars RESULT, 0x8009
jumpif 5, PacifidlogTown_House3_EventScript_15432A
copyvar 0x8004, 0x8008
copyvar 0x8005, 0x800a
- special 253
- special 254
+ special sub_804DB68
+ special sub_804E174
waitstate
bufferpoke 0, 0x8009
msgbox PacifidlogTown_House3_Text_1794C4, 4
diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc
index f20de28df..dca1a51b0 100644
--- a/data/scripts/maps/PacifidlogTown_House5.inc
+++ b/data/scripts/maps/PacifidlogTown_House5.inc
@@ -4,7 +4,7 @@ PacifidlogTown_House5_MapScripts:: @ 8154393
PacifidlogTown_House5_EventScript_154394:: @ 8154394
lock
faceplayer
- specialval RESULT, 209
+ specialval RESULT, IsMirageIslandPresent
compare RESULT, 1
jumpeq PacifidlogTown_House5_EventScript_1543B0
msgbox PacifidlogTown_House5_Text_179718, 4
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index 3667eb3cf..dc5efe243 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -26,13 +26,13 @@ PetalburgCity_MapScript2_14B73D:: @ 814B73D
PetalburgCity_EventScript_14B747:: @ 814B747
lockall
setflag 0x4000
- special 39
- special 301
+ special SavePlayerParty
+ special PutZigzagoonInPlayerParty
move 2, PetalburgCity_Movement_14B7ED
move 255, PetalburgCity_Movement_14B7CC
waitmove 0
msgbox PetalburgCity_Text_16D361, 4
- special 157
+ special StartBattle_WallyTutorial
waitstate
msgbox PetalburgCity_Text_16D3DE, 4
movecoords 2, PetalburgCity_Movement_1A083F, 0, 0
@@ -43,7 +43,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747
setvar 0x4057, 3
fadedefault
clearflag 0x4001
- special 40
+ special LoadPlayerParty
setvar 0x4085, 1
warp PetalburgCity_Gym, 255, 4, 108
waitstate
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 9c6802e28..c534cb538 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -211,7 +211,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
clearflag 726
clearflag 866
setflag 889
- special 211
+ special InitBirchState
warp PetalburgCity, 255, 15, 8
waitstate
release
@@ -363,7 +363,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D
end
PetalburgCity_Gym_EventScript_154969:: @ 8154969
- specialval RESULT, 50
+ specialval RESULT, IsEnigmaBerryValid
compare RESULT, 0
jumpeq PetalburgCity_Gym_EventScript_1549B2
checkitem ITEM_ENIGMA_BERRY, 1
@@ -407,7 +407,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
call PetalburgCity_Gym_EventScript_1A01C0
clearflag 940
call PetalburgCity_Gym_EventScript_1544ED
- special 142
+ special DrawWholeMapView
jump PetalburgCity_Gym_EventScript_154A2C
end
@@ -773,7 +773,7 @@ PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A
setvar 0x8005, 0
call PetalburgCity_Gym_EventScript_154FBB
- special 142
+ special DrawWholeMapView
release
end
@@ -791,7 +791,7 @@ PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
PetalburgCity_Gym_EventScript_154E56:: @ 8154E56
setvar 0x8005, 0
call PetalburgCity_Gym_EventScript_154FFD
- special 142
+ special DrawWholeMapView
release
end
@@ -809,7 +809,7 @@ PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
PetalburgCity_Gym_EventScript_154E92:: @ 8154E92
setvar 0x8005, 0
call PetalburgCity_Gym_EventScript_15503F
- special 142
+ special DrawWholeMapView
release
end
@@ -827,7 +827,7 @@ PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE
setvar 0x8005, 0
call PetalburgCity_Gym_EventScript_155081
- special 142
+ special DrawWholeMapView
release
end
@@ -845,7 +845,7 @@ PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A
setvar 0x8005, 0
call PetalburgCity_Gym_EventScript_154FDC
- special 142
+ special DrawWholeMapView
release
end
@@ -863,7 +863,7 @@ PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
PetalburgCity_Gym_EventScript_154F46:: @ 8154F46
setvar 0x8005, 0
call PetalburgCity_Gym_EventScript_15501E
- special 142
+ special DrawWholeMapView
release
end
@@ -881,7 +881,7 @@ PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
PetalburgCity_Gym_EventScript_154F82:: @ 8154F82
setvar 0x8005, 0
call PetalburgCity_Gym_EventScript_155060
- special 142
+ special DrawWholeMapView
release
end
@@ -1010,12 +1010,12 @@ PetalburgCity_Gym_EventScript_15516F:: @ 815516F
return
PetalburgCity_Gym_EventScript_155182:: @ 8155182
- special 145
+ special PetalburgGymSpecial1
waitstate
return
PetalburgCity_Gym_EventScript_155187:: @ 8155187
- special 146
+ special PetalburgGymSpecial2
return
PetalburgCity_Gym_EventScript_15518B:: @ 815518B
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
index 09d414dcb..5ef99eee1 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
@@ -27,7 +27,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233
lock
faceplayer
msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4
- specialval RESULT, 302
+ specialval RESULT, IsStarterInParty
compare RESULT, 1
jumpeq PetalburgCity_PokemonCenter_1F_EventScript_15524F
release
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index 8d6946bcd..c24f7c195 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -271,7 +271,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27
PetalburgWoods_EventScript_15CF3E:: @ 815CF3E
trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq PetalburgWoods_EventScript_15CF65
msgbox PetalburgWoods_Text_1952CC, 6
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 944473e96..8462603a6 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -224,12 +224,12 @@ Route101_EventScript_14EA7F:: @ 814EA7F
movesprite 255, 6, 13
move 255, Route101_Movement_1A083F
waitmove 0
- special 156
+ special ChooseStarter
waitstate
move 2, Route101_Movement_14EAD7
waitmove 0
msgbox Route101_Text_16D191, 4
- special 0
+ special HealPlayerParty
setflag 720
clearflag 721
setflag 700
diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc
index 70d25eace..b0a714763 100644
--- a/data/scripts/maps/Route102.inc
+++ b/data/scripts/maps/Route102.inc
@@ -19,7 +19,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5
Route102_EventScript_14EAFE:: @ 814EAFE
trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route102_EventScript_14EB25
msgbox Route102_Text_1B7A60, 6
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index f47f5a824..4c7da3d0d 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -173,7 +173,7 @@ Route103_EventScript_14ED94:: @ 814ED94
Route103_EventScript_14EDAB:: @ 814EDAB
trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route103_EventScript_14EDD6
msgbox Route103_Text_1B7E50, 6
@@ -186,7 +186,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6
Route103_EventScript_14EDF1:: @ 814EDF1
trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route103_EventScript_14EE1C
msgbox Route103_Text_1B7F40, 6
@@ -204,7 +204,7 @@ Route103_EventScript_14EE37:: @ 814EE37
Route103_EventScript_14EE4E:: @ 814EE4E
trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route103_EventScript_14EE75
msgbox Route103_Text_1B830D, 6
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index bb98b023d..b617767bf 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -409,7 +409,7 @@ Route104_EventScript_14F189:: @ 814F189
Route104_EventScript_14F1A0:: @ 814F1A0
trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route104_EventScript_14F1C7
msgbox Route104_Text_1B87C3, 6
@@ -422,7 +422,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7
Route104_EventScript_14F1DE:: @ 814F1DE
trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route104_EventScript_14F205
msgbox Route104_Text_1B8925, 6
@@ -435,7 +435,7 @@ Route104_EventScript_14F205:: @ 814F205
Route104_EventScript_14F21C:: @ 814F21C
trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route104_EventScript_14F243
msgbox Route104_Text_1B8A69, 6
@@ -448,14 +448,14 @@ Route104_EventScript_14F243:: @ 814F243
Route104_EventScript_14F25A:: @ 814F25A
trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C
- special 148
+ special GetPlayerBigGuyGirlString
msgbox Route104_Text_1B842C, 4
release
end
Route104_EventScript_14F279:: @ 814F279
trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577
- special 148
+ special GetPlayerBigGuyGirlString
msgbox Route104_Text_1B853B, 4
release
end
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc
index 184127187..ff1c9d258 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/scripts/maps/Route104_Prototype.inc
@@ -60,7 +60,7 @@ Route104_Prototype_EventScript_160CFB:: @ 8160CFB
pause 60
fadescreen 1
pause 60
- special 271
+ special DoSoftReset
waitstate
release
end
diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc
index 1889eb4d7..0c25594c6 100644
--- a/data/scripts/maps/Route106.inc
+++ b/data/scripts/maps/Route106.inc
@@ -17,7 +17,7 @@ Route106_EventScript_14F34F:: @ 814F34F
Route106_EventScript_14F366:: @ 814F366
trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route106_EventScript_14F38D
msgbox Route106_Text_1B8F55, 6
diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc
index ef3407265..a14bb7298 100644
--- a/data/scripts/maps/Route107.inc
+++ b/data/scripts/maps/Route107.inc
@@ -8,7 +8,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC
Route107_EventScript_14F3D3:: @ 814F3D3
trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route107_EventScript_14F3FA
msgbox Route107_Text_1B938E, 6
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index 343a8cab9..58c38173e 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -327,7 +327,7 @@ Route109_EventScript_14F70E:: @ 814F70E
Route109_EventScript_14F725:: @ 814F725
lock
faceplayer
- special 148
+ special GetPlayerBigGuyGirlString
checkflag 280
jumpeq Route109_EventScript_14F762
msgbox Route109_Text_16E433, 4
@@ -396,7 +396,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2
Route109_EventScript_14F809:: @ 814F809
trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route109_EventScript_14F830
msgbox Route109_Text_1B9C6E, 6
@@ -409,7 +409,7 @@ Route109_EventScript_14F830:: @ 814F830
Route109_EventScript_14F847:: @ 814F847
trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route109_EventScript_14F86E
msgbox Route109_Text_1B9D8E, 6
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index 55c8f67df..d8c19d92c 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -5,7 +5,7 @@ Route110_MapScripts:: @ 814F900
.byte 0
Route110_MapScript1_14F910:: @ 814F910
- special 229
+ special UpdateCyclingRoadState
end
Route110_MapScript1_14F914:: @ 814F914
@@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933
.2byte 0
Route110_EventScript_14F93D:: @ 814F93D
- special 226
+ special BeginCyclingRoadChallenge
setvar 0x40a9, 2
return
@@ -131,7 +131,7 @@ Route110_EventScript_14FA25:: @ 814FA25
Route110_EventScript_14FA2E:: @ 814FA2E
lockall
- specialval RESULT, 225
+ specialval RESULT, GetRecordedCyclingRoadResults
compare RESULT, 0
jumpeq Route110_EventScript_14FA49
msgbox Route110_Text_16F53A, 4
@@ -146,7 +146,7 @@ Route110_EventScript_14FA49:: @ 814FA49
Route110_EventScript_14FA53:: @ 814FA53
lock
faceplayer
- specialval RESULT, 227
+ specialval RESULT, GetPlayerAvatarBike
compare RESULT, 1
jumpeq Route110_EventScript_14FA84
compare 0x40a9, 0
@@ -177,7 +177,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5
Route110_EventScript_14FABC:: @ 814FABC
trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route110_EventScript_14FAE3
msgbox Route110_Text_1BA829, 6
@@ -205,7 +205,7 @@ Route110_EventScript_14FB28:: @ 814FB28
Route110_EventScript_14FB3F:: @ 814FB3F
trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route110_EventScript_14FB66
msgbox Route110_Text_1BA3A5, 6
@@ -223,7 +223,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D
Route110_EventScript_14FB94:: @ 814FB94
trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route110_EventScript_14FBBB
msgbox Route110_Text_1BA52E, 6
@@ -236,7 +236,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB
Route110_EventScript_14FBD2:: @ 814FBD2
trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route110_EventScript_14FBF9
msgbox Route110_Text_1BA9E9, 6
@@ -261,7 +261,7 @@ Route110_EventScript_14FC27:: @ 814FC27
end
Route110_EventScript_14FC39:: @ 814FC39
- special 228
+ special FinishCyclingRoadChallenge
msgbox Route110_Text_16EF65, 4
switch RESULT
case 10, Route110_EventScript_14FCC3
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index 0dbd5dfc4..96e492b39 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
@@ -23,7 +23,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB
Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7
@ Coord event directly in front of the gatesman heading left to right
lockall
- specialval RESULT, 227 @ player state?
+ specialval RESULT, GetPlayerAvatarBike @ player state?
compare RESULT, 2
callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D
compare RESULT, 0
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
index 96fb13f2b..08d6fb5f1 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
@@ -10,7 +10,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F
Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B
lockall
- specialval RESULT, 227
+ specialval RESULT, GetPlayerAvatarBike
compare RESULT, 0
jumpeq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6
setflag 2091
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc
index d2b2eaefb..10e1a6865 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
@@ -13,7 +13,7 @@ Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B
Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957
setvar 0x4001, 0
setvar 0x4002, 0
- special 261
+ special SetTrickHouseEndRoomFlag
end
Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965
@@ -33,7 +33,7 @@ Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C
Route110_TrickHouseEnd_EventScript_161986:: @ 8161986
setvar 0x4001, 1
call Route110_TrickHouseEnd_EventScript_161994
- special 142
+ special DrawWholeMapView
end
Route110_TrickHouseEnd_EventScript_161994:: @ 8161994
@@ -175,7 +175,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
callif 1, Route110_TrickHouseEnd_EventScript_161C61
msgbox Route110_TrickHouseEnd_Text_19C85C, 4
call Route110_TrickHouseEnd_EventScript_161C2E
- special 260
+ special ResetTrickHouseEndRoomFlag
release
end
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 434794b2f..2601942be 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -502,7 +502,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7
Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
setmaptile 5, 1, 537, 0
- special 142
+ special DrawWholeMapView
pause 20
move 255, Route110_TrickHouseEntrance_Movement_1A0856
waitmove 0
@@ -608,7 +608,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
playsfx SE_PIN
setvar 0x40AB, 2
setmaptile 13, 1, 523, 0
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -619,7 +619,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
playsfx SE_PIN
setvar 0x40AC, 2
setmaptile 13, 1, 523, 0
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -630,7 +630,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
playsfx SE_PIN
setvar 0x40AD, 2
setmaptile 13, 1, 523, 0
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -641,7 +641,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
playsfx SE_PIN
setvar 0x40AE, 2
setmaptile 13, 1, 523, 0
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -652,7 +652,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
playsfx SE_PIN
setvar 0x40AF, 2
setmaptile 13, 1, 523, 0
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -663,7 +663,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
playsfx SE_PIN
setvar 0x40B0, 2
setmaptile 13, 1, 523, 0
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -674,7 +674,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
playsfx SE_PIN
setvar 0x40B1, 2
setmaptile 13, 1, 523, 0
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -685,7 +685,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
playsfx SE_PIN
setvar 0x40B2, 2
setmaptile 13, 1, 523, 0
- special 142
+ special DrawWholeMapView
releaseall
end
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
index 183431bfc..27ffad50d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
@@ -38,7 +38,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0
setvar 0x4001, 1
playsfx 21
call Route110_TrickHousePuzzle2_EventScript_161E2C
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -47,7 +47,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3
setvar 0x4002, 1
playsfx 21
call Route110_TrickHousePuzzle2_EventScript_161E3F
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -56,7 +56,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06
setvar 0x4003, 1
playsfx 21
call Route110_TrickHousePuzzle2_EventScript_161E52
- special 142
+ special DrawWholeMapView
releaseall
end
@@ -65,7 +65,7 @@ Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19
setvar 0x4004, 1
playsfx 21
call Route110_TrickHousePuzzle2_EventScript_161E65
- special 142
+ special DrawWholeMapView
releaseall
end
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
index b533dbbe5..efd96ec44 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
@@ -351,7 +351,7 @@ Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD
callif 1, Route110_TrickHousePuzzle3_EventScript_161FE5
compare 0x4009, 0
callif 1, Route110_TrickHousePuzzle3_EventScript_1622C8
- special 142
+ special DrawWholeMapView
compare 0x4009, 1
jumpeq Route110_TrickHousePuzzle3_EventScript_1626DD
compare 0x4009, 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
index 56d350871..1e47bbd83 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
@@ -4,7 +4,7 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 81630CD
.byte 0
Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8
- special 201
+ special RotatingGate_InitPuzzle
end
Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC
@@ -12,7 +12,7 @@ Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC
.2byte 0
Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6
- special 202
+ special RotatingGate_InitPuzzleAndGraphics
end
Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
index 1276562d0..7f965b467 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
@@ -125,7 +125,7 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9
callif 0, Route110_TrickHousePuzzle7_EventScript_163195
checkflag 194
callif 1, Route110_TrickHousePuzzle7_EventScript_1631F4
- special 142
+ special DrawWholeMapView
playsfx 36
checkflag 194
jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633A4
@@ -140,7 +140,7 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8
callif 0, Route110_TrickHousePuzzle7_EventScript_1631A8
checkflag 195
callif 1, Route110_TrickHousePuzzle7_EventScript_163207
- special 142
+ special DrawWholeMapView
playsfx 36
checkflag 195
jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633AE
@@ -155,7 +155,7 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317
callif 0, Route110_TrickHousePuzzle7_EventScript_1631BB
checkflag 196
callif 1, Route110_TrickHousePuzzle7_EventScript_16321A
- special 142
+ special DrawWholeMapView
playsfx 36
checkflag 196
jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633B8
@@ -170,7 +170,7 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346
callif 0, Route110_TrickHousePuzzle7_EventScript_1631CE
checkflag 197
callif 1, Route110_TrickHousePuzzle7_EventScript_16322D
- special 142
+ special DrawWholeMapView
playsfx 36
checkflag 197
jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633C2
@@ -185,7 +185,7 @@ Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375
callif 0, Route110_TrickHousePuzzle7_EventScript_1631E1
checkflag 198
callif 1, Route110_TrickHousePuzzle7_EventScript_163240
- special 142
+ special DrawWholeMapView
playsfx 36
checkflag 198
jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633CC
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 10b34cf5f..1358a44be 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -128,7 +128,7 @@ Route111_EventScript_1500C5:: @ 81500C5
compare RESULT, 0
jumpeq Route111_EventScript_1A029B
setflag 2252
- special 148
+ special GetPlayerBigGuyGirlString
msgbox Route111_Text_1C5781, 4
release
end
@@ -392,7 +392,7 @@ Route111_EventScript_1503EC:: @ 81503EC
Route111_EventScript_150403:: @ 8150403
trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route111_EventScript_15042A
msgbox Route111_Text_1BAF5B, 6
@@ -420,7 +420,7 @@ Route111_EventScript_15046F:: @ 815046F
Route111_EventScript_150486:: @ 8150486
trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route111_EventScript_1504AD
msgbox Route111_Text_1BB33E, 6
@@ -433,7 +433,7 @@ Route111_EventScript_1504AD:: @ 81504AD
Route111_EventScript_1504C4:: @ 81504C4
trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route111_EventScript_1504EB
msgbox Route111_Text_1BB4CE, 6
diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc
index c2ad14a02..1c1e36838 100644
--- a/data/scripts/maps/Route112.inc
+++ b/data/scripts/maps/Route112.inc
@@ -38,7 +38,7 @@ Route112_EventScript_150549:: @ 8150549
Route112_EventScript_150560:: @ 8150560
trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route112_EventScript_150587
msgbox Route112_Text_1BB721, 6
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
index 3e5f75929..016b868a8 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/scripts/maps/Route112_CableCarStation.inc
@@ -48,8 +48,8 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
setvar 0x8004, 0
setvar 0x40a3, 1
inccounter GAME_STAT_RODE_CABLE_CAR
- special 151
- special 152
+ special CableCarWarp
+ special sub_8123218
waitstate
release
end
diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc
index c07f537d1..1fc5a9345 100644
--- a/data/scripts/maps/Route113.inc
+++ b/data/scripts/maps/Route113.inc
@@ -60,7 +60,7 @@ Route113_EventScript_150652:: @ 8150652
Route113_EventScript_150669:: @ 8150669
trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route113_EventScript_150690
msgbox Route113_Text_1BBB9A, 6
@@ -73,7 +73,7 @@ Route113_EventScript_150690:: @ 8150690
Route113_EventScript_1506A7:: @ 81506A7
trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route113_EventScript_1506CE
msgbox Route113_Text_1BBCAB, 6
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc
index d59942472..83983f9bb 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
@@ -52,7 +52,7 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4
Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE
setvar 0x8009, 0
- special 274
+ special ShowGlassWorkshopMenu
waitstate
switch RESULT
case 0, Route113_GlassWorkshop_EventScript_163660
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc
index 33e89be70..cfe1dfe7d 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/scripts/maps/Route114.inc
@@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836
Route114_EventScript_15084D:: @ 815084D
trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route114_EventScript_150874
msgbox Route114_Text_1BC337, 6
@@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874
Route114_EventScript_15088B:: @ 815088B
trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route114_EventScript_1508B2
msgbox Route114_Text_1BC4B5, 6
diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc
index e2c00f6fc..2b0d744ca 100644
--- a/data/scripts/maps/Route115.inc
+++ b/data/scripts/maps/Route115.inc
@@ -15,7 +15,7 @@ Route115_EventScript_150940:: @ 8150940
Route115_EventScript_150949:: @ 8150949
trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route115_EventScript_150970
msgbox Route115_Text_1BCA0E, 6
@@ -33,7 +33,7 @@ Route115_EventScript_150987:: @ 8150987
Route115_EventScript_15099E:: @ 815099E
trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route115_EventScript_1509C5
msgbox Route115_Text_1BCBDE, 6
@@ -46,7 +46,7 @@ Route115_EventScript_1509C5:: @ 81509C5
Route115_EventScript_1509DC:: @ 81509DC
trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route115_EventScript_150A03
msgbox Route115_Text_1BCD4C, 6
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index c563dce46..f5ef82f8b 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -150,7 +150,7 @@ Route116_EventScript_150B8F:: @ 8150B8F
checkitem ITEM_BLACK_GLASSES, 1
compare RESULT, 1
jumpeq Route116_EventScript_150BCA
- specialval RESULT, 316
+ specialval RESULT, sub_810F828
compare RESULT, 1
jumpeq Route116_EventScript_150BBB
msgbox Route116_Text_1708EE, 4
@@ -166,7 +166,7 @@ Route116_EventScript_150BBB:: @ 8150BBB
Route116_EventScript_150BCA:: @ 8150BCA
msgbox Route116_Text_1708EE, 4
msgbox Route116_Text_170921, 4
- specialval RESULT, 316
+ specialval RESULT, sub_810F828
compare RESULT, 1
jumpeq Route116_EventScript_150BF4
msgbox Route116_Text_170A03, 4
@@ -240,7 +240,7 @@ Route116_EventScript_150C79:: @ 8150C79
Route116_EventScript_150C90:: @ 8150C90
trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route116_EventScript_150CB7
msgbox Route116_Text_1BD248, 6
@@ -263,7 +263,7 @@ Route116_EventScript_150CE5:: @ 8150CE5
Route116_EventScript_150CFC:: @ 8150CFC
trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route116_EventScript_150D23
msgbox Route116_Text_1BD3C3, 6
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc
index 8c738ffff..61dbf6a30 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/scripts/maps/Route117.inc
@@ -40,7 +40,7 @@ Route117_EventScript_150D84:: @ 8150D84
Route117_EventScript_150D8D:: @ 8150D8D
trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route117_EventScript_150DB4
msgbox Route117_Text_1BD4F9, 6
@@ -53,7 +53,7 @@ Route117_EventScript_150DB4:: @ 8150DB4
Route117_EventScript_150DCB:: @ 8150DCB
trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route117_EventScript_150DF2
msgbox Route117_Text_1BD69B, 6
@@ -66,7 +66,7 @@ Route117_EventScript_150DF2:: @ 8150DF2
Route117_EventScript_150E09:: @ 8150E09
trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route117_EventScript_150E30
msgbox Route117_Text_1BD7F5, 6
@@ -79,7 +79,7 @@ Route117_EventScript_150E30:: @ 8150E30
Route117_EventScript_150E47:: @ 8150E47
trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route117_EventScript_150E6E
msgbox Route117_Text_1BD98F, 6
@@ -97,7 +97,7 @@ Route117_EventScript_150E85:: @ 8150E85
Route117_EventScript_150E9C:: @ 8150E9C
trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route117_EventScript_150EC7
msgbox Route117_Text_1BDC44, 6
@@ -110,7 +110,7 @@ Route117_EventScript_150EC7:: @ 8150EC7
Route117_EventScript_150EE2:: @ 8150EE2
trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route117_EventScript_150F0D
msgbox Route117_Text_1BDD4E, 6
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index 4d739ce68..0b5b4748e 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -161,7 +161,7 @@ Route118_Movement_151086:: @ 8151086
Route118_EventScript_15108F:: @ 815108F
trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route118_EventScript_1510B6
msgbox Route118_Text_1BE05E, 6
@@ -184,7 +184,7 @@ Route118_EventScript_1510E4:: @ 81510E4
Route118_EventScript_1510FB:: @ 81510FB
trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route118_EventScript_151122
msgbox Route118_Text_1BE413, 6
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 1ccc972bb..55a3fb1dc 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -29,7 +29,7 @@ Route119_MapScript1_15119B:: @ 815119B
call Route119_EventScript_1A0196
compare 0x40b3, 1
callif 1, Route119_EventScript_1511B9
- special 324
+ special SetRoute119Weather
end
Route119_EventScript_1511B9:: @ 81511B9
@@ -296,7 +296,7 @@ Route119_EventScript_1514A8:: @ 81514A8
Route119_EventScript_1514BF:: @ 81514BF
trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route119_EventScript_1514E6
msgbox Route119_Text_1BE937, 6
@@ -309,7 +309,7 @@ Route119_EventScript_1514E6:: @ 81514E6
Route119_EventScript_1514FD:: @ 81514FD
trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route119_EventScript_151524
msgbox Route119_Text_1BEAB3, 6
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
index 36314a59f..95ec39d61 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
@@ -16,7 +16,7 @@ Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41
Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D
lock
faceplayer
- special 148
+ special GetPlayerBigGuyGirlString
compare 0x40b3, 0
jumpeq Route119_WeatherInstitute_1F_EventScript_163C67
msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index ada773ffd..75385fe8f 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -120,7 +120,7 @@ Route120_EventScript_151739:: @ 8151739
callif 1, Route120_EventScript_151841
compare RESULT, 0
callif 1, Route120_EventScript_15184A
- specialval RESULT, 147
+ specialval RESULT, GetPlayerTrainerIdOnesDigit
switch RESULT
case 0, Route120_EventScript_1517DC
case 5, Route120_EventScript_1517DC
@@ -254,7 +254,7 @@ Route120_EventScript_151908:: @ 8151908
setmaptile 12, 16, 671, 0
setmaptile 12, 17, 161, 0
setmaptile 13, 17, 161, 0
- special 142
+ special DrawWholeMapView
release
end
@@ -292,7 +292,7 @@ Route120_EventScript_1519B3:: @ 81519B3
Route120_EventScript_1519CA:: @ 81519CA
trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route120_EventScript_1519F1
msgbox Route120_Text_1BF0C3, 6
@@ -315,7 +315,7 @@ Route120_EventScript_151A1F:: @ 8151A1F
Route120_EventScript_151A36:: @ 8151A36
trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route120_EventScript_151A5D
msgbox Route120_Text_1BF38D, 6
diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc
index 54912b0bc..e1aaec716 100644
--- a/data/scripts/maps/Route121.inc
+++ b/data/scripts/maps/Route121.inc
@@ -73,7 +73,7 @@ Route121_EventScript_151B72:: @ 8151B72
Route121_EventScript_151B89:: @ 8151B89
trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route121_EventScript_151BB0
msgbox Route121_Text_1BFA9D, 6
@@ -101,7 +101,7 @@ Route121_EventScript_151BF9:: @ 8151BF9
Route121_EventScript_151C14:: @ 8151C14
trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route121_EventScript_151C3B
msgbox Route121_Text_1BFEAE, 6
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index 2056bc328..251b09c73 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
@@ -10,7 +10,7 @@ Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333
lockall
move 255, Route121_SafariZoneEntrance_Movement_15C348
waitmove 0
- special 206
+ special ExitSafariMode
setvar 0x40a4, 0
releaseall
end
@@ -80,7 +80,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
hidemoney 0, 0
move 255, Route121_SafariZoneEntrance_Movement_15C47E
waitmove 0
- special 205
+ special EnterSafariMode
setvar 0x40a4, 2
warp SafariZone_Southeast, 255, 32, 33
waitstate
@@ -90,7 +90,7 @@ Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425
countpokemon
compare RESULT, 6
jumpif 5, Route121_SafariZoneEntrance_EventScript_15C44F
- specialval RESULT, 304
+ specialval RESULT, CheckFreePokemonStorageSpace
compare RESULT, 1
jumpeq Route121_SafariZoneEntrance_EventScript_15C44F
msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc
index e9248c230..891a395f0 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/scripts/maps/Route123.inc
@@ -3,7 +3,7 @@ Route123_MapScripts:: @ 8151C53
.byte 0
Route123_MapScript1_151C59:: @ 8151C59
- special 325
+ special SetRoute123Weather
end
Route123_EventScript_151C5D:: @ 8151C5D
@@ -12,7 +12,7 @@ Route123_EventScript_151C5D:: @ 8151C5D
checkflag 232
jumpeq Route123_EventScript_151CAC
msgbox Route123_Text_171D83, 4
- special 299
+ special IsGrassTypeInParty
compare RESULT, 0
jumpeq Route123_EventScript_151CAA
msgbox Route123_Text_171DC2, 4
@@ -62,7 +62,7 @@ Route123_EventScript_151CFF:: @ 8151CFF
Route123_EventScript_151D16:: @ 8151D16
trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route123_EventScript_151D3D
msgbox Route123_Text_1C01B1, 6
@@ -75,7 +75,7 @@ Route123_EventScript_151D3D:: @ 8151D3D
Route123_EventScript_151D54:: @ 8151D54
trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route123_EventScript_151D7B
msgbox Route123_Text_1C030F, 6
diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc
index ea288daa0..68f17b12a 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/scripts/maps/Route124.inc
@@ -23,7 +23,7 @@ Route124_EventScript_151E0F:: @ 8151E0F
Route124_EventScript_151E26:: @ 8151E26
trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route124_EventScript_151E4D
msgbox Route124_Text_1C080E, 6
@@ -46,7 +46,7 @@ Route124_EventScript_151E7B:: @ 8151E7B
Route124_EventScript_151E92:: @ 8151E92
trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route124_EventScript_151EBD
msgbox Route124_Text_1C0B72, 6
@@ -59,7 +59,7 @@ Route124_EventScript_151EBD:: @ 8151EBD
Route124_EventScript_151ED8:: @ 8151ED8
trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route124_EventScript_151F03
msgbox Route124_Text_1C0C7F, 6
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc
index 0059fe6aa..a5d2457d5 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/scripts/maps/Route125.inc
@@ -29,7 +29,7 @@ Route125_EventScript_151F73:: @ 8151F73
Route125_EventScript_151F8A:: @ 8151F8A
trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route125_EventScript_151FB1
msgbox Route125_Text_1C1208, 6
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
index 28317c4e3..011591400 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/scripts/maps/Route128.inc
@@ -17,7 +17,7 @@ Route128_EventScript_15213F:: @ 815213F
lockall
pause 20
.ifndef SAPPHIRE
- special 317
+ special sub_807E25C
waitstate
.endif
move 4, Route128_Movement_152271
@@ -182,7 +182,7 @@ Route128_Movement_1522A1:: @ 81522A1
Route128_EventScript_1522A4:: @ 81522A4
trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route128_EventScript_1522CB
msgbox Route128_Text_1C1CC3, 6
@@ -195,7 +195,7 @@ Route128_EventScript_1522CB:: @ 81522CB
Route128_EventScript_1522E2:: @ 81522E2
trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route128_EventScript_152309
msgbox Route128_Text_1C1E4A, 6
diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc
index 38818dba3..bac6728a7 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/scripts/maps/Route130.inc
@@ -3,7 +3,7 @@ Route130_MapScripts:: @ 81523C2
.byte 0
Route130_MapScript1_1523C8:: @ 81523C8
- specialval RESULT, 209
+ specialval RESULT, IsMirageIslandPresent
compare RESULT, 1
jumpeq Route130_EventScript_15240C
setflag 17
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc
index a10d7b69e..402fff1d3 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/scripts/maps/RustboroCity_House1.inc
@@ -8,25 +8,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
jumpeq RustboroCity_House1_EventScript_157D13
setvar 0x8008, 0
copyvar 0x8004, 0x8008
- specialval RESULT, 252
+ specialval RESULT, sub_804D89C
copyvar 0x8009, RESULT
msgbox RustboroCity_House1_Text_184EBA, 5
compare RESULT, 0
jumpeq RustboroCity_House1_EventScript_157CFB
- special 159
+ special sub_80F9A0C
waitstate
copyvar 0x800a, 0x8004
compare 0x8004, 255
jumpeq RustboroCity_House1_EventScript_157CFB
copyvar 0x8005, 0x800a
- specialval RESULT, 255
+ specialval RESULT, sub_804DB2C
copyvar 0x800b, RESULT
comparevars RESULT, 0x8009
jumpif 5, RustboroCity_House1_EventScript_157D05
copyvar 0x8004, 0x8008
copyvar 0x8005, 0x800a
- special 253
- special 254
+ special sub_804DB68
+ special sub_804E174
waitstate
msgbox RustboroCity_House1_Text_184F6B, 4
setflag 153
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
index ff4857852..58cfbec47 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/scripts/maps/SSTidalCorridor.inc
@@ -10,7 +10,7 @@ SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A
.2byte 0
SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC
- special 203
+ special SetSSTidalFlag
setvar 0x40b4, 2
lockall
playsfx 73
@@ -27,14 +27,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2
end
SSTidalRooms_EventScript_15FCE5:: @ 815FCE5
- special 203
+ special SetSSTidalFlag
setvar 0x40b4, 7
playsfx 73
msgbox SSTidalRooms_Text_199007, 4
return
SSTidalRooms_EventScript_15FCF9:: @ 815FCF9
- special 204
+ special ResetSSTidalFlag
setvar 0x40b4, 4
playsfx 73
msgbox SSTidalRooms_Text_1990F8, 4
@@ -48,7 +48,7 @@ gUnknown_0815FD0D:: @ 815FD0D
end
SSTidalCorridor_EventScript_15FD24:: @ 815FD24
- special 204
+ special ResetSSTidalFlag
setvar 0x40b4, 3
lockall
playsfx 73
@@ -57,7 +57,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24
end
SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A
- special 204
+ special ResetSSTidalFlag
setvar 0x40b4, 8
lockall
playsfx 73
@@ -66,7 +66,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A
end
SSTidalRooms_EventScript_15FD50:: @ 815FD50
- special 204
+ special ResetSSTidalFlag
setvar 0x40b4, 8
playsfx 73
msgbox SSTidalRooms_Text_1990B4, 4
@@ -156,7 +156,7 @@ SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A
end
SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B
- special 270
+ special sub_80C7958
waitstate
end
diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc
index 196efbb35..22fd5ec56 100644
--- a/data/scripts/maps/SafariZone_Southeast.inc
+++ b/data/scripts/maps/SafariZone_Southeast.inc
@@ -93,7 +93,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F
SafariZone_Southeast_EventScript_160139:: @ 8160139
setvar 0x40a4, 1
- special 206
+ special ExitSafariMode
warpwalk Route121_SafariZoneEntrance, 255, 2, 5
waitstate
end
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index ff8592f7d..71184346f 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -64,14 +64,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
.endif
setweather 0
doweather
- special 332
+ special sub_8081924
waitstate
.ifdef SAPPHIRE
msgbox UnknownString_81B43C4, 4
.else
msgbox SeafloorCavern_Room9_Text_1B4A5A, 4
.endif
- special 284
+ special WaitWeather
waitstate
.ifdef SAPPHIRE
setvar RESULT, 1
@@ -91,7 +91,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
.endif
fanfare 388
playsfx 107
- special 281
+ special sub_80818A4
move 0x8004, SeafloorCavern_Room9_Movement_1A0841
move 255, SeafloorCavern_Room9_Movement_1A0841
waitmove 0
@@ -102,11 +102,11 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
pause 60
move 1, SeafloorCavern_Room9_Movement_15DD4C
waitmove 0
- special 282
+ special sub_80818FC
waitstate
setvar 0x8004, 1
setvar 0x8005, 1
- special 310
+ special sub_810F758
waitstate
move 1, SeafloorCavern_Room9_Movement_15DD57
waitmove 0
@@ -114,7 +114,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
pause 4
setvar 0x8004, 2
setvar 0x8005, 2
- special 310
+ special sub_810F758
waitstate
pause 30
setvar 0x8004, 2
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc
index 16d4c7003..76a930dc0 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/scripts/maps/SealedChamber_InnerRoom.inc
@@ -8,23 +8,23 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
hidebox 0, 0, 29, 19
checkflag 228
jumpeq SealedChamber_InnerRoom_EventScript_15F247
- specialval RESULT, 279
+ specialval RESULT, CheckRelicanthWailord
compare RESULT, 0
jumpeq SealedChamber_InnerRoom_EventScript_15F247
fadeout 0
playsfx 49
- special 305
+ special DoSealedChamberShakingEffect1
waitstate
pause 40
- special 315
+ special DoSealedChamberShakingEffect2
waitstate
playsfx 8
pause 40
- special 315
+ special DoSealedChamberShakingEffect2
waitstate
playsfx 8
pause 40
- special 315
+ special DoSealedChamberShakingEffect2
waitstate
playsfx 8
pause 40
diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc
index 4ccbc2f0e..302bc3930 100644
--- a/data/scripts/maps/SecretBase_YellowCave4.inc
+++ b/data/scripts/maps/SecretBase_YellowCave4.inc
@@ -11,7 +11,7 @@ SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C
SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F
call SecretBase_RedCave1_EventScript_1A2F3D
- special 22
+ special sub_80BBFA4
end
SecretBase_RedCave1_MapScript2_15F358:: @ 815F358
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 9b822a473..38a1c9a74 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
@@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057
.byte 0
ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D
- special 210
+ special UpdateShoalTideFlag
checkflag 2106
jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E06E
jump ShoalCave_LowTideEntranceRoom_EventScript_15E072
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index eab522a1f..3078b4625 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
@@ -76,7 +76,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257
compare RESULT, 0
jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B
setmaptile 41, 20, 859, 0
- special 142
+ special DrawWholeMapView
setflag 956
releaseall
end
@@ -94,7 +94,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
compare RESULT, 0
jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B
setmaptile 41, 10, 859, 0
- special 142
+ special DrawWholeMapView
setflag 957
releaseall
end
@@ -107,7 +107,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
compare RESULT, 0
jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B
setmaptile 6, 9, 859, 0
- special 142
+ special DrawWholeMapView
setflag 958
releaseall
end
@@ -120,7 +120,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
compare RESULT, 0
jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B
setmaptile 16, 13, 859, 0
- special 142
+ special DrawWholeMapView
setflag 959
releaseall
end
@@ -133,7 +133,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329
compare RESULT, 0
jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B
setmaptile 31, 8, 858, 0
- special 142
+ special DrawWholeMapView
setflag 952
releaseall
end
@@ -151,7 +151,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365
compare RESULT, 0
jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B
setmaptile 14, 26, 858, 0
- special 142
+ special DrawWholeMapView
setflag 953
releaseall
end
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
index dfcd5b83f..67de2676f 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
@@ -23,7 +23,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413
compare RESULT, 0
jumpeq ShoalCave_LowTideLowerRoom_EventScript_1A029B
setmaptile 18, 2, 858, 0
- special 142
+ special DrawWholeMapView
setflag 955
releaseall
end
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
index 584a57818..c46a2cb2d 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
@@ -23,7 +23,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7
compare RESULT, 0
jumpeq ShoalCave_LowTideStairsRoom_EventScript_1A029B
setmaptile 11, 11, 858, 0
- special 142
+ special DrawWholeMapView
setflag 954
releaseall
end
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index b28d89d93..23db6a8ea 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -21,7 +21,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316
waitpokecry
setflag 773
setflag 2145
- special 312
+ special StartBattle_Rayquaza
waitstate
clearflag 2145
release
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 6125c4871..48eb5c1df 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -66,10 +66,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0
faceplayer
bufferfirstpoke 0
msgbox SlateportCity_Text_164682, 4
- specialval RESULT, 292
+ specialval RESULT, LeadMonHasEffortRibbon
compare RESULT, 1
callif 1, SlateportCity_EventScript_14BB35
- specialval RESULT, 294
+ specialval RESULT, GetLeadMonEVCount
compare RESULT, 0
callif 1, SlateportCity_EventScript_14BB2B
msgbox SlateportCity_Text_164691, 4
@@ -78,7 +78,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0
waitfanfare
waittext
msgbox SlateportCity_Text_1646FC, 4
- special 293
+ special GivLeadMonEffortRibbon
release
end
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc
index b2cce5312..b1ce50815 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
@@ -11,7 +11,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D
setvar CONTEST_RANK, 2
call SlateportCity_ContestLobby_EventScript_1A4E92
call SlateportCity_ContestLobby_EventScript_155448
- special 83
+ special sub_80C4BF0
call SlateportCity_ContestLobby_EventScript_15FBDB
setvar 0x4088, 3
warp LinkContestRoom1, 255, 7, 5
@@ -25,13 +25,13 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448
playsfx 71
setmaptile 4, 2, 545, 1
setmaptile 4, 3, 609, 1
- special 142
+ special DrawWholeMapView
move 1, SlateportCity_ContestLobby_Movement_1554CF
waitmove 0
playsfx 71
setmaptile 4, 2, 721, 1
setmaptile 4, 3, 729, 1
- special 142
+ special DrawWholeMapView
pause 20
move 1, SlateportCity_ContestLobby_Movement_1554DC
waitmove 0
@@ -128,7 +128,7 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536
@ 815553F
lockall
- special 259
+ special ShowBerryBlenderRecordWindow
waitbutton
hidebox 0, 0, 29, 19
releaseall
diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc
index 702e52d84..4161889e1 100644
--- a/data/scripts/maps/SlateportCity_House1.inc
+++ b/data/scripts/maps/SlateportCity_House1.inc
@@ -13,7 +13,7 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B
SlateportCity_House1_EventScript_15569C:: @ 815569C
msgbox SlateportCity_House1_Text_17D4DB, 4
- special 159
+ special sub_80F9A0C
waitstate
compare 0x8004, 255
jumpif 5, SlateportCity_House1_EventScript_1556C9
@@ -27,15 +27,15 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF
end
SlateportCity_House1_EventScript_1556C9:: @ 81556C9
- specialval RESULT, 327
+ specialval RESULT, ScriptGetPartyMonSpecies
compare RESULT, SPECIES_EGG
jumpeq SlateportCity_House1_EventScript_15571C
- special 124
- special 125
+ special sub_80BFAE0
+ special sub_80BFB10
compare RESULT, 1
jumpeq SlateportCity_House1_EventScript_155726
- specialval RESULT, 336
- special 124
+ specialval RESULT, sub_810F96C
+ special sub_80BFAE0
compare RESULT, 1
jumpeq SlateportCity_House1_EventScript_155726
msgbox SlateportCity_House1_Text_17D505, 5
@@ -58,8 +58,8 @@ SlateportCity_House1_EventScript_155726:: @ 8155726
SlateportCity_House1_EventScript_155730:: @ 8155730
msgbox SlateportCity_House1_Text_17D580, 4
call SlateportCity_House1_EventScript_1A0678
- specialval RESULT, 123
- special 124
+ specialval RESULT, sub_80BF9B4
+ special sub_80BFAE0
compare RESULT, 1
jumpeq SlateportCity_House1_EventScript_15575A
msgbox SlateportCity_House1_Text_17D63A, 4
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
index 8f0323f77..0a7466a3b 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
@@ -144,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998
end
SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2
- specialval RESULT, 265
+ specialval RESULT, CheckLeadMonCool
compare RESULT, 1
callif 1, SlateportCity_PokemonFanClub_EventScript_1559B3
return
@@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3
return
SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9
- specialval RESULT, 266
+ specialval RESULT, CheckLeadMonBeauty
compare RESULT, 1
callif 1, SlateportCity_PokemonFanClub_EventScript_1559CA
return
@@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA
return
SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0
- specialval RESULT, 267
+ specialval RESULT, CheckLeadMonCute
compare RESULT, 1
callif 1, SlateportCity_PokemonFanClub_EventScript_1559E1
return
@@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1
return
SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7
- specialval RESULT, 268
+ specialval RESULT, CheckLeadMonSmart
compare RESULT, 1
callif 1, SlateportCity_PokemonFanClub_EventScript_1559F8
return
@@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8
return
SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE
- specialval RESULT, 269
+ specialval RESULT, CheckLeadMonTough
compare RESULT, 1
callif 1, SlateportCity_PokemonFanClub_EventScript_155A0F
return
@@ -199,7 +199,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15
checkflag 278
jumpeq SlateportCity_PokemonFanClub_EventScript_155A75
msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4
- specialval RESULT, 230
+ specialval RESULT, GetLeadMonFriendshipScore
compare RESULT, 4
jumpif 4, SlateportCity_PokemonFanClub_EventScript_155A3A
release
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 3d9c2dc93..0c22fbc37 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -91,7 +91,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F
lock
faceplayer
checkdailyflags
- special 148
+ special GetPlayerBigGuyGirlString
checkflag 2258
jumpeq SootopolisCity_EventScript_14D241
msgbox SootopolisCity_Text_1C63F2, 4
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index e28ab4547..32bf4d619 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -15,7 +15,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22
SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25
call SootopolisCity_Gym_1F_EventScript_15AF2E
- special 309
+ special sub_8069D78
end
SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E
@@ -51,7 +51,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8
pause 40
playsfx 40
call SootopolisCity_Gym_1F_EventScript_15AF2E
- special 142
+ special DrawWholeMapView
end
SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC
@@ -59,7 +59,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC
pause 40
playsfx 40
call SootopolisCity_Gym_1F_EventScript_15AF2E
- special 142
+ special DrawWholeMapView
end
SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0
@@ -67,7 +67,7 @@ SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0
pause 40
playsfx 40
call SootopolisCity_Gym_1F_EventScript_15AF2E
- special 142
+ special DrawWholeMapView
end
SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4
diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc
index c52965124..9d7618316 100644
--- a/data/scripts/maps/SootopolisCity_House8.inc
+++ b/data/scripts/maps/SootopolisCity_House8.inc
@@ -2,16 +2,16 @@ SootopolisCity_House8_MapScripts:: @ 815B400
.byte 0
SootopolisCity_House8_EventScript_15B401:: @ 815B401
- special 119
+ special GetShroomishSizeRecordInfo
lock
faceplayer
msgbox SootopolisCity_House8_Text_1900F7, 4
- special 159
+ special sub_80F9A0C
waitstate
copyvar RESULT, 0x8004
compare RESULT, 255
jumpeq SootopolisCity_House8_EventScript_15B448
- special 120
+ special CompareShroomishSize
compare RESULT, 1
jumpeq SootopolisCity_House8_EventScript_15B452
compare RESULT, 2
@@ -51,16 +51,16 @@ SootopolisCity_House8_EventScript_15B488:: @ 815B488
end
SootopolisCity_House8_EventScript_15B492:: @ 815B492
- special 121
+ special GetBarboachSizeRecordInfo
lock
faceplayer
msgbox SootopolisCity_House8_Text_190431, 4
- special 159
+ special sub_80F9A0C
waitstate
copyvar RESULT, 0x8004
compare RESULT, 255
jumpeq SootopolisCity_House8_EventScript_15B4D9
- special 122
+ special CompareBarboachSize
compare RESULT, 1
jumpeq SootopolisCity_House8_EventScript_15B4E3
compare RESULT, 2
@@ -100,14 +100,14 @@ SootopolisCity_House8_EventScript_15B519:: @ 815B519
end
SootopolisCity_House8_EventScript_15B523:: @ 815B523
- special 119
+ special GetShroomishSizeRecordInfo
lockall
msgbox SootopolisCity_House8_Text_1903C9, 4
releaseall
end
SootopolisCity_House8_EventScript_15B531:: @ 815B531
- special 121
+ special GetBarboachSizeRecordInfo
lockall
msgbox SootopolisCity_House8_Text_1906BE, 4
releaseall
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index d3b944f29..3adf3545f 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -49,7 +49,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
checkflag 2131
jumpif 0, SouthernIsland_Interior_EventScript_160C08
setflag 206
- special 275
+ special SpawnCameraDummy
move 127, SouthernIsland_Interior_Movement_160C12
waitmove 0
pause 50
@@ -63,11 +63,11 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
move 2, SouthernIsland_Interior_Movement_160C22
waitmove 0
pause 50
- special 276
+ special RemoveCameraDummy
setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
setflag 911
setflag 2145
- special 323
+ special StartBattle_SouthernIsland
waitstate
clearflag 2145
releaseall
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
index f4f1fe61c..cbd782f35 100644
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ b/data/scripts/maps/UnknownMap_25_34.inc
@@ -12,7 +12,7 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595
end
LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5
- special 326
+ special ScriptGetMultiplayerId
compare RESULT, 0
callif 1, LinkContestRoom1_EventScript_15F5E0
compare RESULT, 1
@@ -127,7 +127,7 @@ LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB
LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6
setvar RESULT, 32
- special 340
+ special ScriptRandom
addvar RESULT, 1
switch RESULT
case 1, LinkContestRoom1_EventScript_15F859
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 066ecbdce..8fd4016d1 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
@@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76
setvar CONTEST_RANK, 0
call VerdanturfTown_ContestLobby_EventScript_1A4E92
call VerdanturfTown_ContestLobby_EventScript_153DA1
- special 83
+ special sub_80C4BF0
call VerdanturfTown_ContestLobby_EventScript_15FBDB
setvar 0x4088, 1
warp LinkContestRoom1, 255, 7, 5
@@ -25,13 +25,13 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1
playsfx 71
setmaptile 4, 2, 545, 1
setmaptile 4, 3, 609, 1
- special 142
+ special DrawWholeMapView
move 1, VerdanturfTown_ContestLobby_Movement_153E28
waitmove 0
playsfx 71
setmaptile 4, 2, 721, 1
setmaptile 4, 3, 729, 1
- special 142
+ special DrawWholeMapView
pause 20
move 1, VerdanturfTown_ContestLobby_Movement_153E35
waitmove 0
@@ -122,7 +122,7 @@ VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80
VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89
lockall
- special 259
+ special ShowBerryBlenderRecordWindow
waitbutton
hidebox 0, 0, 29, 19
releaseall
diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
index 2dc2e1355..5453fb42c 100644
--- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
@@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_154030:: @ 8154030
lock
faceplayer
msgbox VerdanturfTown_FriendshipRatersHouse_Text_178A9C, 4
- specialval RESULT, 230
+ specialval RESULT, GetLeadMonFriendshipScore
switch RESULT
case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154093
case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_15409D
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
index b1f6e732b..f64ca20ab 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/scripts/maps/VictoryRoad_1F.inc
@@ -93,7 +93,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28
VictoryRoad_1F_EventScript_15DF31:: @ 815DF31
trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq VictoryRoad_1F_EventScript_15DF58
msgbox VictoryRoad_1F_Text_197A47, 6
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 15d4b2a40..5fd68beca 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -44,7 +44,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1
PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB
setvar 0x8004, 0
- special 96
+ special sub_80EB7C4
waittext
pause 80
msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, 4
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 9db432c2c..ca4b2bdb9 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -107,14 +107,14 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91
inccounter GAME_STAT_CHECKED_CLOCK
fadescreen 1
- special 155
+ special sub_810D6B8
waitstate
releaseall
end
LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B
fadescreen 1
- special 154
+ special StartWallClock
waitstate
return
@@ -221,7 +221,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
waitmove 0
msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
fadedefault
- special 62
+ special TurnOffTVScreen
setflag 2096
pause 35
return
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 2cb283173..e1add8734 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -49,11 +49,11 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1
checkitem ITEM_POKEBLOCK_CASE, 1
compare RESULT, 0
jumpeq FallarborTown_ContestLobby_EventScript_1B7780
- specialval RESULT, 49
+ specialval RESULT, PlayerHasBerries
compare RESULT, 0
jumpeq FallarborTown_ContestLobby_EventScript_1B770E
msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4
- specialval RESULT, 160
+ specialval RESULT, sub_810CA00
compare RESULT, 65535
jumpif 5, FallarborTown_ContestLobby_EventScript_1B76EF
compare RESULT, 65535
@@ -94,7 +94,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734
FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742
copyvar 0x8004, 0x8009
fadescreen 1
- special 161
+ special sub_804E538
waitstate
releaseall
end
@@ -148,7 +148,7 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6
lock
faceplayer
msgbox FallarborTown_ContestLobby_Text_1B742F, 4
- specialval RESULT, 49
+ specialval RESULT, PlayerHasBerries
compare RESULT, 1
jumpeq FallarborTown_ContestLobby_EventScript_1B77DC
compare RESULT, 0
@@ -208,13 +208,13 @@ LilycoveCity_ContestLobby_EventScript_1B783B:: @ 81B783B
SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B
VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B
lockall
- specialval RESULT, 49
+ specialval RESULT, PlayerHasBerries
compare RESULT, 0
jumpeq FallarborTown_ContestLobby_EventScript_1B7897
checkitem ITEM_POKEBLOCK_CASE, 1
compare RESULT, 0
jumpeq FallarborTown_ContestLobby_EventScript_1B7942
- specialval RESULT, 160
+ specialval RESULT, sub_810CA00
compare RESULT, 65535
jumpif 5, FallarborTown_ContestLobby_EventScript_1B7878
compare RESULT, 65535
@@ -240,7 +240,7 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1
jumpeq FallarborTown_ContestLobby_EventScript_1B7936
message FallarborTown_ContestLobby_Text_1B7304
waittext
- special 36
+ special sub_8083614
waitstate
compare RESULT, 1
jumpeq FallarborTown_ContestLobby_EventScript_1B7980
@@ -276,7 +276,7 @@ FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D
disappear 239
disappear 238
disappear 237
- special 161
+ special sub_804E538
waitstate
releaseall
end
@@ -296,35 +296,35 @@ FallarborTown_ContestLobby_EventScript_1B7942:: @ 81B7942
end
FallarborTown_ContestLobby_EventScript_1B794C:: @ 81B794C
- special 31
+ special CloseLink
msgbox FallarborTown_ContestLobby_Text_1A4A30, 4
releaseall
end
FallarborTown_ContestLobby_EventScript_1B7959:: @ 81B7959
- special 31
+ special CloseLink
msgbox FallarborTown_ContestLobby_Text_1A4B1D, 4
releaseall
end
FallarborTown_ContestLobby_EventScript_1B7966:: @ 81B7966
- special 31
+ special CloseLink
msgbox FallarborTown_ContestLobby_Text_1A10EB, 4
releaseall
end
FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973
- special 31
+ special CloseLink
msgbox FallarborTown_ContestLobby_Text_1A4A85, 4
releaseall
end
FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980
fadescreen 1
- specialval RESULT, 37
+ specialval RESULT, GetLinkPartnerNames
copyvar 0x8008, RESULT
copyvar 0x8004, 0x8008
- special 38
+ special SpawnBerryBlenderLinkPlayerSprites
jump FallarborTown_ContestLobby_EventScript_1B799A
end
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index c8d519038..03293115b 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -1,12 +1,12 @@
gUnknown_081C340A:: @ 81C340A
setvar 0x40a4, 1
- special 206
+ special ExitSafariMode
warp3 Route121_SafariZoneEntrance, 255, 2, 5
end
EventScript_1C341B: @ 81C341B
setvar 0x40a4, 1
- special 206
+ special ExitSafariMode
warp Route121_SafariZoneEntrance, 255, 2, 5
waitstate
end
@@ -42,7 +42,7 @@ gUnknown_081C3459:: @ 81C3459
gUnknown_081C346A:: @ 81C346A
lockall
- special 207
+ special SafariZoneGetPokeblockNameInFeeder
compare RESULT, -1
jumpif 5, EventScript_1C34A9
msgbox UnknownString_81C354E, 5
@@ -53,7 +53,7 @@ gUnknown_081C346A:: @ 81C346A
EventScript_1C348E:
fadescreen 1
- special 208
+ special sub_810BAF4
waitstate
compare RESULT, -1
jumpif 5, EventScript_1C34A0
diff --git a/data/scripts/storyteller.inc b/data/scripts/storyteller.inc
index c44480e2f..eba94e698 100644
--- a/data/scripts/storyteller.inc
+++ b/data/scripts/storyteller.inc
@@ -8,22 +8,22 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0816:: @ 81B0816
msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
- specialval RESULT, 107
+ specialval RESULT, sub_80F889C
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3
MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F
message MauvilleCity_PokemonCenter_1F_Text_1AED35
waittext
- special 109
+ special sub_80F8874
waitstate
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883
setvar 0x8008, 1
- special 108
+ special sub_80F8888
waittext
waitbutton
- specialval RESULT, 110
+ specialval RESULT, sub_80F88AC
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893
jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909
@@ -40,10 +40,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F
MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE
- specialval RESULT, 112
+ specialval RESULT, sub_80F88E0
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F
- specialval RESULT, 107
+ specialval RESULT, sub_80F889C
compare RESULT, 4
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F
jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB
@@ -55,7 +55,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB
msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
- specialval RESULT, 111
+ specialval RESULT, sub_80F88FC
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909
msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4
diff --git a/data/scripts/trader.inc b/data/scripts/trader.inc
index b3a302516..b52c8a2dc 100644
--- a/data/scripts/trader.inc
+++ b/data/scripts/trader.inc
@@ -4,7 +4,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB:: @ 81AEBAB
msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA
- special 114
+ special sub_8109C44
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3
message MauvilleCity_PokemonCenter_1F_Text_1AE910
@@ -21,7 +21,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3
end
MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC
- special 113
+ special sub_8109E34
waitstate
compare 0x8004, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D
@@ -30,7 +30,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC
msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42
- special 115
+ special sub_8109C58
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E
jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57
@@ -58,19 +58,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E
MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57
msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4
- special 117
+ special sub_8109CF0
waitstate
compare 0x8006, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6
compare 0x8006, 65535
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF
- special 116
+ special sub_8109C90
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD
msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57
- special 118
+ special sub_8109DE0
msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2
end
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 2b317e725..1f8956811 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -1,8 +1,8 @@
Event_TV:: @ 81A6E72
lockall
inccounter GAME_STAT_WATCHED_TV
- special 75
- specialval RESULT, 73
+ special sub_80C2014
+ specialval RESULT, CheckForBigMovieOrEmergencyNewsOnTV
compare RESULT, 2
jumpeq EventScript_1A6F01
compare RESULT, 1
@@ -11,29 +11,29 @@ Event_TV:: @ 81A6E72
jumpif 0, EventScript_1A6EF1
checkflag 2097
jumpeq EventScript_1A6EF1
- specialval RESULT, 176
+ specialval RESULT, IsTVShowInSearchOfTrainersAiring
compare RESULT, 1
jumpeq EventScript_1A6F66
jump EventScript_1A6F50
end
EventScript_1A6EBB:
- specialval 0x8004, 65
+ specialval 0x8004, special_0x44
compare 0x8004, 255
jumpeq EventScript_1A6F3F
- specialval RESULT, 71
+ specialval RESULT, special_0x4a
compare RESULT, 255
jumpeq EventScript_1A6F3F
copyvar 0x8004, RESULT
- specialval RESULT, 66
+ specialval RESULT, sub_80BDA0C
compare RESULT, 0
jumpif 5, EventScript_1A6F21
end
EventScript_1A6EF1:
- special 74
+ special GetMomOrDadStringForTVMessage
msgbox UnknownString_81A0E68, 4
- special 62
+ special TurnOffTVScreen
releaseall
end
@@ -48,15 +48,15 @@ EventScript_1A6F0B:
.else
msgbox UnknownString_8172C50, 4
.endif
- special 297
+ special InitRoamer
clearflag 2141
setflag 255
- special 62
+ special TurnOffTVScreen
releaseall
end
EventScript_1A6F21:
- special 63
+ special DoTVShow
waittext
waitbutton
compare RESULT, 1
@@ -65,19 +65,19 @@ EventScript_1A6F21:
end
EventScript_1A6F37:
- special 62
+ special TurnOffTVScreen
setflag 2097
releaseall
end
EventScript_1A6F3F:
- special 74
+ special GetMomOrDadStringForTVMessage
msgbox UnknownString_81A0E68, 4
jump EventScript_1A6F37
end
EventScript_1A6F50:
- special 64
+ special sub_80BECE8
compare RESULT, 0
jumpeq EventScript_1A6EBB
waittext
@@ -86,7 +86,7 @@ EventScript_1A6F50:
end
EventScript_1A6F66:
- special 175
+ special DoTVShowInSearchOfTrainers
waittext
waitbutton
compare RESULT, 0
diff --git a/data/specials.inc b/data/specials.inc
index f7aa3456a..0eb6b742d 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -1,347 +1,354 @@
+.macro def_special ptr
+.set SPECIAL_\ptr, __special__
+.set __special__, __special__ + 1
+ .4byte \ptr
+ .endm
+
+.set __special__, 0
.align 2
gSpecials::
- .4byte HealPlayerParty
- .4byte sub_8068FEC
- .4byte sub_808102C
- .4byte sub_80810DC
- .4byte sub_80839A4
- .4byte sub_80839D0
- .4byte sub_80BB8CC
- .4byte sub_80BB63C
- .4byte sub_80BBAF0
- .4byte sub_80BC440
- .4byte SecretBasePC_PackUp
- .4byte sub_80BC114
- .4byte sub_80BC56C
- .4byte sub_80BC5BC
- .4byte SecretBasePC_Decoration
- .4byte SecretBasePC_Registry
- .4byte sub_80BCE1C
- .4byte sub_80BCE90
- .4byte sub_80BBDD0
- .4byte sub_80FF474
- .4byte sub_8100B20
- .4byte sub_80BB70C
- .4byte sub_80BBFA4
- .4byte sub_8100A7C
- .4byte sub_80BBC78
- .4byte sub_80BCE4C
- .4byte sub_80C683C
- .4byte sub_80B929C
- .4byte sub_808347C
- .4byte sub_80834E4
- .4byte sub_808350C
- .4byte CloseLink
- .4byte sub_8083B90
- .4byte sub_8083B5C
- .4byte sub_8083B80
- .4byte sub_8083820
- .4byte sub_8083614
- .4byte GetLinkPartnerNames
- .4byte SpawnBerryBlenderLinkPlayerSprites
- .4byte SavePlayerParty
- .4byte LoadPlayerParty
- .4byte sub_80C5568
- .4byte sub_8083BDC
- .4byte FieldObjectInteractionGetBerryTreeData
- .4byte sub_80B4EE4
- .4byte FieldObjectInteractionPlantBerryTree
- .4byte FieldObjectInteractionPickBerryTree
- .4byte FieldObjectInteractionRemoveBerryTree
- .4byte FieldObjectInteractionWaterBerryTree
- .4byte PlayerHasBerries
- .4byte IsEnigmaBerryValid
- .4byte sub_8082558
- .4byte sub_80826D8
- .4byte sub_8082718
- .4byte sub_8082564
- .4byte sub_80847C8
- .4byte PlayTrainerEncounterMusic
- .4byte sub_8082C68
- .4byte sub_8082C9C
- .4byte sub_80826B0
- .4byte ShowPokemonStorageSystem
- .4byte CheckForAlivePartyMons
- .4byte TurnOffTVScreen
- .4byte DoTVShow
- .4byte sub_80BECE8
- .4byte special_0x44
- .4byte sub_80BDA0C
- .4byte sub_80BF2C4
- .4byte sub_80BDE48
- .4byte sub_80BF544
- .4byte SetContestCategoryStringVarForInterview
- .4byte special_0x4a
- .4byte sub_80BF974
- .4byte CheckForBigMovieOrEmergencyNewsOnTV
- .4byte GetMomOrDadStringForTVMessage
- .4byte sub_80C2014
- .4byte sub_80C47C0
- .4byte sub_80C496C
- .4byte sub_80C4C28
- .4byte sub_80C47F0
- .4byte sub_80C4858
- .4byte sub_80C4C64
- .4byte sub_80C4758
- .4byte sub_80C4BF0
- .4byte sub_80C43F4
- .4byte sub_80C4D80
- .4byte sub_80C4F70
- .4byte sub_80C47A0
- .4byte sub_80C4440
- .4byte sub_80C44C0
- .4byte sub_80C5044
- .4byte GiveMonArtistRibbon
- .4byte sub_808363C
- .4byte InitSaveDialog
- .4byte DoWateringBerryTreeAnim
- .4byte sub_80E60D8
- .4byte sub_80EB7C4
- .4byte sub_80F7B14
- .4byte sub_80F7B2C
- .4byte sub_80F7B40
- .4byte sub_80F7C70
- .4byte sub_80F7C84
- .4byte sub_80F7C90
- .4byte sub_80F7C54
- .4byte sub_80F83D0
- .4byte sub_80F7CF4
- .4byte sub_80F7CC8
- .4byte sub_80F889C
- .4byte sub_80F8888
- .4byte sub_80F8874
- .4byte sub_80F88AC
- .4byte sub_80F88FC
- .4byte sub_80F88E0
- .4byte sub_8109E34
- .4byte sub_8109C44
- .4byte sub_8109C58
- .4byte sub_8109C90
- .4byte sub_8109CF0
- .4byte sub_8109DE0
- .4byte GetShroomishSizeRecordInfo
- .4byte CompareShroomishSize
- .4byte GetBarboachSizeRecordInfo
- .4byte CompareBarboachSize
- .4byte sub_80BF9B4
- .4byte sub_80BFAE0
- .4byte sub_80BFB10
- .4byte sub_80FA5BC
- .4byte sub_80FA5E4
- .4byte sub_80EB83C
- .4byte sub_80FA648
- .4byte SwapRegisteredBike
- .4byte CalculatePlayerPartyCount
- .4byte sub_8095B6C
- .4byte sub_8095C10
- .4byte sub_80C4CF8
- .4byte sub_80C4CEC
- .4byte sub_80C4C78
- .4byte sub_80C4D50
- .4byte ShowContestWinner
- .4byte MauvilleGymSpecial2
- .4byte MauvilleGymSpecial1
- .4byte ShowFieldMessageStringVar4
- .4byte DrawWholeMapView
- .4byte StorePlayerCoordsInVars
- .4byte MauvilleGymSpecial3
- .4byte PetalburgGymSpecial1
- .4byte PetalburgGymSpecial2
- .4byte GetPlayerTrainerIdOnesDigit
- .4byte GetPlayerBigGuyGirlString
- .4byte GetRivalSonDaughterString
- .4byte SetFlagInVar
- .4byte CableCarWarp
- .4byte sub_8123218
- .4byte sub_8053E90
- .4byte StartWallClock
- .4byte sub_810D6B8
- .4byte ChooseStarter
- .4byte StartBattle_WallyTutorial
- .4byte sub_80BF9F8
- .4byte sub_80F9A0C
- .4byte sub_810CA00
- .4byte sub_804E538
- .4byte PlayRoulette
- .4byte sub_810FD60
- .4byte sub_810FCB0
- .4byte sub_810FDAC
- .4byte sub_810FA74
- .4byte sub_810FCE8
- .4byte sub_810FF48
- .4byte sub_810FAA0
- .4byte sub_810FF60
- .4byte RockSmashWildEncounter
- .4byte GabbyAndTyGetBattleNum
- .4byte sub_80BDC14
- .4byte GabbyAndTyBeforeInterview
- .4byte DoTVShowInSearchOfTrainers
- .4byte IsTVShowInSearchOfTrainersAiring
- .4byte GabbyAndTyGetLastQuote
- .4byte sub_80BDD18
- .4byte GabbyAndTySetScriptVarsToFieldObjectLocalIds
- .4byte sub_810E300
- .4byte sp0B5_daycare
- .4byte sp0B6_daycare
- .4byte sub_8041E7C
- .4byte sp0B8_daycare
- .4byte sp0B9_daycare_relationship_comment
- .4byte sub_8042328
- .4byte Daycare_SendPokemon_Special
- .4byte ChooseSendDaycareMon
- .4byte ShowDaycareLevelMenu
- .4byte sub_80417B8
- .4byte sub_8041770
- .4byte sub_8041648
- .4byte ScriptHatchMon
- .4byte EggHatch
- .4byte sub_8042B4C
- .4byte ShowLinkBattleRecords
- .4byte sub_80B7CE8
- .4byte sub_80B7D0C
- .4byte ExecuteWhiteOut
- .4byte sp0C8_whiteout_maybe
- .4byte RotatingGate_InitPuzzle
- .4byte RotatingGate_InitPuzzleAndGraphics
- .4byte SetSSTidalFlag
- .4byte ResetSSTidalFlag
- .4byte EnterSafariMode
- .4byte ExitSafariMode
- .4byte SafariZoneGetPokeblockNameInFeeder
- .4byte sub_810BAF4
- .4byte IsMirageIslandPresent
- .4byte UpdateShoalTideFlag
- .4byte InitBirchState
- .4byte ScriptGetPokedexInfo
- .4byte ShowPokedexRatingMessage
- .4byte DoPCTurnOnEffect
- .4byte DoPCTurnOffEffect
- .4byte SetDepartmentStoreFloorVar
- .4byte DoLotteryCornerComputerEffect
- .4byte EndLotteryCornerComputerEffect
- .4byte sub_80F9A4C
- .4byte sub_80F9EEC
- .4byte sub_80FA0DC
- .4byte sub_80F9F84
- .4byte sub_80F9F3C
- .4byte sub_8132670
- .4byte GetRecordedCyclingRoadResults
- .4byte BeginCyclingRoadChallenge
- .4byte GetPlayerAvatarBike
- .4byte FinishCyclingRoadChallenge
- .4byte UpdateCyclingRoadState
- .4byte GetLeadMonFriendshipScore
- .4byte sub_8134548
- .4byte sub_81347F8
- .4byte CheckPartyBattleTowerBanlist
- .4byte sub_8135474
- .4byte sub_81360C0
- .4byte sub_813556C
- .4byte sub_8135668
- .4byte sub_81358A4
- .4byte sub_8135A14
- .4byte sub_8135BA0
- .4byte sub_8135C38
- .4byte sub_8135D84
- .4byte sub_8135DEC
- .4byte sub_8135E50
- .4byte ChooseBattleTowerPlayerParty
- .4byte sub_813601C
- .4byte sub_810F404
- .4byte ReducePlayerPartyToThree
- .4byte BedroomPC
- .4byte PlayerPC
- .4byte FieldShowRegionMap
- .4byte sub_804D89C
- .4byte sub_804DB68
- .4byte sub_804E174
- .4byte sub_804DB2C
- .4byte GetWeekCount
- .4byte RetrieveLotteryNumber
- .4byte PickLotteryCornerTicket
- .4byte ShowBerryBlenderRecordWindow
- .4byte ResetTrickHouseEndRoomFlag
- .4byte SetTrickHouseEndRoomFlag
- .4byte TryCreatePCMenu
- .4byte AccessHallOfFamePC
- .4byte sub_810D6A4
- .4byte CheckLeadMonCool
- .4byte CheckLeadMonBeauty
- .4byte CheckLeadMonCute
- .4byte CheckLeadMonSmart
- .4byte CheckLeadMonTough
- .4byte sub_80C7958
- .4byte DoSoftReset
- .4byte GameClear
- .4byte sub_810EBEC
- .4byte ShowGlassWorkshopMenu
- .4byte SpawnCameraDummy
- .4byte RemoveCameraDummy
- .4byte GetPokeblockNameByMonNature
- .4byte GetSecretBaseNearbyMapName
- .4byte CheckRelicanthWailord
- .4byte DoBrailleWait
- .4byte sub_80818A4
- .4byte sub_80818FC
- .4byte ShowBattleTowerRecords
- .4byte WaitWeather
- .4byte sub_810F414
- .4byte sub_810F424
- .4byte player_get_direction_lower_nybble
- .4byte sub_810F488
- .4byte sub_810F4B0
- .4byte sub_810F4D4
- .4byte sub_810F4FC
- .4byte LeadMonHasEffortRibbon
- .4byte GivLeadMonEffortRibbon
- .4byte GetLeadMonEVCount
- .4byte sub_8064EAC
- .4byte sub_8064ED4
- .4byte InitRoamer
- .4byte sub_810F5BC
- .4byte IsGrassTypeInParty
- .4byte sub_8081334
- .4byte PutZigzagoonInPlayerParty
- .4byte IsStarterInParty
- .4byte sub_80BC224
- .4byte CheckFreePokemonStorageSpace
- .4byte DoSealedChamberShakingEffect1
- .4byte sub_810E944
- .4byte GetShieldToyTVDecorationInfo
- .4byte IsPokerusInParty
- .4byte sub_8069D78
- .4byte sub_810F758
- .4byte StartBattle_GroudonKyogre
- .4byte StartBattle_Rayquaza
- .4byte StartBattle_Regi
- .4byte sub_8082524
- .4byte DoSealedChamberShakingEffect2
- .4byte sub_810F828
- .4byte sub_807E25C
- .4byte sp13E_warp_to_last_warp
- .4byte sp13F_fall_to_last_warp
- .4byte ShowContestEntryMonPic
- .4byte sub_80C5164
- .4byte sub_8134AB4
- .4byte StartBattle_SouthernIsland
- .4byte SetRoute119Weather
- .4byte SetRoute123Weather
- .4byte ScriptGetMultiplayerId
- .4byte ScriptGetPartyMonSpecies
- .4byte sub_80FA148
- .4byte sub_810F8FC
- .4byte sub_80BC50C
- .4byte LoadPlayerBag
- .4byte sub_8081924
- .4byte sub_810F950
- .4byte sub_810F908
- .4byte sub_8090FC0
- .4byte sub_810F96C
- .4byte sub_810F9AC
- .4byte sub_813610C
- .4byte GetNameOfEnigmaBerryInPlayerParty
- .4byte ScriptRandom
- .4byte sub_80835D8
+ def_special HealPlayerParty
+ def_special SetCableClubWarp
+ def_special DoCableClubWarp
+ def_special sub_80810DC
+ def_special sub_80839A4
+ def_special sub_80839D0
+ def_special sub_80BB8CC
+ def_special sub_80BB63C
+ def_special sub_80BBAF0
+ def_special sub_80BC440
+ def_special SecretBasePC_PackUp
+ def_special sub_80BC114
+ def_special sub_80BC56C
+ def_special sub_80BC5BC
+ def_special SecretBasePC_Decoration
+ def_special SecretBasePC_Registry
+ def_special sub_80BCE1C
+ def_special sub_80BCE90
+ def_special sub_80BBDD0
+ def_special sub_80FF474
+ def_special sub_8100B20
+ def_special sub_80BB70C
+ def_special sub_80BBFA4
+ def_special sub_8100A7C
+ def_special sub_80BBC78
+ def_special sub_80BCE4C
+ def_special sub_80C683C
+ def_special sub_80B929C
+ def_special sub_808347C
+ def_special sub_80834E4
+ def_special sub_808350C
+ def_special CloseLink
+ def_special sub_8083B90
+ def_special sub_8083B5C
+ def_special sub_8083B80
+ def_special sub_8083820
+ def_special sub_8083614
+ def_special GetLinkPartnerNames
+ def_special SpawnBerryBlenderLinkPlayerSprites
+ def_special SavePlayerParty
+ def_special LoadPlayerParty
+ def_special sub_80C5568
+ def_special sub_8083BDC
+ def_special FieldObjectInteractionGetBerryTreeData
+ def_special sub_80B4EE4
+ def_special FieldObjectInteractionPlantBerryTree
+ def_special FieldObjectInteractionPickBerryTree
+ def_special FieldObjectInteractionRemoveBerryTree
+ def_special FieldObjectInteractionWaterBerryTree
+ def_special PlayerHasBerries
+ def_special IsEnigmaBerryValid
+ def_special sub_8082558
+ def_special sub_80826D8
+ def_special sub_8082718
+ def_special sub_8082564
+ def_special sub_80847C8
+ def_special PlayTrainerEncounterMusic
+ def_special sub_8082C68
+ def_special sub_8082C9C
+ def_special sub_80826B0
+ def_special ShowPokemonStorageSystem
+ def_special CheckForAlivePartyMons
+ def_special TurnOffTVScreen
+ def_special DoTVShow
+ def_special sub_80BECE8
+ def_special special_0x44
+ def_special sub_80BDA0C
+ def_special sub_80BF2C4
+ def_special sub_80BDE48
+ def_special sub_80BF544
+ def_special SetContestCategoryStringVarForInterview
+ def_special special_0x4a
+ def_special sub_80BF974
+ def_special CheckForBigMovieOrEmergencyNewsOnTV
+ def_special GetMomOrDadStringForTVMessage
+ def_special sub_80C2014
+ def_special sub_80C47C0
+ def_special sub_80C496C
+ def_special sub_80C4C28
+ def_special sub_80C47F0
+ def_special sub_80C4858
+ def_special sub_80C4C64
+ def_special sub_80C4758
+ def_special sub_80C4BF0
+ def_special sub_80C43F4
+ def_special sub_80C4D80
+ def_special sub_80C4F70
+ def_special sub_80C47A0
+ def_special sub_80C4440
+ def_special sub_80C44C0
+ def_special sub_80C5044
+ def_special GiveMonArtistRibbon
+ def_special sub_808363C
+ def_special InitSaveDialog
+ def_special DoWateringBerryTreeAnim
+ def_special sub_80E60D8
+ def_special sub_80EB7C4
+ def_special sub_80F7B14
+ def_special sub_80F7B2C
+ def_special sub_80F7B40
+ def_special sub_80F7C70
+ def_special sub_80F7C84
+ def_special sub_80F7C90
+ def_special sub_80F7C54
+ def_special sub_80F83D0
+ def_special sub_80F7CF4
+ def_special sub_80F7CC8
+ def_special sub_80F889C
+ def_special sub_80F8888
+ def_special sub_80F8874
+ def_special sub_80F88AC
+ def_special sub_80F88FC
+ def_special sub_80F88E0
+ def_special sub_8109E34
+ def_special sub_8109C44
+ def_special sub_8109C58
+ def_special sub_8109C90
+ def_special sub_8109CF0
+ def_special sub_8109DE0
+ def_special GetShroomishSizeRecordInfo
+ def_special CompareShroomishSize
+ def_special GetBarboachSizeRecordInfo
+ def_special CompareBarboachSize
+ def_special sub_80BF9B4
+ def_special sub_80BFAE0
+ def_special sub_80BFB10
+ def_special sub_80FA5BC
+ def_special sub_80FA5E4
+ def_special sub_80EB83C
+ def_special sub_80FA648
+ def_special SwapRegisteredBike
+ def_special CalculatePlayerPartyCount
+ def_special sub_8095B6C
+ def_special sub_8095C10
+ def_special sub_80C4CF8
+ def_special sub_80C4CEC
+ def_special sub_80C4C78
+ def_special sub_80C4D50
+ def_special ShowContestWinner
+ def_special MauvilleGymSpecial2
+ def_special MauvilleGymSpecial1
+ def_special ShowFieldMessageStringVar4
+ def_special DrawWholeMapView
+ def_special StorePlayerCoordsInVars
+ def_special MauvilleGymSpecial3
+ def_special PetalburgGymSpecial1
+ def_special PetalburgGymSpecial2
+ def_special GetPlayerTrainerIdOnesDigit
+ def_special GetPlayerBigGuyGirlString
+ def_special GetRivalSonDaughterString
+ def_special SetFlagInVar
+ def_special CableCarWarp
+ def_special sub_8123218
+ def_special sub_8053E90
+ def_special StartWallClock
+ def_special sub_810D6B8
+ def_special ChooseStarter
+ def_special StartBattle_WallyTutorial
+ def_special sub_80BF9F8
+ def_special sub_80F9A0C
+ def_special sub_810CA00
+ def_special sub_804E538
+ def_special PlayRoulette
+ def_special sub_810FD60
+ def_special sub_810FCB0
+ def_special sub_810FDAC
+ def_special sub_810FA74
+ def_special sub_810FCE8
+ def_special sub_810FF48
+ def_special sub_810FAA0
+ def_special sub_810FF60
+ def_special RockSmashWildEncounter
+ def_special GabbyAndTyGetBattleNum
+ def_special sub_80BDC14
+ def_special GabbyAndTyBeforeInterview
+ def_special DoTVShowInSearchOfTrainers
+ def_special IsTVShowInSearchOfTrainersAiring
+ def_special GabbyAndTyGetLastQuote
+ def_special sub_80BDD18
+ def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+ def_special sub_810E300
+ def_special sp0B5_daycare
+ def_special sp0B6_daycare
+ def_special sub_8041E7C
+ def_special sp0B8_daycare
+ def_special sp0B9_daycare_relationship_comment
+ def_special sub_8042328
+ def_special Daycare_SendPokemon_Special
+ def_special ChooseSendDaycareMon
+ def_special ShowDaycareLevelMenu
+ def_special sub_80417B8
+ def_special sub_8041770
+ def_special sub_8041648
+ def_special ScriptHatchMon
+ def_special EggHatch
+ def_special sub_8042B4C
+ def_special ShowLinkBattleRecords
+ def_special sub_80B7CE8
+ def_special sub_80B7D0C
+ def_special ExecuteWhiteOut
+ def_special sp0C8_whiteout_maybe
+ def_special RotatingGate_InitPuzzle
+ def_special RotatingGate_InitPuzzleAndGraphics
+ def_special SetSSTidalFlag
+ def_special ResetSSTidalFlag
+ def_special EnterSafariMode
+ def_special ExitSafariMode
+ def_special SafariZoneGetPokeblockNameInFeeder
+ def_special sub_810BAF4
+ def_special IsMirageIslandPresent
+ def_special UpdateShoalTideFlag
+ def_special InitBirchState
+ def_special ScriptGetPokedexInfo
+ def_special ShowPokedexRatingMessage
+ def_special DoPCTurnOnEffect
+ def_special DoPCTurnOffEffect
+ def_special SetDepartmentStoreFloorVar
+ def_special DoLotteryCornerComputerEffect
+ def_special EndLotteryCornerComputerEffect
+ def_special sub_80F9A4C
+ def_special sub_80F9EEC
+ def_special sub_80FA0DC
+ def_special sub_80F9F84
+ def_special sub_80F9F3C
+ def_special sub_8132670
+ def_special GetRecordedCyclingRoadResults
+ def_special BeginCyclingRoadChallenge
+ def_special GetPlayerAvatarBike
+ def_special FinishCyclingRoadChallenge
+ def_special UpdateCyclingRoadState
+ def_special GetLeadMonFriendshipScore
+ def_special sub_8134548
+ def_special sub_81347F8
+ def_special CheckPartyBattleTowerBanlist
+ def_special sub_8135474
+ def_special sub_81360C0
+ def_special sub_813556C
+ def_special sub_8135668
+ def_special sub_81358A4
+ def_special sub_8135A14
+ def_special sub_8135BA0
+ def_special sub_8135C38
+ def_special sub_8135D84
+ def_special sub_8135DEC
+ def_special sub_8135E50
+ def_special ChooseBattleTowerPlayerParty
+ def_special sub_813601C
+ def_special sub_810F404
+ def_special ReducePlayerPartyToThree
+ def_special BedroomPC
+ def_special PlayerPC
+ def_special FieldShowRegionMap
+ def_special sub_804D89C
+ def_special sub_804DB68
+ def_special sub_804E174
+ def_special sub_804DB2C
+ def_special GetWeekCount
+ def_special RetrieveLotteryNumber
+ def_special PickLotteryCornerTicket
+ def_special ShowBerryBlenderRecordWindow
+ def_special ResetTrickHouseEndRoomFlag
+ def_special SetTrickHouseEndRoomFlag
+ def_special TryCreatePCMenu
+ def_special AccessHallOfFamePC
+ def_special sub_810D6A4
+ def_special CheckLeadMonCool
+ def_special CheckLeadMonBeauty
+ def_special CheckLeadMonCute
+ def_special CheckLeadMonSmart
+ def_special CheckLeadMonTough
+ def_special sub_80C7958
+ def_special DoSoftReset
+ def_special GameClear
+ def_special sub_810EBEC
+ def_special ShowGlassWorkshopMenu
+ def_special SpawnCameraDummy
+ def_special RemoveCameraDummy
+ def_special GetPokeblockNameByMonNature
+ def_special GetSecretBaseNearbyMapName
+ def_special CheckRelicanthWailord
+ def_special DoBrailleWait
+ def_special sub_80818A4
+ def_special sub_80818FC
+ def_special ShowBattleTowerRecords
+ def_special WaitWeather
+ def_special sub_810F414
+ def_special sub_810F424
+ def_special player_get_direction_lower_nybble
+ def_special sub_810F488
+ def_special sub_810F4B0
+ def_special sub_810F4D4
+ def_special sub_810F4FC
+ def_special LeadMonHasEffortRibbon
+ def_special GivLeadMonEffortRibbon
+ def_special GetLeadMonEVCount
+ def_special sub_8064EAC
+ def_special sub_8064ED4
+ def_special InitRoamer
+ def_special sub_810F5BC
+ def_special IsGrassTypeInParty
+ def_special sub_8081334
+ def_special PutZigzagoonInPlayerParty
+ def_special IsStarterInParty
+ def_special sub_80BC224
+ def_special CheckFreePokemonStorageSpace
+ def_special DoSealedChamberShakingEffect1
+ def_special sub_810E944
+ def_special GetShieldToyTVDecorationInfo
+ def_special IsPokerusInParty
+ def_special sub_8069D78
+ def_special sub_810F758
+ def_special StartBattle_GroudonKyogre
+ def_special StartBattle_Rayquaza
+ def_special StartBattle_Regi
+ def_special sub_8082524
+ def_special DoSealedChamberShakingEffect2
+ def_special sub_810F828
+ def_special sub_807E25C
+ def_special sp13E_warp_to_last_warp
+ def_special sp13F_fall_to_last_warp
+ def_special ShowContestEntryMonPic
+ def_special sub_80C5164
+ def_special sub_8134AB4
+ def_special StartBattle_SouthernIsland
+ def_special SetRoute119Weather
+ def_special SetRoute123Weather
+ def_special ScriptGetMultiplayerId
+ def_special ScriptGetPartyMonSpecies
+ def_special sub_80FA148
+ def_special sub_810F8FC
+ def_special sub_80BC50C
+ def_special LoadPlayerBag
+ def_special sub_8081924
+ def_special sub_810F950
+ def_special sub_810F908
+ def_special sub_8090FC0
+ def_special sub_810F96C
+ def_special sub_810F9AC
+ def_special sub_813610C
+ def_special GetNameOfEnigmaBerryInPlayerParty
+ def_special ScriptRandom
+ def_special sub_80835D8
.ifdef GERMAN
- .4byte nullsub_814B200
+ def_special nullsub_814B200
.endif
diff --git a/data/task.s b/data/task.s
deleted file mode 100644
index e87c5b1fc..000000000
--- a/data/task.s
+++ /dev/null
@@ -1,7 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .string "TASK OVER\n"
- .string "タスクがオーバーしました$"
diff --git a/data/text/item_descriptions.inc b/data/text/item_descriptions.inc
deleted file mode 100644
index 6fda439b0..000000000
--- a/data/text/item_descriptions.inc
+++ /dev/null
@@ -1,1393 +0,0 @@
-gItemDescription_MasterBall: @ 83C2028
- .string "The best BALL that\n"
- .string "catches a POKéMON\n"
- .string "without fail.$"
-
-gItemDescription_UltraBall: @ 83C205B
- .string "A better BALL with\n"
- .string "a higher catch rate\n"
- .string "than a GREAT BALL.$"
-
-gItemDescription_GreatBall: @ 83C2095
- .string "A good BALL with a\n"
- .string "higher catch rate\n"
- .string "than a POKé BALL.$"
-
-gItemDescription_PokeBall: @ 83C20CC
- .string "A tool used for\n"
- .string "catching wild\n"
- .string "POKéMON.$"
-
-gItemDescription_SafariBall: @ 83C20F3
- .string "A special BALL that\n"
- .string "is used only in the\n"
- .string "SAFARI ZONE.$"
-
-gItemDescription_NetBall: @ 83C2128
- .string "A BALL that works\n"
- .string "well on WATER- and\n"
- .string "BUG-type POKéMON.$"
-
-gItemDescription_DiveBall: @ 83C215F
- .string "A BALL that works\n"
- .string "better on POKéMON\n"
- .string "on the ocean floor.$"
-
-gItemDescription_NestBall: @ 83C2197
- .string "A BALL that works\n"
- .string "better on weaker\n"
- .string "POKéMON.$"
-
-gItemDescription_RepeatBall: @ 83C21C3
- .string "A BALL that works\n"
- .string "better on POKéMON\n"
- .string "caught before.$"
-
-gItemDescription_TimerBall: @ 83C21F6
- .string "More effective as\n"
- .string "more turns are\n"
- .string "taken in battle.$"
-
-gItemDescription_LuxuryBall: @ 83C2228
- .string "A cozy BALL that\n"
- .string "makes POKéMON\n"
- .string "more friendly.$"
-
-gItemDescription_PremierBall: @ 83C2256
- .string "A rare BALL made\n"
- .string "in commemoration\n"
- .string "of some event.$"
-
-gItemDescription_Potion: @ 83C2287
- .string "Restores the HP of\n"
- .string "a POKéMON by\n"
- .string "20 points.$"
-
-gItemDescription_Antidote: @ 83C22B2
- .string "Heals a poisoned\n"
- .string "POKéMON.$"
-
-gItemDescription_BurnHeal: @ 83C22CC
- .string "Heals POKéMON\n"
- .string "of a burn.$"
-
-gItemDescription_IceHeal: @ 83C22E5
- .string "Defrosts a frozen\n"
- .string "POKéMON.$"
-
-gItemDescription_Awakening: @ 83C2300
- .string "Awakens a sleeping\n"
- .string "POKéMON.$"
-
-gItemDescription_ParalyzeHeal: @ 83C231C
- .string "Heals a paralyzed\n"
- .string "POKéMON.$"
-
-gItemDescription_FullRestore: @ 83C2337
- .string "Fully restores the\n"
- .string "HP and status of a\n"
- .string "POKéMON.$"
-
-gItemDescription_MaxPotion: @ 83C2366
- .string "Fully restores the\n"
- .string "HP of a POKéMON.$"
-
-gItemDescription_HyperPotion: @ 83C238A
- .string "Restores the HP of\n"
- .string "a POKéMON by\n"
- .string "200 points.$"
-
-gItemDescription_SuperPotion: @ 83C23B6
- .string "Restores the HP of\n"
- .string "a POKéMON by\n"
- .string "50 points.$"
-
-gItemDescription_FullHeal: @ 83C23E1
- .string "Heals all the status\n"
- .string "problems of one\n"
- .string "POKéMON.$"
-
-gItemDescription_Revive: @ 83C240F
- .string "Revives a fainted\n"
- .string "POKéMON with half\n"
- .string "its HP.$"
-
-gItemDescription_MaxRevive: @ 83C243B
- .string "Revives a fainted\n"
- .string "POKéMON with all\n"
- .string "its HP.$"
-
-gItemDescription_FreshWater: @ 83C2466
- .string "A mineral water\n"
- .string "that restores HP\n"
- .string "by 50 points.$"
-
-gItemDescription_SodaPop: @ 83C2495
- .string "A fizzy soda drink\n"
- .string "that restores HP\n"
- .string "by 60 points.$"
-
-gItemDescription_Lemonade: @ 83C24C7
- .string "A very sweet drink\n"
- .string "that restores HP\n"
- .string "by 80 points.$"
-
-gItemDescription_MoomooMilk: @ 83C24F9
- .string "A nutritious milk\n"
- .string "that restores HP\n"
- .string "by 100 points.$"
-
-gItemDescription_EnergyPowder: @ 83C252B
- .string "A bitter powder\n"
- .string "that restores HP\n"
- .string "by 50 points.$"
-
-gItemDescription_EnergyRoot: @ 83C255A
- .string "A bitter root\n"
- .string "that restores HP\n"
- .string "by 200 points.$"
-
-gItemDescription_HealPowder: @ 83C2588
- .string "A bitter powder\n"
- .string "that heals all\n"
- .string "status problems.$"
-
-gItemDescription_RevivalHerb: @ 83C25B8
- .string "A very bitter herb\n"
- .string "that revives a\n"
- .string "fainted POKéMON.$"
-
-gItemDescription_Ether: @ 83C25EB
- .string "Restores the PP\n"
- .string "of a selected move\n"
- .string "by 10.$"
-
-gItemDescription_MaxEther: @ 83C2615
- .string "Fully restores the\n"
- .string "PP of a selected\n"
- .string "move.$"
-
-gItemDescription_Elixir: @ 83C263F
- .string "Restores the PP\n"
- .string "of all moves by 10.$"
-
-gItemDescription_MaxElixir: @ 83C2663
- .string "Fully restores the\n"
- .string "PP of a POKéMON’s\n"
- .string "moves.$"
-
-gItemDescription_LavaCookie: @ 83C268F
- .string "A local specialty\n"
- .string "that heals all\n"
- .string "status problems.$"
-
-gItemDescription_BlueFlute: @ 83C26C1
- .string "A glass flute that\n"
- .string "awakens sleeping\n"
- .string "POKéMON.$"
-
-gItemDescription_YellowFlute: @ 83C26EE
- .string "A glass flute that\n"
- .string "snaps POKéMON\n"
- .string "out of confusion.$"
-
-gItemDescription_RedFlute: @ 83C2721
- .string "A glass flute that\n"
- .string "snaps POKéMON\n"
- .string "out of attraction.$"
-
-gItemDescription_BlackFlute: @ 83C2755
- .string "A glass flute that\n"
- .string "keeps away wild\n"
- .string "POKéMON.$"
-
-gItemDescription_WhiteFlute: @ 83C2781
- .string "A glass flute that\n"
- .string "lures wild POKéMON.$"
-
-gItemDescription_BerryJuice: @ 83C27A8
- .string "A 100% pure juice\n"
- .string "that restores HP\n"
- .string "by 20 points.$"
-
-gItemDescription_SacredAsh: @ 83C27D9
- .string "Fully revives and\n"
- .string "restores all\n"
- .string "fainted POKéMON.$"
-
-gItemDescription_ShoalSalt: @ 83C2809
- .string "Salt obtained from\n"
- .string "deep inside the\n"
- .string "SHOAL CAVE.$"
-
-gItemDescription_ShoalShell: @ 83C2838
- .string "A seashell found\n"
- .string "deep inside the\n"
- .string "SHOAL CAVE.$"
-
-gItemDescription_RedShard: @ 83C2865
- .string "A shard from an\n"
- .string "ancient item.\n"
- .string "Can be sold cheaply.$"
-
-gItemDescription_BlueShard: @ 83C2898
- .string "A shard from an\n"
- .string "ancient item.\n"
- .string "Can be sold cheaply.$"
-
-gItemDescription_YellowShard: @ 83C28CB
- .string "A shard from an\n"
- .string "ancient item.\n"
- .string "Can be sold cheaply.$"
-
-gItemDescription_GreenShard: @ 83C28FE
- .string "A shard from an\n"
- .string "ancient item.\n"
- .string "Can be sold cheaply.$"
-
-gItemDescription_HPUp: @ 83C2931
- .string "Raises the HP of\n"
- .string "one POKéMON.$"
-
-gItemDescription_Protein: @ 83C294F
- .string "Raises the stat\n"
- .string "ATTACK of one\n"
- .string "POKéMON.$"
-
-gItemDescription_Iron: @ 83C2976
- .string "Raises the stat\n"
- .string "DEFENSE of one\n"
- .string "POKéMON.$"
-
-gItemDescription_Carbos: @ 83C299E
- .string "Raises the stat\n"
- .string "SPEED of one\n"
- .string "POKéMON.$"
-
-gItemDescription_Calcium: @ 83C29C4
- .string "Raises the stat\n"
- .string "SP. ATK of one\n"
- .string "POKéMON.$"
-
-gItemDescription_RareCandy: @ 83C29EC
- .string "Raises the level\n"
- .string "of a POKéMON by\n"
- .string "one.$"
-
-gItemDescription_PPUp: @ 83C2A12
- .string "Raises the maximum\n"
- .string "PP of a selected\n"
- .string "move.$"
-
-gItemDescription_Zinc: @ 83C2A3C
- .string "Raises the stat\n"
- .string "SP. DEF of one\n"
- .string "POKéMON.$"
-
-gItemDescription_PPMax: @ 83C2A64
- .string "Raises the PP of a\n"
- .string "move to its maximum\n"
- .string "points.$"
-
-gItemDescription_GuardSpec: @ 83C2A93
- .string "Prevents stat\n"
- .string "reduction when\n"
- .string "used in battle.$"
-
-gItemDescription_DireHit: @ 83C2AC0
- .string "Raises the\n"
- .string "critical-hit ratio\n"
- .string "during one battle.$"
-
-gItemDescription_XAttack: @ 83C2AF1
- .string "Raises the stat\n"
- .string "ATTACK during one\n"
- .string "battle.$"
-
-gItemDescription_XDefend: @ 83C2B1B
- .string "Raises the stat\n"
- .string "DEFENSE during one\n"
- .string "battle.$"
-
-gItemDescription_XSpeed: @ 83C2B46
- .string "Raises the stat\n"
- .string "SPEED during one\n"
- .string "battle.$"
-
-gItemDescription_XAccuracy: @ 83C2B6F
- .string "Raises accuracy\n"
- .string "of attack moves\n"
- .string "during one battle.$"
-
-gItemDescription_XSpecial: @ 83C2BA2
- .string "Raises the stat\n"
- .string "SP. ATK during one\n"
- .string "battle.$"
-
-gItemDescription_PokeDoll: @ 83C2BCD
- .string "Use to flee from\n"
- .string "any battle with\n"
- .string "a wild POKéMON.$"
-
-gItemDescription_FluffyTail: @ 83C2BFE
- .string "Use to flee from\n"
- .string "any battle with\n"
- .string "a wild POKéMON.$"
-
-gItemDescription_SuperRepel: @ 83C2C2F
- .string "Repels weak wild\n"
- .string "POKéMON for 200\n"
- .string "steps.$"
-
-gItemDescription_MaxRepel: @ 83C2C57
- .string "Repels weak wild\n"
- .string "POKéMON for 250\n"
- .string "steps.$"
-
-gItemDescription_EscapeRope: @ 83C2C7F
- .string "Use to escape\n"
- .string "instantly from a\n"
- .string "cave or a dungeon.$"
-
-gItemDescription_Repel: @ 83C2CB1
- .string "Repels weak wild\n"
- .string "POKéMON for 100\n"
- .string "steps.$"
-
-gItemDescription_SunStone: @ 83C2CD9
- .string "Makes certain\n"
- .string "species of POKéMON\n"
- .string "evolve.$"
-
-gItemDescription_MoonStone: @ 83C2D02
- .string "Makes certain\n"
- .string "species of POKéMON\n"
- .string "evolve.$"
-
-gItemDescription_FireStone: @ 83C2D2B
- .string "Makes certain\n"
- .string "species of POKéMON\n"
- .string "evolve.$"
-
-gItemDescription_ThunderStone: @ 83C2D54
- .string "Makes certain\n"
- .string "species of POKéMON\n"
- .string "evolve.$"
-
-gItemDescription_WaterStone: @ 83C2D7D
- .string "Makes certain\n"
- .string "species of POKéMON\n"
- .string "evolve.$"
-
-gItemDescription_LeafStone: @ 83C2DA6
- .string "Makes certain\n"
- .string "species of POKéMON\n"
- .string "evolve.$"
-
-gItemDescription_TinyMushroom: @ 83C2DCF
- .string "A plain, ordinary\n"
- .string "mushroom.\n"
- .string "Can be sold cheaply.$"
-
-gItemDescription_BigMushroom: @ 83C2E00
- .string "A rare mushroom\n"
- .string "that would sell at a\n"
- .string "high price.$"
-
-gItemDescription_Pearl: @ 83C2E31
- .string "A pretty pearl.\n"
- .string "Can be sold cheaply.$"
-
-gItemDescription_BigPearl: @ 83C2E56
- .string "A lovely large pearl\n"
- .string "that would sell at a\n"
- .string "high price.$"
-
-gItemDescription_Stardust: @ 83C2E8C
- .string "Beautiful red sand.\n"
- .string "Can be sold at a\n"
- .string "high price.$"
-
-gItemDescription_StarPiece: @ 83C2EBD
- .string "A red gem shard.\n"
- .string "It would sell for a\n"
- .string "very high price.$"
-
-gItemDescription_Nugget: @ 83C2EF3
- .string "A nugget of pure\n"
- .string "gold. Can be sold at\n"
- .string "a high price.$"
-
-gItemDescription_HeartScale: @ 83C2F27
- .string "A lovely scale.\n"
- .string "It is coveted by\n"
- .string "collectors.$"
-
-gItemDescription_OrangeMail: @ 83C2F54
- .string "A ZIGZAGOON-print\n"
- .string "MAIL to be held by\n"
- .string "a POKéMON.$"
-
-gItemDescription_HarborMail: @ 83C2F84
- .string "A WINGULL-print\n"
- .string "MAIL to be held by\n"
- .string "a POKéMON.$"
-
-gItemDescription_GlitterMail: @ 83C2FB2
- .string "A PIKACHU-print\n"
- .string "MAIL to be held by\n"
- .string "a POKéMON.$"
-
-gItemDescription_MechMail: @ 83C2FE0
- .string "A MAGNEMITE-print\n"
- .string "MAIL to be held by\n"
- .string "a POKéMON.$"
-
-gItemDescription_WoodMail: @ 83C3010
- .string "A SLAKOTH-print\n"
- .string "MAIL to be held by\n"
- .string "a POKéMON.$"
-
-gItemDescription_WaveMail: @ 83C303E
- .string "A WAILMER-print\n"
- .string "MAIL to be held by\n"
- .string "a POKéMON.$"
-
-gItemDescription_BeadMail: @ 83C306C
- .string "MAIL featuring a\n"
- .string "sketch of the\n"
- .string "holding POKéMON.$"
-
-gItemDescription_ShadowMail: @ 83C309C
- .string "A DUSKULL-print\n"
- .string "MAIL to be held by\n"
- .string "a POKéMON.$"
-
-gItemDescription_TropicMail: @ 83C30CA
- .string "A BELLOSSOM-print\n"
- .string "MAIL to be held by\n"
- .string "a POKéMON.$"
-
-gItemDescription_DreamMail: @ 83C30FA
- .string "MAIL featuring a\n"
- .string "sketch of the\n"
- .string "holding POKéMON.$"
-
-gItemDescription_FabMail: @ 83C312A
- .string "A gorgeous-print\n"
- .string "MAIL to be held\n"
- .string "by a POKéMON.$"
-
-gItemDescription_RetroMail: @ 83C3159
- .string "MAIL featuring the\n"
- .string "drawings of three\n"
- .string "POKéMON.$"
-
-gItemDescription_CheriBerry: @ 83C3187
- .string "A hold item that\n"
- .string "heals paralysis\n"
- .string "in battle.$"
-
-gItemDescription_ChestoBerry: @ 83C31B3
- .string "A hold item that\n"
- .string "awakens POKéMON\n"
- .string "in battle.$"
-
-gItemDescription_PechaBerry: @ 83C31DF
- .string "A hold item that\n"
- .string "heals poisoning\n"
- .string "in battle.$"
-
-gItemDescription_RawstBerry: @ 83C320B
- .string "A hold item that\n"
- .string "heals a burn in\n"
- .string "battle.$"
-
-gItemDescription_AspearBerry: @ 83C3234
- .string "A hold item that\n"
- .string "defrosts POKéMON\n"
- .string "in battle.$"
-
-gItemDescription_LeppaBerry: @ 83C3261
- .string "A hold item that\n"
- .string "restores 10 PP in\n"
- .string "battle.$"
-
-gItemDescription_OranBerry: @ 83C328C
- .string "A hold item that\n"
- .string "restores 10 HP in\n"
- .string "battle.$"
-
-gItemDescription_PersimBerry: @ 83C32B7
- .string "A hold item that\n"
- .string "heals confusion\n"
- .string "in battle.$"
-
-gItemDescription_LumBerry: @ 83C32E3
- .string "A hold item that\n"
- .string "heals status in\n"
- .string "battle.$"
-
-gItemDescription_SitrusBerry: @ 83C330C
- .string "A hold item that\n"
- .string "restores 30 HP in\n"
- .string "battle.$"
-
-gItemDescription_FigyBerry: @ 83C3337
- .string "A hold item that\n"
- .string "restores HP but\n"
- .string "may confuse.$"
-
-gItemDescription_WikiBerry: @ 83C3365
- .string "A hold item that\n"
- .string "restores HP but\n"
- .string "may confuse.$"
-
-gItemDescription_MagoBerry: @ 83C3393
- .string "A hold item that\n"
- .string "restores HP but\n"
- .string "may confuse.$"
-
-gItemDescription_AguavBerry: @ 83C33C1
- .string "A hold item that\n"
- .string "restores HP but\n"
- .string "may confuse.$"
-
-gItemDescription_IapapaBerry: @ 83C33EF
- .string "A hold item that\n"
- .string "restores HP but\n"
- .string "may confuse.$"
-
-gItemDescription_RazzBerry: @ 83C341D
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow RAZZ.$"
-
-gItemDescription_BlukBerry: @ 83C3451
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow BLUK.$"
-
-gItemDescription_NanabBerry: @ 83C3485
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow NANAB.$"
-
-gItemDescription_WepearBerry: @ 83C34BA
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow WEPEAR.$"
-
-gItemDescription_PinapBerry: @ 83C34F0
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow PINAP.$"
-
-gItemDescription_PomegBerry: @ 83C3525
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow POMEG.$"
-
-gItemDescription_KelpsyBerry: @ 83C355A
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow KELPSY.$"
-
-gItemDescription_QualotBerry: @ 83C3590
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow QUALOT.$"
-
-gItemDescription_HondewBerry: @ 83C35C6
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow HONDEW.$"
-
-gItemDescription_GrepaBerry: @ 83C35FC
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow GREPA.$"
-
-gItemDescription_TamatoBerry: @ 83C3631
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow TAMATO.$"
-
-gItemDescription_CornnBerry: @ 83C3667
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow CORNN.$"
-
-gItemDescription_MagostBerry: @ 83C369C
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow MAGOST.$"
-
-gItemDescription_RabutaBerry: @ 83C36D2
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow RABUTA.$"
-
-gItemDescription_NomelBerry: @ 83C3708
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow NOMEL.$"
-
-gItemDescription_SpelonBerry: @ 83C373D
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow SPELON.$"
-
-gItemDescription_PamtreBerry: @ 83C3773
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow PAMTRE.$"
-
-gItemDescription_WatmelBerry: @ 83C37A9
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow WATMEL.$"
-
-gItemDescription_DurinBerry: @ 83C37DF
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow DURIN.$"
-
-gItemDescription_BelueBerry: @ 83C3814
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow BELUE.$"
-
-gItemDescription_LiechiBerry: @ 83C3849
- .string "A hold item that\n"
- .string "raises ATTACK in\n"
- .string "a pinch.$"
-
-gItemDescription_GanlonBerry: @ 83C3874
- .string "A hold item that\n"
- .string "raises DEFENSE in\n"
- .string "a pinch.$"
-
-gItemDescription_SalacBerry: @ 83C38A0
- .string "A hold item that\n"
- .string "raises SPEED in\n"
- .string "a pinch.$"
-
-gItemDescription_PetayaBerry: @ 83C38CA
- .string "A hold item that\n"
- .string "raises SP. ATK in\n"
- .string "a pinch.$"
-
-gItemDescription_ApicotBerry: @ 83C38F6
- .string "A hold item that\n"
- .string "raises SP. DEF in\n"
- .string "a pinch.$"
-
-gItemDescription_LansatBerry: @ 83C3922
- .string "A hold item that\n"
- .string "ups the critical-\n"
- .string "hit rate in a pinch.$"
-
-gItemDescription_StarfBerry: @ 83C395A
- .string "A hold item that\n"
- .string "sharply boosts a\n"
- .string "stat in a pinch.$"
-
-gItemDescription_EnigmaBerry: @ 83C398D
- .string "{POKEBLOCK} ingredient.\n"
- .string "Plant in loamy soil\n"
- .string "to grow a mystery.$"
-
-gItemDescription_BrightPowder: @ 83C39C6
- .string "A hold item that\n"
- .string "casts a glare to\n"
- .string "reduce accuracy.$"
-
-gItemDescription_WhiteHerb: @ 83C39F9
- .string "A hold item that\n"
- .string "restores any\n"
- .string "lowered stat.$"
-
-gItemDescription_MachoBrace: @ 83C3A25
- .string "A hold item that\n"
- .string "promotes growth,\n"
- .string "but reduces SPEED.$"
-
-gItemDescription_ExpShare: @ 83C3A5A
- .string "A hold item that\n"
- .string "gets EXP. points\n"
- .string "from battles.$"
-
-gItemDescription_QuickClaw: @ 83C3A8A
- .string "A hold item that\n"
- .string "occasionally allows\n"
- .string "the first strike.$"
-
-gItemDescription_SootheBell: @ 83C3AC1
- .string "A hold item that\n"
- .string "calms spirits and\n"
- .string "fosters friendship.$"
-
-gItemDescription_MentalHerb: @ 83C3AF8
- .string "A hold item that\n"
- .string "snaps POKéMON out\n"
- .string "of infatuation.$"
-
-gItemDescription_ChoiceBand: @ 83C3B2B
- .string "Raises a move’s\n"
- .string "power, but permits\n"
- .string "only that move.$"
-
-gItemDescription_KingsRock: @ 83C3B5E
- .string "A hold item that\n"
- .string "may cause flinching\n"
- .string "when the foe is hit.$"
-
-gItemDescription_SilverPowder: @ 83C3B98
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "BUG-type moves.$"
-
-gItemDescription_AmuletCoin: @ 83C3BCD
- .string "Doubles money in\n"
- .string "battle if the holder\n"
- .string "takes part.$"
-
-gItemDescription_CleanseTag: @ 83C3BFF
- .string "A hold item that\n"
- .string "helps repel wild\n"
- .string "POKéMON.$"
-
-gItemDescription_SoulDew: @ 83C3C2A
- .string "Hold item: Raises\n"
- .string "SP. ATK & SP. DEF\n"
- .string "of LATIOS & LATIAS.$"
-
-gItemDescription_DeepSeaTooth: @ 83C3C62
- .string "A hold item that\n"
- .string "raises the SP. ATK\n"
- .string "of CLAMPERL.$"
-
-gItemDescription_DeepSeaScale: @ 83C3C93
- .string "A hold item that\n"
- .string "raises the SP. DEF\n"
- .string "of CLAMPERL.$"
-
-gItemDescription_SmokeBall: @ 83C3CC4
- .string "A hold item that\n"
- .string "can be used to flee\n"
- .string "from a wild POKéMON.$"
-
-gItemDescription_Everstone: @ 83C3CFE
- .string "A wondrous stone\n"
- .string "& a hold item that\n"
- .string "prevents evolution.$"
-
-gItemDescription_FocusBand: @ 83C3D36
- .string "A hold item that\n"
- .string "occasionally\n"
- .string "prevents fainting.$"
-
-gItemDescription_LuckyEgg: @ 83C3D67
- .string "A hold item that\n"
- .string "boosts EXP. points\n"
- .string "earned in battle.$"
-
-gItemDescription_ScopeLens: @ 83C3D9D
- .string "A hold item that\n"
- .string "raises the critical-\n"
- .string "hit rate.$"
-
-gItemDescription_MetalCoat: @ 83C3DCD
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "STEEL-type moves.$"
-
-gItemDescription_Leftovers: @ 83C3E04
- .string "A hold item that\n"
- .string "gradually restores\n"
- .string "HP in battle.$"
-
-gItemDescription_DragonScale: @ 83C3E36
- .string "A strange scale\n"
- .string "held by DRAGON-\n"
- .string "type POKéMON.$"
-
-gItemDescription_LightBall: @ 83C3E64
- .string "A hold item that\n"
- .string "raises the SP. ATK\n"
- .string "of PIKACHU.$"
-
-gItemDescription_SoftSand: @ 83C3E94
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "GROUND-type moves.$"
-
-gItemDescription_HardStone: @ 83C3ECC
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "ROCK-type moves.$"
-
-gItemDescription_MiracleSeed: @ 83C3F02
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "GRASS-type moves.$"
-
-gItemDescription_BlackGlasses: @ 83C3F39
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "DARK-type moves.$"
-
-gItemDescription_BlackBelt: @ 83C3F6F
- .string "A hold item that\n"
- .string "boosts FIGHTING-\n"
- .string "type moves.$"
-
-gItemDescription_Magnet: @ 83C3F9D
- .string "A hold item that\n"
- .string "boosts ELECTRIC-\n"
- .string "type moves.$"
-
-gItemDescription_MysticWater: @ 83C3FCB
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "WATER-type moves.$"
-
-gItemDescription_SharpBeak: @ 83C4002
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "FLYING-type moves.$"
-
-gItemDescription_PoisonBarb: @ 83C403A
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "POISON-type moves.$"
-
-gItemDescription_NeverMeltIce: @ 83C4072
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "ICE-type moves.$"
-
-gItemDescription_SpellTag: @ 83C40A7
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "GHOST-type moves.$"
-
-gItemDescription_TwistedSpoon: @ 83C40DE
- .string "A hold item that\n"
- .string "boosts PSYCHIC-\n"
- .string "type moves.$"
-
-gItemDescription_Charcoal: @ 83C410B
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "FIRE-type moves.$"
-
-gItemDescription_DragonFang: @ 83C4141
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "DRAGON-type moves.$"
-
-gItemDescription_SilkScarf: @ 83C4179
- .string "A hold item that\n"
- .string "raises the power of\n"
- .string "NORMAL-type moves.$"
-
-gItemDescription_UpGrade: @ 83C41B1
- .string "A peculiar box made\n"
- .string "by SILPH CO.$"
-
-gItemDescription_ShellBell: @ 83C41D2
- .string "A hold item that\n"
- .string "restores HP upon\n"
- .string "striking the foe.$"
-
-gItemDescription_SeaIncense: @ 83C4206
- .string "A hold item that\n"
- .string "slightly boosts\n"
- .string "WATER-type moves.$"
-
-gItemDescription_LaxIncense: @ 83C4239
- .string "A hold item that\n"
- .string "slightly lowers the\n"
- .string "foe’s accuracy.$"
-
-gItemDescription_LuckyPunch: @ 83C426E
- .string "A hold item that\n"
- .string "raises CHANSEY’s\n"
- .string "critical-hit rate.$"
-
-gItemDescription_MetalPowder: @ 83C42A3
- .string "A hold item that\n"
- .string "raises DEFENSE.$"
-
-gItemDescription_ThickClub: @ 83C42C4
- .string "A bone of some\n"
- .string "sort. It can be sold\n"
- .string "cheaply.$"
-
-gItemDescription_Stick: @ 83C42F1
- .string "A stick of leek.\n"
- .string "It can be sold\n"
- .string "cheaply.$"
-
-gItemDescription_RedScarf: @ 83C431A
- .string "A hold item that\n"
- .string "raises COOL in\n"
- .string "CONTESTS.$"
-
-gItemDescription_BlueScarf: @ 83C4344
- .string "A hold item that\n"
- .string "raises BEAUTY in\n"
- .string "CONTESTS.$"
-
-gItemDescription_PinkScarf: @ 83C4370
- .string "A hold item that\n"
- .string "raises CUTE in\n"
- .string "CONTESTS.$"
-
-gItemDescription_GreenScarf: @ 83C439A
- .string "A hold item that\n"
- .string "raises SMART in\n"
- .string "CONTESTS.$"
-
-gItemDescription_YellowScarf: @ 83C43C5
- .string "A hold item that\n"
- .string "raises TOUGH in\n"
- .string "CONTESTS.$"
-
-gItemDescription_MachBike: @ 83C43F0
- .string "A folding bicycle\n"
- .string "that more than\n"
- .string "doubles foot speed.$"
-
-gItemDescription_CoinCase: @ 83C4425
- .string "A case that holds\n"
- .string "up to 9,999 COINS.$"
-
-gItemDescription_Itemfinder: @ 83C444A
- .string "A device that\n"
- .string "signals an invisible\n"
- .string "item by sound.$"
-
-gItemDescription_OldRod: @ 83C447C
- .string "Use by any body of\n"
- .string "water to fish for\n"
- .string "wild POKéMON.$"
-
-gItemDescription_GoodRod: @ 83C44AF
- .string "A decent fishing\n"
- .string "rod for catching\n"
- .string "wild POKéMON.$"
-
-gItemDescription_SuperRod: @ 83C44DF
- .string "The best fishing\n"
- .string "rod for catching\n"
- .string "wild POKéMON.$"
-
-gItemDescription_SSTicket: @ 83C450F
- .string "The ticket required\n"
- .string "for sailing on a\n"
- .string "ferry.$"
-
-gItemDescription_ContestPass: @ 83C453B
- .string "The pass required\n"
- .string "for entering\n"
- .string "POKéMON CONTESTS.$"
-
-gItemDescription_WailmerPail: @ 83C456C
- .string "A tool used for\n"
- .string "watering BERRIES\n"
- .string "and plants.$"
-
-gItemDescription_DevonGoods: @ 83C4599
- .string "A package that\n"
- .string "contains DEVON’s\n"
- .string "machine parts.$"
-
-gItemDescription_SootSack: @ 83C45C8
- .string "A sack used to\n"
- .string "gather and hold\n"
- .string "volcanic ash.$"
-
-gItemDescription_BasementKey: @ 83C45F5
- .string "The key for NEW\n"
- .string "MAUVILLE beneath\n"
- .string "MAUVILLE CITY.$"
-
-gItemDescription_AcroBike: @ 83C4625
- .string "A folding bicycle\n"
- .string "capable of jumps\n"
- .string "and wheelies.$"
-
-gItemDescription_PokeblockCase: @ 83C4656
- .string "A case for holding\n"
- .string "{POKEBLOCK}S made with\n"
- .string "a BERRY BLENDER.$"
-
-gItemDescription_Letter: @ 83C468B
- .string "A letter to STEVEN\n"
- .string "from the PRESIDENT\n"
- .string "of the DEVON CORP.$"
-
-gItemDescription_EonTicket: @ 83C46C4
- .string "The ticket for a\n"
- .string "ferry to a distant\n"
- .string "southern island.$"
-
-gItemDescription_RedOrb: @ 83C46F9
- .string "A red, glowing orb\n"
- .string "said to contain an\n"
- .string "ancient power.$"
-
-gItemDescription_BlueOrb: @ 83C472E
- .string "A blue, glowing orb\n"
- .string "said to contain an\n"
- .string "ancient power.$"
-
-gItemDescription_Scanner: @ 83C4764
- .string "A device found\n"
- .string "inside the\n"
- .string "ABANDONED SHIP.$"
-
-gItemDescription_GoGoggles: @ 83C478E
- .string "Nifty goggles that\n"
- .string "protect eyes from\n"
- .string "desert sandstorms.$"
-
-gItemDescription_Meteorite: @ 83C47C6
- .string "A meteorite found\n"
- .string "at METEOR FALLS.$"
-
-gItemDescription_Room1Key: @ 83C47E9
- .string "A key that opens a\n"
- .string "door inside the\n"
- .string "ABANDONED SHIP.$"
-
-gItemDescription_Room2Key: @ 83C481C
- .string "A key that opens a\n"
- .string "door inside the\n"
- .string "ABANDONED SHIP.$"
-
-gItemDescription_Room4Key: @ 83C484F
- .string "A key that opens a\n"
- .string "door inside the\n"
- .string "ABANDONED SHIP.$"
-
-gItemDescription_Room6Key: @ 83C4882
- .string "A key that opens a\n"
- .string "door inside the\n"
- .string "ABANDONED SHIP.$"
-
-gItemDescription_StorageKey: @ 83C48B5
- .string "The key to the\n"
- .string "storage inside the\n"
- .string "ABANDONED SHIP.$"
-
-gItemDescription_RootFossil: @ 83C48E7
- .string "A fossil of an\n"
- .string "ancient, seafloor-\n"
- .string "dwelling POKéMON.$"
-
-gItemDescription_ClawFossil: @ 83C491B
- .string "A fossil of an\n"
- .string "ancient, seafloor-\n"
- .string "dwelling POKéMON.$"
-
-gItemDescription_DevonScope: @ 83C494F
- .string "A device by DEVON\n"
- .string "that signals any\n"
- .string "unseeable POKéMON.$"
-
-gItemDescription_TM01: @ 83C4985
- .string "Powerful, but makes\n"
- .string "the user flinch if\n"
- .string "hit by the foe.$"
-
-gItemDescription_TM02: @ 83C49BC
- .string "Hooks and slashes\n"
- .string "the foe with long,\n"
- .string "sharp claws.$"
-
-gItemDescription_TM03: @ 83C49EE
- .string "Generates an\n"
- .string "ultrasonic wave\n"
- .string "that may confuse.$"
-
-gItemDescription_TM04: @ 83C4A1D
- .string "Raises SP. ATK and\n"
- .string "SP. DEF by focusing\n"
- .string "the mind.$"
-
-gItemDescription_TM05: @ 83C4A4E
- .string "A savage roar that\n"
- .string "makes the foe flee \n"
- .string "to end the battle.$"
-
-gItemDescription_TM06: @ 83C4A88
- .string "Poisons the foe\n"
- .string "with a toxin that\n"
- .string "gradually worsens.$"
-
-gItemDescription_TM07: @ 83C4ABD
- .string "Summons a hailstorm\n"
- .string "that hurts all\n"
- .string "types except ICE.$"
-
-gItemDescription_TM08: @ 83C4AF2
- .string "Bulks up the body\n"
- .string "to boost both\n"
- .string "ATTACK & DEFENSE.$"
-
-gItemDescription_TM09: @ 83C4B24
- .string "Shoots 2 to 5 seeds\n"
- .string "in a row to strike\n"
- .string "the foe.$"
-
-gItemDescription_TM10: @ 83C4B54
- .string "The attack power\n"
- .string "varies among\n"
- .string "different POKéMON.$"
-
-gItemDescription_TM11: @ 83C4B85
- .string "Raises the power of\n"
- .string "FIRE-type moves\n"
- .string "for 5 turns.$"
-
-gItemDescription_TM12: @ 83C4BB6
- .string "Enrages the foe so\n"
- .string "it can only use\n"
- .string "attack moves.$"
-
-gItemDescription_TM13: @ 83C4BE7
- .string "Fires an icy cold\n"
- .string "beam that may\n"
- .string "freeze the foe.$"
-
-gItemDescription_TM14: @ 83C4C17
- .string "A vicious snow-and-\n"
- .string "wind attack that\n"
- .string "may freeze the foe.$"
-
-gItemDescription_TM15: @ 83C4C50
- .string "Powerful, but needs\n"
- .string "recharging the\n"
- .string "next turn.$"
-
-gItemDescription_TM16: @ 83C4C7E
- .string "Creates a wall of\n"
- .string "light that lowers\n"
- .string "SP. ATK damage.$"
-
-gItemDescription_TM17: @ 83C4CB2
- .string "Negates all damage,\n"
- .string "but may fail if used\n"
- .string "in succession.$"
-
-gItemDescription_TM18: @ 83C4CEA
- .string "Raises the power of\n"
- .string "WATER-type moves\n"
- .string "for 5 turns.$"
-
-gItemDescription_TM19: @ 83C4D1C
- .string "Recovers half the\n"
- .string "HP of the damage \n"
- .string "this move inflicts.$"
-
-gItemDescription_TM20: @ 83C4D54
- .string "Prevents status\n"
- .string "abnormality with a\n"
- .string "mystical power.$"
-
-gItemDescription_TM21: @ 83C4D87
- .string "The less the user\n"
- .string "likes you, the more\n"
- .string "powerful this move.$"
-
-gItemDescription_TM22: @ 83C4DC1
- .string "Absorbs sunlight in\n"
- .string "the 1st turn, then\n"
- .string "attacks next turn.$"
-
-gItemDescription_TM23: @ 83C4DFB
- .string "Slams the foe with\n"
- .string "a hard tail. It may\n"
- .string "lower DEFENSE.$"
-
-gItemDescription_TM24: @ 83C4E31
- .string "A powerful electric\n"
- .string "attack that may\n"
- .string "cause paralysis.$"
-
-gItemDescription_TM25: @ 83C4E66
- .string "Strikes the foe\n"
- .string "with a thunderbolt.\n"
- .string "It may paralyze.$"
-
-gItemDescription_TM26: @ 83C4E9B
- .string "Causes a quake\n"
- .string "that has no effect\n"
- .string "on flying foes.$"
-
-gItemDescription_TM27: @ 83C4ECD
- .string "The more the user\n"
- .string "likes you, the more\n"
- .string "powerful this move.$"
-
-gItemDescription_TM28: @ 83C4F07
- .string "Digs underground\n"
- .string "the 1st turn, then\n"
- .string "strikes next turn.$"
-
-gItemDescription_TM29: @ 83C4F3E
- .string "A powerful psychic\n"
- .string "attack that may\n"
- .string "lower SP. DEF.$"
-
-gItemDescription_TM30: @ 83C4F70
- .string "Hurls a dark lump\n"
- .string "at the foe. It may\n"
- .string "lower SP. DEF.$"
-
-gItemDescription_TM31: @ 83C4FA4
- .string "Destroys barriers\n"
- .string "like LIGHT SCREEN\n"
- .string "and causes damage.$"
-
-gItemDescription_TM32: @ 83C4FDB
- .string "Creates illusory\n"
- .string "copies to enhance\n"
- .string "elusiveness.$"
-
-gItemDescription_TM33: @ 83C500B
- .string "Creates a wall of\n"
- .string "light that weakens\n"
- .string "physical attacks.$"
-
-gItemDescription_TM34: @ 83C5042
- .string "Zaps the foe with a\n"
- .string "jolt of electricity\n"
- .string "that never misses.$"
-
-gItemDescription_TM35: @ 83C507D
- .string "Looses a stream of\n"
- .string "fire that may burn\n"
- .string "the foe.$"
-
-gItemDescription_TM36: @ 83C50AC
- .string "Hurls sludge at the\n"
- .string "foe. It may poison\n"
- .string "the foe.$"
-
-gItemDescription_TM37: @ 83C50DC
- .string "Causes a sandstorm\n"
- .string "that hits the foe\n"
- .string "over several turns.$"
-
-gItemDescription_TM38: @ 83C5115
- .string "A powerful fire\n"
- .string "attack that may\n"
- .string "burn the foe.$"
-
-gItemDescription_TM39: @ 83C5143
- .string "Stops the foe from\n"
- .string "moving with rocks.\n"
- .string "May lower SPEED.$"
-
-gItemDescription_TM40: @ 83C517A
- .string "An extremely fast\n"
- .string "attack that can’t\n"
- .string "be avoided.$"
-
-gItemDescription_TM41: @ 83C51AA
- .string "Prevents the foe\n"
- .string "from using the same\n"
- .string "move in a row.$"
-
-gItemDescription_TM42: @ 83C51DE
- .string "Raises ATTACK when\n"
- .string "poisoned, burned,\n"
- .string "or paralyzed.$"
-
-gItemDescription_TM43: @ 83C5211
- .string "Adds an effect to\n"
- .string "attack depending\n"
- .string "on the location.$"
-
-gItemDescription_TM44: @ 83C5245
- .string "The user sleeps for\n"
- .string "2 turns to restore\n"
- .string "health and status.$"
-
-gItemDescription_TM45: @ 83C527F
- .string "Makes it tough to\n"
- .string "attack a foe of the\n"
- .string "opposite gender.$"
-
-gItemDescription_TM46: @ 83C52B6
- .string "While attacking,\n"
- .string "it may steal the\n"
- .string "foe’s held item.$"
-
-gItemDescription_TM47: @ 83C52E9
- .string "Spreads hard-edged\n"
- .string "wings and slams\n"
- .string "into the foe.$"
-
-gItemDescription_TM48: @ 83C531A
- .string "Switches abilities\n"
- .string "with the foe on the\n"
- .string "turn this is used.$"
-
-gItemDescription_TM49: @ 83C5354
- .string "Steals the effects\n"
- .string "of the move the foe\n"
- .string "is trying to use.$"
-
-gItemDescription_TM50: @ 83C538D
- .string "Enables full-power\n"
- .string "attack, but sharply\n"
- .string "lowers SP. ATK.$"
-
-gItemDescription_HM01: @ 83C53C4
- .string "Attacks the foe\n"
- .string "with sharp blades\n"
- .string "or claws.$"
-
-gItemDescription_HM02: @ 83C53F0
- .string "Flies up on the\n"
- .string "first turn, then\n"
- .string "attacks next turn.$"
-
-gItemDescription_HM03: @ 83C5424
- .string "Creates a huge\n"
- .string "wave, then crashes\n"
- .string "it down on the foe.$"
-
-gItemDescription_HM04: @ 83C545A
- .string "Builds enormous\n"
- .string "power, then slams\n"
- .string "the foe.$"
-
-gItemDescription_HM05: @ 83C5485
- .string "Looses a powerful\n"
- .string "blast of light that\n"
- .string "reduces accuracy.$"
-
-gItemDescription_HM06: @ 83C54BD
- .string "A rock-crushingly\n"
- .string "tough attack that\n"
- .string "may lower DEFENSE.$"
-
-gItemDescription_HM07: @ 83C54F4
- .string "Attacks the foe\n"
- .string "with enough power\n"
- .string "to climb waterfalls.$"
-
-gItemDescription_HM08: @ 83C552B
- .string "Dives underwater\n"
- .string "the 1st turn, then\n"
- .string "attacks next turn.$"
-
-gItemDescription_Dummy: @ 83C5562
- .string "$"
diff --git a/data/trader.s b/data/trader.s
deleted file mode 100644
index 5029338d2..000000000
--- a/data/trader.s
+++ /dev/null
@@ -1,17 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_083F62D8:: @ 83F62D8
- .4byte SecretBaseText_Tristan
- .4byte SecretBaseText_Philip
- .4byte SecretBaseText_Dennis
- .4byte SecretBaseText_Roberto
-
-gTraderDecorations:: @ 83F62E8
- .byte DECOR_DUSKULL_DOLL
- .byte DECOR_BALL_CUSHION
- .byte DECOR_TIRE
- .byte DECOR_PRETTY_FLOWERS
diff --git a/data/trainer_card.s b/data/trainer_card.s
deleted file mode 100644
index 75e0041dd..000000000
--- a/data/trainer_card.s
+++ /dev/null
@@ -1,62 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gBadgesTiles:: @ 83B5AB8
- .incbin "graphics/trainer_card/badges.4bpp"
-
-@ XXX: what is this?
- .align 2
- .4byte 0x2000000
-
- .align 2
-gUnknown_083B5EBC:: @ 83B5EBC
- .4byte sub_8093864
- .4byte sub_80938A8
- .4byte sub_80938CC
- .4byte sub_8093918
- .4byte sub_8093938
- .4byte sub_8093954
- .4byte sub_8093980
-
- .align 2
-gUnknown_083B5ED8:: @ 83B5ED8
- .4byte sub_8093AA0
- .4byte sub_8093AF0
- .4byte sub_8093C0C
- .4byte sub_8093C38
- .4byte sub_8093D50
-
- .align 2
-gUnknown_083B5EEC:: @ 83B5EEC
- .4byte gUnknown_08E8CAC0
- .4byte gUnknown_08E8D4C0
-
-gUnknown_083B5EF4:: @ 83B5EF4
- .string " : $"
-
- .align 2
-gUnknown_083B5EF8:: @ 83B5EF8
- .4byte gMenuTrainerCard0Star_Pal
- .4byte gMenuTrainerCard1Star_Pal
- .4byte gMenuTrainerCard2Star_Pal
- .4byte gMenuTrainerCard3Star_Pal
- .4byte gMenuTrainerCard4Star_Pal
-
-gUnknown_083B5F0C:: @ 83B5F0C
- .incbin "graphics/trainer_card/83B5F0C.gbapal"
-
- .align 2
-gBadgesPalette:: @ 83B5F2C
- .incbin "graphics/trainer_card/badges.gbapal"
-
-gUnknown_083B5F4C:: @ 83B5F4C
- .incbin "graphics/trainer_card/83B5F4C.gbapal"
-
-gUnknown_083B5F6C:: @ 83B5F6C
- .incbin "graphics/trainer_card/83B5F6C.gbapal"
-
-gUnknown_083B5F8C:: @ 83B5F8C
- .incbin "graphics/trainer_card/83B5F8C_map.bin"
diff --git a/data/util.s b/data/util.s
deleted file mode 100644
index 03c92a988..000000000
--- a/data/util.s
+++ /dev/null
@@ -1,70 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gBitTable:: @ 820872C
- .4byte 0x00000001
- .4byte 0x00000002
- .4byte 0x00000004
- .4byte 0x00000008
- .4byte 0x00000010
- .4byte 0x00000020
- .4byte 0x00000040
- .4byte 0x00000080
- .4byte 0x00000100
- .4byte 0x00000200
- .4byte 0x00000400
- .4byte 0x00000800
- .4byte 0x00001000
- .4byte 0x00002000
- .4byte 0x00004000
- .4byte 0x00008000
- .4byte 0x00010000
- .4byte 0x00020000
- .4byte 0x00040000
- .4byte 0x00080000
- .4byte 0x00100000
- .4byte 0x00200000
- .4byte 0x00400000
- .4byte 0x00800000
- .4byte 0x01000000
- .4byte 0x02000000
- .4byte 0x04000000
- .4byte 0x08000000
- .4byte 0x10000000
- .4byte 0x20000000
- .4byte 0x40000000
- .4byte 0x80000000
-
- .align 2
-gInvisibleSpriteTemplate:: @ 82087AC
- spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gSpriteDimensions:: @ 82087C4
- @ square
- .byte 1, 1
- .byte 2, 2
- .byte 4, 4
- .byte 8, 8
-
- @ horizontal rectangle
- .byte 2, 1
- .byte 4, 1
- .byte 4, 2
- .byte 8, 4
-
- @ vertical rectangle
- .byte 1, 2
- .byte 1, 4
- .byte 2, 4
- .byte 4, 8
-
-@ 82087DC
- .include "data/crc16_table.inc"
-
- .align 2
-gMiscBlank_Gfx:: @ 82089DC
- .incbin "graphics/interface/blank.4bpp"