Skip to content

Commit

Permalink
All TMs Available
Browse files Browse the repository at this point in the history
  • Loading branch information
PiaCarrot authored and PiaCarrot committed May 19, 2024
1 parent 4a127b5 commit 1273915
Show file tree
Hide file tree
Showing 6 changed files with 236 additions and 194 deletions.
2 changes: 2 additions & 0 deletions constants/item_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,8 @@ ITEMMENU_CLOSE EQU 6
const MART_ASCORBIA
const MART_KUMQUAT
const MART_PUMMELO
const MART_TROVITOPOLIS_SEWER_TM
const MART_UNNAMED_ISLAND_2_TM

; PartyMenuActionText
const_def
Expand Down
26 changes: 13 additions & 13 deletions items/item_attributes.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,25 +344,25 @@ Item2Attributes:
; KANTO STONE
item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM01
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 10000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM02
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM03
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM04
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 15000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM05
item_attribute 1000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 12000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM06
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 12000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM07
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM08
item_attribute 1000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM09
item_attribute 1000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM10
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 50000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM11
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM12
Expand Down Expand Up @@ -396,9 +396,9 @@ Item2Attributes:
; TM26
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM27
item_attribute 1000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 65535, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM28
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 5000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM29
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM30
Expand All @@ -408,9 +408,9 @@ Item2Attributes:
; TM32
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM33
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 20000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM34
item_attribute 1000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 50000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM35
item_attribute 30000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM36
Expand All @@ -420,17 +420,17 @@ Item2Attributes:
; TM38
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM39
item_attribute 2000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 30000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM40
item_attribute 1000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM41
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 30000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM42
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM43
item_attribute 1000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 10000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM44
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 12000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM45
item_attribute 3000, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM46
Expand Down
26 changes: 24 additions & 2 deletions items/marts.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Marts: ; 160a9
dw AscorbiaMart
dw KumquatMart
dw PummeloMart
dw TrovitopolisSewerTMMart
dw UnnamedIsland2TMMart
MartsEnd:
; 160ed

Expand Down Expand Up @@ -203,12 +205,17 @@ TrovitopolisMedicineMart:
db $ff

TrovitopolisTMMart:
db 5
db 10
db TM_FLAMETHROWER
db TM_THUNDERBOLT
db TM_ICE_BEAM
db TM_SOLARBEAM
db TM_HYPER_BEAM
db TM_POWERUPPUNCH
db TM_DIG
db TM_EARTH_POWER
db TM_GIGA_IMPACT
db TM_DAZZLINGLEAM
db TM_FLASH_CANNON
db $ff

AscorbiaMart:
Expand Down Expand Up @@ -251,6 +258,21 @@ PummeloMart:
db X_ATTACK
db X_SPEED
db $ff
TrovitopolisSewerTMMart:
db 4
db TM_DARK_PULSE
db TM_TOXIC
db TM_VENOSHOCK
db TM_ZAP_CANNON
db $ff
UnnamedIsland2TMMart:
db 3
db TM_REST
db TM_RETURN
db TM_FISSURE
db $ff

DefaultMart: ; 16214
db 2 ; # items
Expand Down
11 changes: 10 additions & 1 deletion maps/FishingContest.asm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const_value = 1
const FISHING_CONTEST_GRAMPS
const FISHING_CONTEST_SCIENTIST

FishingContest_MapScriptHeader::

Expand Down Expand Up @@ -40,6 +41,13 @@ FishingContestNatPagleText:
line "a great excuse to"
cont "drink. Heavily."
done
UnnamedIslandTMScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_UNNAMED_ISLAND_2_TM
closetext
end

FishingContest_MapEventHeader::

Expand All @@ -50,6 +58,7 @@ FishingContest_MapEventHeader::
.BGEvents: db 1
signpost 15, 11, SIGNPOST_READ, FishingContestSign

.ObjectEvents: db 1
.ObjectEvents: db 2
person_event SPRITE_GRAMPS, 14, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 1, -1, -1, PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, FishingContestNatPagleScript, -1
person_event SPRITE_SUPER_NERD, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_OW_PURPLE, PERSONTYPE_SCRIPT, 0, UnnamedIslandTMScript, -1

Loading

0 comments on commit 1273915

Please sign in to comment.