- 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.
2025-04-09 05:44:44 -07:00 · 2015-06-29 22:24:45 -04:00
parent e2c2e20f93
commit f74fd6903f
60 changed files with 491 additions and 2177 deletions
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More