Merge branch 'master' of https://github.com/pret/pokered

2026-08-27 21:04:33 -05:00 · 2026-04-15 12:05:52 -05:00
parent bc2354dd66 3c814341c8
commit bfa7170107
13 changed files with 23 additions and 29 deletions
--- 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
--- 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
--- 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
--- 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