Merge pull request #297 from PikalaxALT/master

- Renamed "Functiond283" to "GetPocketCapacity" and updated the point…

constants.asm

@@ -5,7 +5,6 @@ INCLUDE "gbhw.asm"
 INCLUDE "hram.asm"
 
 INCLUDE "constants/wram_constants.asm"
-
 INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/type_constants.asm"
 INCLUDE "constants/move_constants.asm"

constants/item_constants.asm

@@ -190,70 +190,75 @@
 	const MUSIC_MAIL   ; $BC
 	const MIRAGE_MAIL  ; $BD
 	const ITEM_BE      ; $BE
-	const TM_01        ; $BF
-	const TM_02        ; $C0
-	const TM_03        ; $C1
-	const TM_04        ; $C2
-	const ITEM_C3      ; $C3
-	const TM_05        ; $C4
-	const TM_06        ; $C5
-	const TM_07        ; $C6
-	const TM_08        ; $C7
-	const TM_09        ; $C8
-	const TM_10        ; $C9
-	const TM_11        ; $CA
-	const TM_12        ; $CB
-	const TM_13        ; $CC
-	const TM_14        ; $CD
-	const TM_15        ; $CE
-	const TM_16        ; $CF
-	const TM_17        ; $D0
-	const TM_18        ; $D1
-	const TM_19        ; $D2
-	const TM_20        ; $D3
-	const TM_21        ; $D4
-	const TM_22        ; $D5
-	const TM_23        ; $D6
-	const TM_24        ; $D7
-	const TM_25        ; $D8
-	const TM_26        ; $D9
-	const TM_27        ; $DA
-	const TM_28        ; $DB
-	const ITEM_DC      ; $DC
-	const TM_29        ; $DD
-	const TM_30        ; $DE
-	const TM_31        ; $DF
-	const TM_32        ; $E0
-	const TM_33        ; $E1
-	const TM_34        ; $E2
-	const TM_35        ; $E3
-	const TM_36        ; $E4
-	const TM_37        ; $E5
-	const TM_38        ; $E6
-	const TM_39        ; $E7
-	const TM_40        ; $E8
-	const TM_41        ; $E9
-	const TM_42        ; $EA
-	const TM_43        ; $EB
-	const TM_44        ; $EC
-	const TM_45        ; $ED
-	const TM_46        ; $EE
-	const TM_47        ; $EF
-	const TM_48        ; $F0
-	const TM_49        ; $F1
-	const TM_50        ; $F2
-	const HM_01        ; $F3
-	const HM_02        ; $F4
-	const HM_03        ; $F5
-	const HM_04        ; $F6
-	const HM_05        ; $F7
-	const HM_06        ; $F8
-	const HM_07        ; $F9
-	const HM_08        ; $FA
 
+	add_tm DYNAMICPUNCH
+	add_tm HEADBUTT
+	add_tm CURSE
+	add_tm ROLLOUT
+	const ITEM_C3
+	add_tm ROAR
+	add_tm TOXIC
+	add_tm ZAP_CANNON
+	add_tm ROCK_SMASH
+	add_tm PSYCH_UP
+	add_tm HIDDEN_POWER
+	add_tm SUNNY_DAY
+	add_tm SWEET_SCENT
+	add_tm SNORE
+	add_tm BLIZZARD
+	add_tm HYPER_BEAM
+	add_tm ICY_WIND
+	add_tm PROTECT
+	add_tm RAIN_DANCE
+	add_tm GIGA_DRAIN
+	add_tm ENDURE
+	add_tm FRUSTRATION
+	add_tm SOLARBEAM
+	add_tm IRON_TAIL
+	add_tm DRAGONBREATH
+	add_tm THUNDER
+	add_tm EARTHQUAKE
+	add_tm RETURN
+	add_tm DIG
+	const ITEM_DC
+	add_tm PSYCHIC
+	add_tm SHADOW_BALL
+	add_tm MUD_SLAP
+	add_tm DOUBLE_TEAM
+	add_tm ICE_PUNCH
+	add_tm SWAGGER
+	add_tm SLEEP_TALK
+	add_tm SLUDGE_BOMB
+	add_tm SANDSTORM
+	add_tm FIRE_BLAST
+	add_tm SWIFT
+	add_tm DEFENSE_CURL
+	add_tm THUNDERPUNCH
+	add_tm DREAM_EATER
+	add_tm DETECT
+	add_tm REST
+	add_tm ATTRACT
+	add_tm THIEF
+	add_tm STEEL_WING
+	add_tm FIRE_PUNCH
+	add_tm FURY_CUTTER
+	add_tm NIGHTMARE
+NUM_TMS = const_value - TM01 - 2
+
+	add_hm CUT
+	add_hm FLY
+	add_hm SURF
+	add_hm STRENGTH
+	add_hm FLASH
+	add_hm WHIRLPOOL
+	add_hm WATERFALL
+NUM_HMS = const_value - HM01
+	const HM_08
+
+	add_mt FLAMETHROWER
+	add_mt THUNDERBOLT
+	add_mt ICE_BEAM
 
