TM/HM constants named after moves

This commit is contained in:
Rangi 2020-07-05 22:52:27 -04:00
parent 66ebe56adc
commit 405889193e
203 changed files with 330 additions and 302 deletions

View file

@ -46,7 +46,7 @@ CeladonCityText5:
jr nz, .asm_7053f
ld hl, TM41PreText
call PrintText
lb bc, TM_41, 1
lb bc, TM_SOFTBOILED, 1
call GiveItem
jr c, .Success
ld hl, TM41NoRoomText

View file

@ -47,7 +47,7 @@ CeladonGymText_48963:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_ERIKA
lb bc, TM_21, 1
lb bc, TM_MEGA_DRAIN, 1
call GiveItem
jr nc, .BagFull
ld a, $a

View file

@ -26,7 +26,7 @@ CeladonMart3Text1:
jr nz, .asm_a5463
ld hl, TM18PreReceiveText
call PrintText
lb bc, TM_18, 1
lb bc, TM_COUNTER, 1
call GiveItem
jr nc, .BagFull
SetEvent EVENT_GOT_TM18

View file

@ -90,7 +90,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
ld hl, CeladonMartRoofText_48515
call PrintText
call RemoveItemByIDBank12
lb bc, TM_49, 1
lb bc, TM_TRI_ATTACK, 1
call GiveItem
jr nc, .bagFull
ld hl, ReceivedTM49Text
@ -103,7 +103,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
ld hl, CeladonMartRoofText_48504
call PrintText
call RemoveItemByIDBank12
lb bc, TM_48, 1
lb bc, TM_ROCK_SLIDE, 1
call GiveItem
jr nc, .bagFull
ld hl, CeladonMartRoofText_4850a
@ -116,7 +116,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
ld hl, CeladonMartRoofText_484f3
call PrintText
call RemoveItemByIDBank12
lb bc, TM_13, 1
lb bc, TM_ICE_BEAM, 1
call GiveItem
jr nc, .bagFull
ld hl, CeladonMartRoofText_484f9

View file

@ -299,7 +299,7 @@ CeruleanCityText2:
.asm_4ca20
ld hl, CeruleanCityText_196f3
call PrintText
lb bc, TM_28, 1
lb bc, TM_DIG, 1
call GiveItem
jr c, .Success
ld hl, TM28NoRoomText

View file

@ -47,7 +47,7 @@ CeruleanGymScript_5c70d:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_MISTY
lb bc, TM_11, 1
lb bc, TM_BUBBLEBEAM, 1
call GiveItem
jr nc, .BagFull
ld a, $6

View file

@ -144,7 +144,7 @@ CinnabarGymScript3_75857:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_BLAINE
lb bc, TM_38, 1
lb bc, TM_FIRE_BLAST, 1
call GiveItem
jr nc, .BagFull
ld a, $b

View file

@ -14,7 +14,7 @@ Lab3Text1:
jr nz, .asm_e551a
ld hl, TM35PreReceiveText
call PrintText
lb bc, TM_35, 1
lb bc, TM_METRONOME, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedTM35Text

View file

@ -23,7 +23,7 @@ CopycatsHouse2FText1:
jr z, .asm_62ecd
ld hl, TM31PreReceiveText
call PrintText
lb bc, TM_31, 1
lb bc, TM_MIMIC, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedTM31Text

View file

@ -47,7 +47,7 @@ FuchsiaGymScript3_75497:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_KOGA
lb bc, TM_06, 1
lb bc, TM_TOXIC, 1
call GiveItem
jr nc, .BagFull
ld a, $a

View file

@ -10,7 +10,7 @@ SaffronHouse2Text1:
jr nz, .asm_9e72b
ld hl, TM29PreReceiveText
call PrintText
lb bc, TM_29, 1
lb bc, TM_PSYCHIC_M, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedTM29Text

View file

@ -47,7 +47,7 @@ PewterGymScript_5c3df:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_BROCK
lb bc, TM_34, 1
lb bc, TM_BIDE, 1
call GiveItem
jr nc, .BagFull
ld a, $5

View file

@ -12,7 +12,7 @@ Route12GateUpstairsText1:
jr c, .asm_0ad3c
ld hl, TM39PreReceiveText
call PrintText
lb bc, TM_39, 1
lb bc, TM_SWIFT, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedTM39Text

View file

@ -12,7 +12,7 @@ Route16HouseText1:
jr nz, .asm_13616
ld hl, Route16HouseText3
call PrintText
lb bc, HM_02, 1
lb bc, HM_FLY, 1
call GiveItem
jr nc, .BagFull
SetEvent EVENT_GOT_HM02

View file

@ -11,7 +11,7 @@ Route2GateText1:
jr nz, .asm_5d60d
ld a, 10 ; pokemon needed
ld [hOaksAideRequirement], a
ld a, HM_05 ; oak's aide reward
ld a, HM_FLASH ; oak's aide reward
ld [hOaksAideRewardItem], a
ld [wd11e], a
call GetItemName

View file

@ -22,7 +22,7 @@ SSAnne7Text1:
call PrintText
ld hl, ReceivingHM01Text
call PrintText
lb bc, HM_01, 1
lb bc, HM_CUT, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedHM01Text

View file

@ -10,7 +10,7 @@ SafariZoneSecretHouseText1:
jr nz, .asm_20a9b
ld hl, SafariZoneSecretHouseText_4a350
call PrintText
lb bc, HM_03, 1
lb bc, HM_SURF, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedHM03Text

View file

@ -47,7 +47,7 @@ SaffronGymText_5d068:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_SABRINA
lb bc, TM_46, 1
lb bc, TM_PSYWAVE, 1
call GiveItem
jr nc, .BagFull
ld a, $b

View file

@ -142,7 +142,7 @@ SilphCo2Text1:
jr nz, .asm_59de4
ld hl, SilphCo2Text_59ded
call PrintText
lb bc, TM_36, 1
lb bc, TM_SELFDESTRUCT, 1
call GiveItem
ld hl, TM36NoRoomText
jr nc, .asm_59de7

View file

@ -66,7 +66,7 @@ VermilionGymReceiveTM24:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_LT_SURGE
lb bc, TM_24, 1
lb bc, TM_THUNDERBOLT, 1
call GiveItem
jr nc, .BagFull
ld a, $7

View file

@ -235,7 +235,7 @@ ViridianCityText6:
jr nz, .gotTm42
ld hl, ViridianCityText_191ca
call PrintText
lb bc, TM_42, 1
lb bc, TM_DREAM_EATER, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedTM42Text

View file

@ -141,7 +141,7 @@ ViridianGymScript3_74995:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
lb bc, TM_27, 1
lb bc, TM_FISSURE, 1
call GiveItem
jr nc, .BagFull
ld a, $d

View file

@ -38,7 +38,7 @@ FuchsiaHouse2Text1:
.asm_60cba
ld hl, WardenThankYouText
call PrintText
lb bc, HM_04, 1
lb bc, HM_STRENGTH, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedHM04Text