diff options
| author | Scott Norton <PikalaxALT@gmail.com> | 2015-06-29 22:24:45 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-03 13:46:38 -0400 |
| commit | f74fd6903f90e30c3bf1dbde93153ddec62a450a (patch) | |
| tree | 3d90d694665388922af9a1137e962db30d95427b /items | |
| parent | e2c2e20f93f43848542362a5deee677e88f9507d (diff) | |
- 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.
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_descriptions.asm | 2 | ||||
| -rw-r--r-- | items/marts.asm | 42 |
2 files changed, 22 insertions, 22 deletions
diff --git a/items/item_descriptions.asm b/items/item_descriptions.asm index 9309b811d..40e91b2c9 100644 --- a/items/item_descriptions.asm +++ b/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 diff --git a/items/marts.asm b/items/marts.asm index a11b8a5bb..295a4bafd 100644 --- a/items/marts.asm +++ b/items/marts.asm @@ -144,37 +144,37 @@ Mart8: ; 16134 Mart9: ; 1613b db 3 ; # items - db TM_41 - db TM_48 - db TM_33 + db TM_THUNDERPUNCH + db TM_FIRE_PUNCH + db TM_ICE_PUNCH db $ff ; 16140 Mart10: ; 16140 db 4 ; # items - db TM_41 - db TM_48 - db TM_33 - db TM_02 + db TM_THUNDERPUNCH + db TM_FIRE_PUNCH + db TM_ICE_PUNCH + db TM_HEADBUTT db $ff ; 16146 Mart11: ; 16146 db 4 ; # items - db TM_41 - db TM_48 - db TM_33 - db TM_08 + db TM_THUNDERPUNCH + db TM_FIRE_PUNCH + db TM_ICE_PUNCH + db TM_ROCK_SMASH db $ff ; 1614c Mart12: ; 1614c db 5 ; # items - db TM_41 - db TM_48 - db TM_33 - db TM_02 - db TM_08 + db TM_THUNDERPUNCH + db TM_FIRE_PUNCH + db TM_ICE_PUNCH + db TM_HEADBUTT + db TM_ROCK_SMASH db $ff ; 16153 @@ -339,11 +339,11 @@ Mart24: ; 161c2 Mart25: ; 161ce db 5 ; # items - db TM_10 - db TM_11 - db TM_17 - db TM_18 - db TM_37 + db TM_HIDDEN_POWER + db TM_SUNNY_DAY + db TM_PROTECT + db TM_RAIN_DANCE + db TM_SANDSTORM db $ff ; 161d5 |