-NUM_TMS EQU 50
-NUM_HMS EQU 7
 
 
 ; leftovers from red

home.asm

@@ -991,7 +991,7 @@ GetItemName:: ; 3468
 	push bc
 	ld a, [wd265]
 
-	cp TM_01
+	cp TM01
 	jr nc, .TM
 
 	ld [CurSpecies], a
@@ -1019,7 +1019,7 @@ GetTMHMName:: ; 3487
 	push af
 
 ; TM/HM prefix
-	cp HM_01
+	cp HM01
 	push af
 	jr c, .TM
 
@@ -1094,7 +1094,7 @@ GetTMHMName:: ; 3487
 
 
 IsHM:: ; 34df
-	cp HM_01
+	cp HM01
 	jr c, .NotHM
 	scf
 	ret

items/item_descriptions.asm

@@ -2,7 +2,7 @@ PrintItemDescription: ; 0x1c8955
 ; Print the description for item [CurSpecies] at de.
 
 	ld a, [CurSpecies]
-	cp TM_01
+	cp TM01
 	jr c, .not_a_tm
 
 	ld [CurItem], a

items/marts.asm

@@ -144,37 +144,37 @@ Mart8: ; 16134
 
 Mart9: ; 1613b
 	db 3 ; # items
-	db TM_41
+	db TM_THUNDERPUNCH
-	db TM_48
+	db TM_FIRE_PUNCH
-	db TM_33
+	db TM_ICE_PUNCH
 	db $ff
 ; 16140
 
 Mart10: ; 16140
 	db 4 ; # items
-	db TM_41
+	db TM_THUNDERPUNCH
-	db TM_48
+	db TM_FIRE_PUNCH
-	db TM_33
+	db TM_ICE_PUNCH
-	db TM_02
+	db TM_HEADBUTT
 	db $ff
 ; 16146
 
 Mart11: ; 16146
 	db 4 ; # items
-	db TM_41
+	db TM_THUNDERPUNCH
-	db TM_48
+	db TM_FIRE_PUNCH
-	db TM_33
+	db TM_ICE_PUNCH
-	db TM_08
+	db TM_ROCK_SMASH
 	db $ff
 ; 1614c
 
 Mart12: ; 1614c
 	db 5 ; # items
-	db TM_41
+	db TM_THUNDERPUNCH
-	db TM_48
+	db TM_FIRE_PUNCH
-	db TM_33
+	db TM_ICE_PUNCH
-	db TM_02
+	db TM_HEADBUTT
-	db TM_08
+	db TM_ROCK_SMASH
 	db $ff
 ; 16153
 
@@ -339,11 +339,11 @@ Mart24: ; 161c2
 
 Mart25: ; 161ce
 	db 5 ; # items
-	db TM_10
+	db TM_HIDDEN_POWER
-	db TM_11
+	db TM_SUNNY_DAY
-	db TM_17
+	db TM_PROTECT
-	db TM_18
+	db TM_RAIN_DANCE
-	db TM_37
+	db TM_SANDSTORM
 	db $ff
 ; 161d5
 

macros.asm

@@ -1,4 +1,5 @@
 INCLUDE "macros/enum.asm"
+INCLUDE "macros/basestats.asm"
 
 INCLUDE "macros/event.asm"
 INCLUDE "macros/sound.asm"

macros/basestats.asm

