diff options
| author | Scott Norton <PikalaxALT@gmail.com> | 2015-06-29 22:24:45 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-03 13:46:38 -0400 |
| commit | f74fd6903f90e30c3bf1dbde93153ddec62a450a (patch) | |
| tree | 3d90d694665388922af9a1137e962db30d95427b /maps | |
| parent | e2c2e20f93f43848542362a5deee677e88f9507d (diff) | |
- Renamed "Functiond283" to "GetPocketCapacity" and updated the pointers and constants to better reflect their hypothesized purposes.
- Using yenatch's version of the macro and constant handling, rewrote the tmhm bit array as a macro-defined environment.
Diffstat (limited to 'maps')
50 files changed, 65 insertions, 65 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index c4ed40efe..e60ada160 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -35,7 +35,7 @@ UnknownScript_0x18ec48: ; 0x18ec48 setevent EVENT_BEAT_BUG_CATCHER_JOSH writetext UnknownText_0x18ee2b keeptextopen - verbosegiveitem TM_49, 1 + verbosegiveitem TM_FURY_CUTTER, 1 iffalse UnknownScript_0x18ec71 setevent EVENT_GOT_TM49_FURY_CUTTER writetext UnknownText_0x18eefa diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index d5982cabd..55b9c0cda 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -63,9 +63,9 @@ UnknownScript_0x194e69: iftrue UnknownScript_0x194e94 writetext UnknownText_0x195196 keeptextopen - giveitem TM_24, $1 + giveitem TM_DRAGONBREATH, $1 iffalse UnknownScript_0x194e8e - itemtotext TM_24, $0 + itemtotext TM_DRAGONBREATH, $0 writetext UnknownText_0x1951bf playsound SFX_ITEM waitbutton diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index fade946df..a58687cb8 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -120,7 +120,7 @@ UnknownScript_0x18622a: ; 0x18622a ; 0x186231 ItemFragment_0x186231: ; 0x186231 - db TM_20, 1 + db TM_ENDURE, 1 ; 0x186233 BurnedTowerB1FBoulder: diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index bc0233cd9..b7addb7b2 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -36,10 +36,10 @@ UnknownScript_0x726fd: ; 0x726fd UnknownScript_0x72714: ; 0x72714 checkcoins 1500 if_equal $2, UnknownScript_0x72778 - itemtotext TM_32, $0 + itemtotext TM_DOUBLE_TEAM, $0 scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 - giveitem TM_32, $1 + giveitem TM_DOUBLE_TEAM, $1 iffalse UnknownScript_0x7277e takecoins 1500 jump UnknownScript_0x7276d @@ -48,10 +48,10 @@ UnknownScript_0x72714: ; 0x72714 UnknownScript_0x72730: ; 0x72730 checkcoins 3500 if_equal $2, UnknownScript_0x72778 - itemtotext TM_29, $0 + itemtotext TM_PSYCHIC, $0 scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 - giveitem TM_29, $1 + giveitem TM_PSYCHIC, $1 iffalse UnknownScript_0x7277e takecoins 3500 jump UnknownScript_0x7276d @@ -60,10 +60,10 @@ UnknownScript_0x72730: ; 0x72730 UnknownScript_0x7274c: ; 0x7274c checkcoins 7500 if_equal $2, UnknownScript_0x72778 - itemtotext TM_15, $0 + itemtotext TM_HYPER_BEAM, $0 scall UnknownScript_0x72768 iffalse UnknownScript_0x72784 - giveitem TM_15, $1 + giveitem TM_HYPER_BEAM, $1 iffalse UnknownScript_0x7277e takecoins 7500 jump UnknownScript_0x7276d diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 4d470343d..8439ecaf8 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -33,7 +33,7 @@ UnknownScript_0x72a9b: ; 0x72a9b iftrue UnknownScript_0x72aae writetext UnknownText_0x72cb0 keeptextopen - verbosegiveitem TM_19, 1 + verbosegiveitem TM_GIGA_DRAIN, 1 iffalse UnknownScript_0x72aae setevent EVENT_GOT_TM19_GIGA_DRAIN UnknownScript_0x72aae: ; 0x72aae diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 2553a7134..05b1f3e0e 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -24,7 +24,7 @@ PharmacistScript_0x71afd: ; 0x71afd UnknownScript_0x71b14: ; 0x71b14 writetext UnknownText_0x71ba3 keeptextopen - verbosegiveitem TM_03, 1 + verbosegiveitem TM_CURSE, 1 iffalse UnknownScript_0x71b25 setevent EVENT_GOT_TM03_CURSE UnknownScript_0x71b21: ; 0x71b21 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 4569dd5e4..e4aac515d 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -89,7 +89,7 @@ PokefanFScript_0x1a0084: UnknownScript_0x1a009c: writetext UnknownText_0x1a01e3 keeptextopen - verbosegiveitem HM_02, 1 + verbosegiveitem HM_FLY, 1 iffalse UnknownScript_0x1a00b1 setevent EVENT_GOT_HM02_FLY writetext UnknownText_0x1a021d diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 7128c0eed..93d4c58d2 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -50,7 +50,7 @@ UnknownScript_0x9d656: ; 0x9d656 setevent EVENT_BEAT_BLACKBELT_LUNG writetext UnknownText_0x9d84d keeptextopen - verbosegiveitem TM_01, 1 + verbosegiveitem TM_DYNAMICPUNCH, 1 iffalse UnknownScript_0x9d67f setevent EVENT_GOT_TM01_DYNAMICPUNCH writetext UnknownText_0x9d8da diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 830766e38..2bc616446 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -190,7 +190,7 @@ UnknownScript_0x994ff: ; 0x994ff UnknownScript_0x99505: ; 0x99505 writetext UnknownText_0x9991a keeptextopen - verbosegiveitem HM_03, 1 + verbosegiveitem HM_SURF, 1 setevent EVENT_GOT_HM03_SURF writetext UnknownText_0x9999b closetext diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index e4682818f..50def64e1 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -29,7 +29,7 @@ ItemFragment_0x18c73b: ; 0x18c73b ; 0x18c73d ItemFragment_0x18c73d: ; 0x18c73d - db TM_13, 1 + db TM_SNORE, 1 ; 0x18c73f UnknownText_0x18c73f: ; 0x18c73f diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 909b483d3..47b0e79a9 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -55,9 +55,9 @@ UnknownScript_0x18c8b8: ; 0x18c8b8 loadfont writetext UnknownText_0x18c9bf keeptextopen - giveitem TM_24, $1 + giveitem TM_DRAGONBREATH, $1 iffalse UnknownScript_0x18c8f4 - itemtotext TM_24, $0 + itemtotext TM_DRAGONBREATH, $0 writetext UnknownText_0x18c9fb playsound SFX_ITEM waitbutton diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 4029f9800..75b2cbe25 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -51,7 +51,7 @@ UnknownScript_0x99d8c: ; 0x99d8c setevent EVENT_BEAT_MEDIUM_GRACE writetext UnknownText_0x9a059 keeptextopen - verbosegiveitem TM_30, 1 + verbosegiveitem TM_SHADOW_BALL, 1 iffalse UnknownScript_0x99db5 setevent EVENT_GOT_TM30_SHADOW_BALL writetext UnknownText_0x9a0ec diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 334415eb1..555cba6ee 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -45,7 +45,7 @@ UnknownScript_0x195e02: ; 0x195e02 iftrue UnknownScript_0x195e15 writetext UnknownText_0x196002 keeptextopen - verbosegiveitem TM_06, 1 + verbosegiveitem TM_TOXIC, 1 iffalse UnknownScript_0x195e15 setevent EVENT_GOT_TM06_TOXIC UnknownScript_0x195e15: ; 0x195e15 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 934aef251..624586edc 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -70,7 +70,7 @@ ReceptionistScript_0x560ce: UnknownScript_0x560ee: writetext UnknownText_0x5615a keeptextopen - verbosegiveitem TM_27, 1 + verbosegiveitem TM_RETURN, 1 iffalse UnknownScript_0x56116 setflag $005b loadmovesprites @@ -85,7 +85,7 @@ UnknownScript_0x560fd: UnknownScript_0x56103: writetext UnknownText_0x561d8 keeptextopen - verbosegiveitem TM_21, 1 + verbosegiveitem TM_FRUSTRATION, 1 iffalse UnknownScript_0x56116 setflag $005b loadmovesprites diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 32b03d65e..109bbf6bf 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -67,10 +67,10 @@ UnknownScript_0x56c36: ; 056c36 UnknownScript_0x56c4d: ; 0x56c4d checkcoins 5500 if_equal $2, UnknownScript_0x56cb1 - itemtotext TM_25, $0 + itemtotext TM_THUNDER, $0 scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd - giveitem TM_25, $1 + giveitem TM_THUNDER, $1 iffalse UnknownScript_0x56cb7 takecoins 5500 jump UnknownScript_0x56ca6 @@ -79,10 +79,10 @@ UnknownScript_0x56c4d: ; 0x56c4d UnknownScript_0x56c69: ; 0x56c69 checkcoins 5500 if_equal $2, UnknownScript_0x56cb1 - itemtotext TM_14, $0 + itemtotext TM_BLIZZARD, $0 scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd - giveitem TM_14, $1 + giveitem TM_BLIZZARD, $1 iffalse UnknownScript_0x56cb7 takecoins 5500 jump UnknownScript_0x56ca6 @@ -91,10 +91,10 @@ UnknownScript_0x56c69: ; 0x56c69 UnknownScript_0x56c85: ; 0x56c85 checkcoins 5500 if_equal $2, UnknownScript_0x56cb1 - itemtotext TM_38, $0 + itemtotext TM_FIRE_BLAST, $0 scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd - giveitem TM_38, $1 + giveitem TM_FIRE_BLAST, $1 iffalse UnknownScript_0x56cb7 takecoins 5500 jump UnknownScript_0x56ca6 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index b9fb5ae36..98a1632b3 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -64,7 +64,7 @@ UnknownScript_0x54044: ; 0x54044 UnknownScript_0x54064: ; 0x54064 writetext UnknownText_0x5428b keeptextopen - verbosegiveitem TM_45, 1 + verbosegiveitem TM_ATTRACT, 1 iffalse UnknownScript_0x5407b setevent EVENT_GOT_TM45_ATTRACT writetext UnknownText_0x54302 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 7a320793c..dead964c8 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -7,7 +7,7 @@ IcePath1F_MapScriptHeader: ; 0x7e470 ; 0x7e472 ItemFragment_0x7e472: ; 0x7e472 - db HM_07, 1 + db HM_WATERFALL, 1 ; 0x7e474 ItemFragment_0x7e474: ; 0x7e474 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 53171f4c5..b0b27da73 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -7,7 +7,7 @@ IcePathB2FBlackthornSide_MapScriptHeader: ; 0x7e644 ; 0x7e646 ItemFragment_0x7e646: ; 0x7e646 - db TM_44, 1 + db TM_REST, 1 ; 0x7e648 MapIcePathB2FBlackthornSideSignpostItem0: ; 0x7e648 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 95631b273..d68fe9952 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -377,7 +377,7 @@ BlackBeltScript_0x6edae: ; 0x6edae iftrue UnknownScript_0x6edd8 writetext UnknownText_0x6f099 keeptextopen - verbosegiveitem HM_01, 1 + verbosegiveitem HM_CUT, 1 setevent EVENT_GOT_HM01_CUT writetext UnknownText_0x6f141 closetext @@ -405,7 +405,7 @@ RockerScript_0x6edde: ; 0x6edde iftrue UnknownScript_0x6edf3 writetext UnknownText_0x6f21b keeptextopen - verbosegiveitem TM_02, 1 + verbosegiveitem TM_HEADBUTT, 1 iffalse UnknownScript_0x6edf7 setevent EVENT_GOT_TM02_HEADBUTT UnknownScript_0x6edf3: ; 0x6edf3 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 5b3b10aed..db6af8414 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -284,7 +284,7 @@ ItemFragment_0x70148: db ELIXER, 1 ItemFragment_0x7014a: - db TM_43, 1 + db TM_DETECT, 1 MapLakeofRageSignpostItem2: dw $00b5 diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index cbd14ffb5..264d78506 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -12,7 +12,7 @@ HiddenPowerGuy: iftrue .AlreadyGotItem writetext HiddenPowerGuyText1 keeptextopen - verbosegiveitem TM_10, 1 + verbosegiveitem TM_HIDDEN_POWER, 1 iffalse .Done setevent EVENT_GOT_TM10_HIDDEN_POWER writetext HiddenPowerGuyText2 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 8c1449f84..f66e55e82 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -36,7 +36,7 @@ UnknownScript_0x199ac8: ; 0x199ac8 setevent EVENT_BEAT_BOARDER_DOUGLAS writetext UnknownText_0x199d55 keeptextopen - verbosegiveitem TM_16, 1 + verbosegiveitem TM_ICY_WIND, 1 iffalse UnknownScript_0x199af4 setevent EVENT_GOT_TM16_ICY_WIND writetext UnknownText_0x199def diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index fe23e759e..88a743d3c 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -44,7 +44,7 @@ ItemFragment_0x7e0e0: ; 0x7e0e0 ; 0x7e0e2 ItemFragment_0x7e0e2: ; 0x7e0e2 - db TM_40, 1 + db TM_DEFENSE_CURL, 1 ; 0x7e0e4 ItemFragment_0x7e0e4: ; 0x7e0e4 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index f3d20a785..89b5d529a 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -12,7 +12,7 @@ MrPsychic: iftrue .AlreadyGotItem writetext MrPsychicText1 keeptextopen - verbosegiveitem TM_29, 1 + verbosegiveitem TM_PSYCHIC, 1 iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC .AlreadyGotItem diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index e936aa0af..a34951190 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -396,7 +396,7 @@ ItemFragment_0x5c1cc: ; 0x5c1cc ; 0x5c1ce ItemFragment_0x5c1ce: ; 0x5c1ce - db TM_28, 1 + db TM_DIG, 1 ; 0x5c1d0 MapNationalParkSignpostItem2: ; 0x5c1d0 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index ed3dce387..a473bbb76 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -113,7 +113,7 @@ ItemFragment_0x5c945: ; 0x5c945 ; 0x5c947 ItemFragment_0x5c947: ; 0x5c947 - db TM_28, 1 + db TM_DIG, 1 ; 0x5c949 MapNationalParkBugContestSignpostItem2: ; 0x5c949 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index f108b3936..44b43a9ef 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -13,7 +13,7 @@ SailorScript_0x9c8c1: ; 0x9c8c1 iftrue UnknownScript_0x9c8d3 writetext UnknownText_0x9c8df keeptextopen - verbosegiveitem HM_04, 1 + verbosegiveitem HM_STRENGTH, 1 setevent EVENT_GOT_HM04_STRENGTH UnknownScript_0x9c8d3: ; 0x9c8d3 writetext UnknownText_0x9c965 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 30b87100e..672f6242b 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -31,7 +31,7 @@ UnknownScript_0x9c159: ; 0x9c159 iftrue UnknownScript_0x9c172 writetext UnknownText_0x9c354 keeptextopen - verbosegiveitem TM_23, 1 + verbosegiveitem TM_IRON_TAIL, 1 iffalse UnknownScript_0x9c176 setevent EVENT_GOT_TM23_IRON_TAIL writetext UnknownText_0x9c3a5 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 1a9d0f7d5..b167f87b9 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -73,7 +73,7 @@ ItemFragment_0x609ac: ; 0x609ac ; 0x609ae ItemFragment_0x609ae: ; 0x609ae - db TM_34, 1 + db TM_SWAGGER, 1 ; 0x609b0 MapOlivineLighthouse5FSignpostItem0: ; 0x609b0 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index f06af7c3c..607f3f737 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -183,7 +183,7 @@ UnknownScript_0x188eac: ; 0x188eac iftrue UnknownScript_0x188ec5 writetext UnknownText_0x1893c4 keeptextopen - verbosegiveitem TM_07, 1 + verbosegiveitem TM_ZAP_CANNON, 1 iffalse UnknownScript_0x188ec3 setevent EVENT_GOT_TM07_ZAP_CANNON writetext UnknownText_0x1893f4 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 166427aa2..26fa85fdc 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -69,7 +69,7 @@ UnknownScript_0x5e584: ; 0x5e584 UnknownScript_0x5e58a: ; 0x5e58a writetext UnknownText_0x5e7e2 keeptextopen - verbosegiveitem TM_11, 1 + verbosegiveitem TM_SUNNY_DAY, 1 iffalse UnknownScript_0x5e5a1 writetext UnknownText_0x5e821 closetext diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 7e4af31bf..a6ae2b920 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -11,7 +11,7 @@ ItemFragment_0x743b5: ; 0x743b5 ; 0x743b7 ItemFragment_0x743b7: ; 0x743b7 - db TM_47, 1 + db TM_STEEL_WING, 1 ; 0x743b9 MapRockTunnel1FSignpostItem0: ; 0x743b9 diff --git a/maps/Route27.asm b/maps/Route27.asm index dc7e3e3c6..79c45d9ac 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -434,7 +434,7 @@ MapRoute27Signpost0Script: ; 0x1a0a5f ; 0x1a0a62 ItemFragment_0x1a0a62: ; 0x1a0a62 - db TM_22, 1 + db TM_SOLARBEAM, 1 ; 0x1a0a64 ItemFragment_0x1a0a64: ; 0x1a0a64 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 561b645ba..27eb988ba 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -19,7 +19,7 @@ SandstormHouseWoman: .Loyal writetext SandstormHouseWomanLoyalText keeptextopen - verbosegiveitem TM_37, 1 + verbosegiveitem TM_SANDSTORM, 1 iffalse .Done setevent EVENT_GOT_TM37_SANDSTORM .AlreadyGotItem diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 62c73400e..b75c97427 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -18,7 +18,7 @@ Celebrity: iftrue .AlreadyGotItem writetext CelebrityText1 keeptextopen - verbosegiveitem TM_47, 1 + verbosegiveitem TM_STEEL_WING, 1 iffalse .Done setevent EVENT_GOT_TM47_STEEL_WING .Done diff --git a/maps/Route31.asm b/maps/Route31.asm index 5510703fc..3f5054092 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -247,7 +247,7 @@ UnknownScript_0x1a5584: ; 0x1a5584 writetext UnknownText_0x1a57ba keeptextopen setevent EVENT_GAVE_KENYA - verbosegiveitem TM_50, 1 + verbosegiveitem TM_NIGHTMARE, 1 iffalse UnknownScript_0x1a55b3 setevent EVENT_GOT_TM50_NIGHTMARE UnknownScript_0x1a55af: ; 0x1a55af diff --git a/maps/Route32.asm b/maps/Route32.asm index a914d4e17..66ece3c3e 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -98,7 +98,7 @@ FisherScript_0x1904ce: iftrue UnknownScript_0x1904e3 writetext UnknownText_0x191133 keeptextopen - verbosegiveitem TM_05, 1 + verbosegiveitem TM_ROAR, 1 iffalse UnknownScript_0x1904e7 setevent EVENT_GOT_TM05_ROAR UnknownScript_0x1904e3: diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index ef9a38b66..2e2a64073 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -52,7 +52,7 @@ TeacherScript_0x62d63: ; 0x62d63 iftrue UnknownScript_0x62d7e writetext UnknownText_0x62d9d keeptextopen - verbosegiveitem TM_12, 1 + verbosegiveitem TM_SWEET_SCENT, 1 iffalse UnknownScript_0x62d82 setevent EVENT_GOT_TM12_SWEET_SCENT UnknownScript_0x62d7e: ; 0x62d7e diff --git a/maps/Route35.asm b/maps/Route35.asm index 9c8c88612..5463ee967 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -422,7 +422,7 @@ MapRoute35Signpost1Script: ; 0x19ca79 ; 0x19ca7c ItemFragment_0x19ca7c: ; 0x19ca7c - db TM_04, 1 + db TM_ROLLOUT, 1 ; 0x19ca7e FruitTreeScript_0x19ca7e: ; 0x19ca7e diff --git a/maps/Route36.asm b/maps/Route36.asm index bbf3ddc2a..19495d49a 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -147,7 +147,7 @@ FisherScript_0x1940b9: ; 0x1940b9 UnknownScript_0x1940cd: ; 0x1940cd writetext UnknownText_0x1944d0 keeptextopen - verbosegiveitem TM_08, 1 + verbosegiveitem TM_ROCK_SMASH, 1 iffalse UnknownScript_0x1940de setevent EVENT_GOT_TM08_ROCK_SMASH UnknownScript_0x1940da: ; 0x1940da diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index fb3fea844..7e1eaf461 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -84,7 +84,7 @@ PokefanFScript_0x9cf0e: ; 0x9cf0e UnknownScript_0x9cf22: ; 0x9cf22 writetext UnknownText_0x9d156 keeptextopen - verbosegiveitem TM_13, 1 + verbosegiveitem TM_SNORE, 1 iffalse UnknownScript_0x9cf33 setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM UnknownScript_0x9cf2f: ; 0x9cf2f diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index bf2f5c238..396685b3b 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -128,7 +128,7 @@ OfficerScript_0x19ac85: ; 0x19ac85 iftrue UnknownScript_0x19ac9c writetext UnknownText_0x19ad9b keeptextopen - verbosegiveitem TM_36, 1 + verbosegiveitem TM_SLUDGE_BOMB, 1 iffalse UnknownScript_0x19aca0 setevent EVENT_GOT_TM36_SLUDGE_BOMB loadmovesprites diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index babf85873..ff276b86c 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -29,7 +29,7 @@ UnknownScript_0x5ad22: ; 0x5ad22 ; 0x5ad28 ItemFragment_0x5ad28: ; 0x5ad28 - db TM_18, 1 + db TM_RAIN_DANCE, 1 ; 0x5ad2a UnknownText_0x5ad2a: ; 0x5ad2a diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 98055aca6..c58629df3 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -75,7 +75,7 @@ SageLiScript: ; 0x1849a6 loadfont writetext UnknownText_0x184cc2 keeptextopen - verbosegiveitem HM_05, 1 + verbosegiveitem HM_FLASH, 1 setevent EVENT_GOT_HM05_FLASH setevent EVENT_BEAT_SAGE_LI writetext UnknownText_0x184d13 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index a018050f1..f4bcb8edd 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -348,7 +348,7 @@ UnknownScript_0x6d184: ; 0x6d184 loadfont writetext UnknownText_0x6d809 keeptextopen - verbosegiveitem HM_06, 1 + verbosegiveitem HM_WHIRLPOOL, 1 setevent EVENT_GOT_HM06_WHIRLPOOL writetext UnknownText_0x6d8f8 closetext @@ -422,7 +422,7 @@ UnknownScript_0x6d207: ; 0x6d207 ; 0x6d20d ItemFragment_0x6d20d: ; 0x6d20d - db TM_46, 1 + db TM_THIEF, 1 ; 0x6d20f MapTeamRocketBaseB2FSignpostItem22: ; 0x6d20f diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 640d24a60..faec5b41e 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -144,7 +144,7 @@ ItemFragment_0x7d9e4: ; 0x7d9e4 ; 0x7d9e6 ItemFragment_0x7d9e6: ; 0x7d9e6 - db TM_35, 1 + db TM_SLEEP_TALK, 1 ; 0x7d9e8 ItemFragment_0x7d9e8: ; 0x7d9e8 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 076916215..08951ceb4 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -123,7 +123,7 @@ HikerLeonardScript: ; 0x5a00e ; 0x5a016 ItemFragment_0x5a016: ; 0x5a016 - db TM_39, 1 + db TM_SWIFT, 1 ; 0x5a018 ItemFragment_0x5a018: ; 0x5a018 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index eac74251b..dd8f3120c 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -100,7 +100,7 @@ UnknownScript_0x7451f: ; 0x7451f ; 0x74529 ItemFragment_0x74529: ; 0x74529 - db TM_26, 1 + db TM_EARTHQUAKE, 1 ; 0x7452b ItemFragment_0x7452b: ; 0x7452b diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 786843bbb..d05140321 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -35,7 +35,7 @@ UnknownScript_0x683ec: ; 0x683ec specialphonecall $3 writetext UnknownText_0x685c8 keeptextopen - verbosegiveitem TM_31, 1 + verbosegiveitem TM_MUD_SLAP, 1 iffalse UnknownScript_0x68416 setevent EVENT_GOT_TM31_MUD_SLAP writetext UnknownText_0x68648 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 418418a42..4576b0d5d 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -52,7 +52,7 @@ FisherScript_0x1a9a75: iftrue UnknownScript_0x1a9a8a writetext UnknownText_0x1a9cc4 keeptextopen - verbosegiveitem TM_42, 1 + verbosegiveitem TM_DREAM_EATER, 1 iffalse UnknownScript_0x1a9a8e setevent EVENT_GOT_TM42_DREAM_EATER UnknownScript_0x1a9a8a: |