diff options
| author | dannye <33dannye@gmail.com> | 2026-04-15 12:05:52 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2026-04-15 12:05:52 -0500 |
| commit | bfa7170107eea23b89febb60bfb2ce39173bf2e1 (patch) | |
| tree | 9796ec9b20b065c8935f54ef4f7cbf1d5a821ecc /data | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Relabel SFX_SILPH_SCOPE to SFX_TRAINER_APPEARED (#580) (diff) | |
| download | pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.tar.gz pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.tar.xz pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data')
| -rw-r--r-- | data/items/key_items.asm | 2 | ||||
| -rw-r--r-- | data/items/tm_prices.asm | 2 | ||||
| -rw-r--r-- | data/moves/sfx.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/menu_icons.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/data/items/key_items.asm b/data/items/key_items.asm index 97f5f093..1750811f 100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -1,5 +1,5 @@ KeyItemFlags: - bit_array KeyItemFlags + bit_array dbit FALSE ; MASTER_BALL dbit FALSE ; ULTRA_BALL dbit FALSE ; GREAT_BALL diff --git a/data/items/tm_prices.asm b/data/items/tm_prices.asm index 89501e32..7dc500ec 100644 --- a/data/items/tm_prices.asm +++ b/data/items/tm_prices.asm @@ -1,6 +1,6 @@ TechnicalMachinePrices: ; In thousands (nybbles). - nybble_array TechnicalMachinePrices + nybble_array nybble 3 ; TM01 nybble 2 ; TM02 nybble 2 ; TM03 diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm index f1466ac1..59f4cb2c 100644 --- a/data/moves/sfx.asm +++ b/data/moves/sfx.asm @@ -6,7 +6,7 @@ MoveSoundTable: db SFX_DOUBLESLAP, $00, $80 ; DOUBLESLAP db SFX_BATTLE_0B, $01, $80 ; COMET_PUNCH db SFX_BATTLE_0D, $00, $40 ; MEGA_PUNCH - db SFX_SILPH_SCOPE, $00, $ff ; PAY_DAY + db SFX_TRAINER_APPEARED, $00, $ff ; PAY_DAY db SFX_BATTLE_0D, $10, $60 ; FIRE_PUNCH db SFX_BATTLE_0D, $20, $80 ; ICE_PUNCH db SFX_BATTLE_0D, $00, $a0 ; THUNDERPUNCH diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 56237664..b846e187 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -1,5 +1,5 @@ MonPartyData: - nybble_array MonPartyData + nybble_array nybble ICON_GRASS ; Bulbasaur nybble ICON_GRASS ; Ivysaur nybble ICON_GRASS ; Venusaur |