Skip to content

Commit

Permalink
QoL aaaaaa123456789#4: get rid of dummy items between and after TMs/HMs
Browse files Browse the repository at this point in the history 
Co-Authored-By: aaaaaa123456789 <[email protected]>
  • Loading branch information
@aaaaaa123456789 @vulcandth
aaaaaa123456789 authored and vulcandth committed Oct 16, 2022
1 parent 58ef0cf commit 5ebda7e
Show file tree
Hide file tree
Showing 5 changed files with 166 additions and 284 deletions.
121 changes: 60 additions & 61 deletions constants/item_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@
const MUSIC_MAIL ; bc
const MIRAGE_MAIL ; bd
const ITEM_BE ; be
const ITEM_DC ; bf
const ITEM_C3 ; c0
const ITEM_FA ; c1
DEF NUM_ITEMS EQU const_value - 1

DEF __tmhm_value__ = 1
Expand All @@ -217,58 +220,56 @@ ENDM

; see data/moves/tmhm_moves.asm for moves
DEF TM01 EQU const_value
add_tm DYNAMICPUNCH ; bf
add_tm HEADBUTT ; c0
add_tm CURSE ; c1
add_tm ROLLOUT ; c2
const ITEM_C3 ; c3
add_tm ROAR ; c4
add_tm TOXIC ; c5
add_tm ZAP_CANNON ; c6
add_tm ROCK_SMASH ; c7
add_tm PSYCH_UP ; c8
add_tm HIDDEN_POWER ; c9
add_tm SUNNY_DAY ; ca
add_tm SWEET_SCENT ; cb
add_tm SNORE ; cc
add_tm BLIZZARD ; cd
add_tm HYPER_BEAM ; ce
add_tm ICY_WIND ; cf
add_tm PROTECT ; d0
add_tm RAIN_DANCE ; d1
add_tm GIGA_DRAIN ; d2
add_tm ENDURE ; d3
add_tm FRUSTRATION ; d4
add_tm SOLARBEAM ; d5
add_tm IRON_TAIL ; d6
add_tm DRAGONBREATH ; d7
add_tm THUNDER ; d8
add_tm EARTHQUAKE ; d9
add_tm RETURN ; da
add_tm DIG ; db
const ITEM_DC ; dc
add_tm PSYCHIC_M ; dd
add_tm SHADOW_BALL ; de
add_tm MUD_SLAP ; df
add_tm DOUBLE_TEAM ; e0
add_tm ICE_PUNCH ; e1
add_tm SWAGGER ; e2
add_tm SLEEP_TALK ; e3
add_tm SLUDGE_BOMB ; e4
add_tm SANDSTORM ; e5
add_tm FIRE_BLAST ; e6
add_tm SWIFT ; e7
add_tm DEFENSE_CURL ; e8
add_tm THUNDERPUNCH ; e9
add_tm DREAM_EATER ; ea
add_tm DETECT ; eb
add_tm REST ; ec
add_tm ATTRACT ; ed
add_tm THIEF ; ee
add_tm STEEL_WING ; ef
add_tm FIRE_PUNCH ; f0
add_tm FURY_CUTTER ; f1
add_tm NIGHTMARE ; f2
add_tm DYNAMICPUNCH ; c2
add_tm HEADBUTT ; c3
add_tm CURSE ; c4
add_tm ROLLOUT ; c5
add_tm ROAR ; c6
add_tm TOXIC ; c7
add_tm ZAP_CANNON ; c8
add_tm ROCK_SMASH ; c9
add_tm PSYCH_UP ; ca
add_tm HIDDEN_POWER ; cb
add_tm SUNNY_DAY ; cc
add_tm SWEET_SCENT ; cd
add_tm SNORE ; ce
add_tm BLIZZARD ; cf
add_tm HYPER_BEAM ; d0
add_tm ICY_WIND ; d1
add_tm PROTECT ; d2
add_tm RAIN_DANCE ; d3
add_tm GIGA_DRAIN ; d4
add_tm ENDURE ; d5
add_tm FRUSTRATION ; d6
add_tm SOLARBEAM ; d7
add_tm IRON_TAIL ; d8
add_tm DRAGONBREATH ; d9
add_tm THUNDER ; da
add_tm EARTHQUAKE ; db
add_tm RETURN ; dc
add_tm DIG ; dd
add_tm PSYCHIC_M ; de
add_tm SHADOW_BALL ; df
add_tm MUD_SLAP ; e0
add_tm DOUBLE_TEAM ; e1
add_tm ICE_PUNCH ; e2
add_tm SWAGGER ; e3
add_tm SLEEP_TALK ; e4
add_tm SLUDGE_BOMB ; e5
add_tm SANDSTORM ; e6
add_tm FIRE_BLAST ; e7
add_tm SWIFT ; e8
add_tm DEFENSE_CURL ; e9
add_tm THUNDERPUNCH ; ea
add_tm DREAM_EATER ; eb
add_tm DETECT ; ec
add_tm REST ; ed
add_tm ATTRACT ; ee
add_tm THIEF ; ef
add_tm STEEL_WING ; f0
add_tm FIRE_PUNCH ; f1
add_tm FURY_CUTTER ; f2
add_tm NIGHTMARE ; f3
DEF NUM_TMS EQU __tmhm_value__ - 1

MACRO add_hm
Expand All @@ -283,13 +284,13 @@ MACRO add_hm
ENDM

DEF HM01 EQU const_value
add_hm CUT ; f3
add_hm FLY ; f4
add_hm SURF ; f5
add_hm STRENGTH ; f6
add_hm FLASH ; f7
add_hm WHIRLPOOL ; f8
add_hm WATERFALL ; f9
add_hm CUT ; f4
add_hm FLY ; f5
add_hm SURF ; f6
add_hm STRENGTH ; f7
add_hm FLASH ; f8
add_hm WHIRLPOOL ; f9
add_hm WATERFALL ; fa
DEF NUM_HMS EQU __tmhm_value__ - NUM_TMS - 1

MACRO add_mt
Expand All @@ -309,8 +310,6 @@ DEF NUM_TUTORS = __tmhm_value__ - NUM_TMS - NUM_HMS - 1

DEF NUM_TM_HM_TUTOR EQU NUM_TMS + NUM_HMS + NUM_TUTORS

const ITEM_FA ; fa

DEF USE_SCRIPT_VAR EQU $00
DEF ITEM_FROM_MEM EQU $ff

Expand Down
16 changes: 8 additions & 8 deletions data/items/attributes.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,12 @@ ItemAttributes:
item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_BE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_DC
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_C3
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_FA
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
assert_table_length NUM_ITEMS
; TM01
item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
Expand All @@ -398,8 +404,6 @@ ItemAttributes:
item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM04
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_C3
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TM05
item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM06
Expand Down Expand Up @@ -448,8 +452,6 @@ ItemAttributes:
item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM28
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_DC
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TM29
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM30
Expand Down Expand Up @@ -494,7 +496,7 @@ ItemAttributes:
item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM50
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
assert_table_length NUM_ITEMS + NUM_TMS + 2 ; count ITEM_C3 and ITEM_DC
assert_table_length NUM_ITEMS + NUM_TMS
; HM01
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM02
Expand All @@ -509,9 +511,7 @@ ItemAttributes:
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM07
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
assert_table_length NUM_ITEMS + NUM_TMS + 2 + NUM_HMS ; count ITEM_C3 and ITEM_DC
; ITEM_FA
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
assert_table_length NUM_ITEMS + NUM_TMS + NUM_HMS
; $fb
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; $fc
Expand Down
Loading

0 comments on commit 5ebda7e

Please sign in to comment.