@@ -0,0 +1,66 @@
+define: macro
+if !def(\1)
+\1 equs \2
+endc
+endm
+
+const_value = 0
+
+add_tm: MACRO
+if !def(TM01)
+TM01 = const_value
+	enum_start 1
+endc
+	define _\@_1, "TM_\1"
+	const _\@_1
+	enum \1_TMNUM
+ENDM
+
+add_hm: MACRO
+if !def(HM01)
+HM01 = const_value
+endc
+	define _\@_1, "HM_\1"
+	const _\@_1
+	enum \1_TMNUM
+ENDM
+
+add_mt: MACRO
+	enum \1_TMNUM
+ENDM
+
+tmhm: MACRO
+x = 0
+y = 0
+w = 0
+	rept _NARG
+	if def(\1_TMNUM)
+	if \1_TMNUM < 25
+x = x | (1 << ((\1_TMNUM) - 1))
+	else
+	if \1_TMNUM < 49
+y = y | (1 << ((\1_TMNUM) - 1 - 24))
+	else
+w = w | (1 << ((\1_TMNUM) - 1 - 48))
+	endc
+	endc
+	else
+		fail "\1 is not a TM, HM, or move tutor move"
+	endc
+
+	shift
+	endr
+
+	rept 3
+	db x & $ff
+x = x >> 8
+	endr
+	rept 3
+	db y & $ff
+y = y >> 8
+	endr
+	rept 2
+	db w & $ff
+w = w >> 8
+	endr
+ENDM

main.asm

@@ -6823,26 +6823,26 @@ Functiond27b: ; d27b
 	ret
 ; d283
 
-Functiond283: ; d283
+GetPocketCapacity: ; d283
-	ld c, 20
+	ld c, MAX_ITEMS
 	ld a, e
-	cp TMsHMsEnd % $100
+	cp NumItems % $100
 	jr nz, .asm_d28e
 	ld a, d
-	cp TMsHMsEnd / $100
+	cp NumItems / $100
 	ret z
 
 .asm_d28e
-	ld c, 50
+	ld c, MAX_PC_ITEMS
 	ld a, e
-	cp BallsEnd % $100
+	cp PCItems % $100
 	jr nz, .asm_d299
 	ld a, d
-	cp BallsEnd / $100
+	cp PCItems / $100
 	ret z
 
 .asm_d299
-	ld c, $c
+	ld c, MAX_BALLS
 	ret
 ; d29c
 
@@ -6873,7 +6873,7 @@ Functiond29c: ; d29c
 	jr .asm_d2a5
 
 .asm_d2bd
-	call Functiond283
+	call GetPocketCapacity
 	ld a, [de]
 	cp c
 	jr c, .asm_d2c6
@@ -7176,7 +7176,7 @@ GetTMHMNumber:: ; d407
 .skip
 	dec a
 .done
-	sub TM_01
+	sub TM01
 	inc a
 	ld c, a
 	ret
@@ -7189,9 +7189,9 @@ GetNumberedTMHM: ; d417
 	ld a, c 
 
 ; Skip any gaps.
-	cp ITEM_C3 - (TM_01 - 1)
+	cp ITEM_C3 - (TM01 - 1)
 	jr c, .done
-	cp ITEM_DC - (TM_01 - 1) - 1
+	cp ITEM_DC - (TM01 - 1) - 1
 	jr c, .skip_one
 
 .skip_two
@@ -7199,7 +7199,7 @@ GetNumberedTMHM: ; d417
 .skip_one
 	inc a
 .done
-	add TM_01
+	add TM01
 	dec a
 	ld c, a
 	ret
@@ -35563,7 +35563,7 @@ Function2c7bf: ; 2c7bf (b:47bf)
 	push af
 	res 4, [hl]
 	ld a, [CurItem]
-	cp TM_01
+	cp TM01
 	jr c, .asm_2c7f5
 	call GetTMHMItemMove
 	ld a, [wd265]
@@ -35572,7 +35572,7 @@ Function2c7bf: ; 2c7bf (b:47bf)
 	call CopyName1
 	ld hl, UnknownText_0x2c8bf
 	ld a, [CurItem]
-	cp HM_01
+	cp HM01
 	jr c, .asm_2c7e9
 	ld hl, UnknownText_0x2c8c4
 .asm_2c7e9

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

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

maps/BurnedTowerB1F.asm

@@ -120,7 +120,7 @@ UnknownScript_0x18622a: ; 0x18622a
 ; 0x186231
 
 ItemFragment_0x186231: ; 0x186231
-	db TM_20, 1
+	db TM_ENDURE, 1
 ; 0x186233
 
 BurnedTowerB1FBoulder:

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

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

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

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

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

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

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