diff options
| -rw-r--r-- | audio.asm | 2 | ||||
| -rw-r--r-- | audio/headers/sfxheaders2.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/trainer_appeared.asm (renamed from audio/sfx/silph_scope.asm) | 2 | ||||
| -rw-r--r-- | constants/music_constants.asm | 6 | ||||
| -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 | ||||
| -rw-r--r-- | engine/battle/common_text.asm | 2 | ||||
| -rw-r--r-- | engine/debug/debug_party.asm | 8 | ||||
| -rw-r--r-- | macros/asserts.asm | 16 | ||||
| -rw-r--r-- | scripts/SilphCo8F.asm | 2 | ||||
| -rw-r--r-- | text/SilphCo8F.asm | 2 |
13 files changed, 23 insertions, 29 deletions
@@ -148,7 +148,7 @@ INCLUDE "audio/sfx/start_menu_2.asm" INCLUDE "audio/sfx/tink_2.asm" INCLUDE "audio/sfx/heal_hp_2.asm" INCLUDE "audio/sfx/heal_ailment_2.asm" -INCLUDE "audio/sfx/silph_scope.asm" +INCLUDE "audio/sfx/trainer_appeared.asm" INCLUDE "audio/sfx/ball_toss.asm" INCLUDE "audio/sfx/ball_poof.asm" INCLUDE "audio/sfx/faint_thud.asm" diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 1ccbf265..f33304ca 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -587,6 +587,6 @@ SFX_Battle_36:: channel 6, SFX_Battle_36_Ch6 channel 8, SFX_Battle_36_Ch8 -SFX_Silph_Scope:: +SFX_Trainer_Appeared:: channel_count 1 - channel 5, SFX_Silph_Scope_Ch5 + channel 5, SFX_Trainer_Appeared_Ch5 diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/trainer_appeared.asm index 4a565740..3301a57f 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/trainer_appeared.asm @@ -1,4 +1,4 @@ -SFX_Silph_Scope_Ch5: +SFX_Trainer_Appeared_Ch5: duty_cycle 0 square_note 0, 13, 2, 1792 square_note 0, 13, 2, 1856 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 6e669861..671f2ad7 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -231,9 +231,9 @@ DEF BATTLE_SFX_START EQUS "SFX_PECK" music_const SFX_BATTLE_34, SFX_Battle_34 music_const SFX_BATTLE_35, SFX_Battle_35 music_const SFX_BATTLE_36, SFX_Battle_36 - music_const SFX_SILPH_SCOPE, SFX_Silph_Scope -DEF BATTLE_SFX_END EQUS "SFX_SILPH_SCOPE + 1" -DEF MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE" + music_const SFX_TRAINER_APPEARED, SFX_Trainer_Appeared +DEF BATTLE_SFX_END EQUS "SFX_TRAINER_APPEARED + 1" +DEF MAX_SFX_ID_2 EQUS "SFX_TRAINER_APPEARED" ; AUDIO_3 music_const SFX_INTRO_LUNGE, SFX_Intro_Lunge 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 diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 76b2269d..8a07b382 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -80,7 +80,7 @@ PrintBeginningBattleText: ld [wFrequencyModifier], a ld a, $80 ld [wTempoModifier], a - ld a, SFX_SILPH_SCOPE + ld a, SFX_TRAINER_APPEARED call PlaySound jp WaitForSoundToFinish .done diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 407875e7..de61b091 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -94,13 +94,17 @@ IF DEF(_DEBUG) ret DebugSetPokedexEntries: - ld b, wPokedexOwnedEnd - wPokedexOwned - 1 +IF NUM_POKEMON / 8 != 0 + ld b, NUM_POKEMON / 8 ; 151 / 8 == 18 ld a, %11111111 .loop ld [hli], a dec b jr nz, .loop - ld [hl], %01111111 +ENDC +IF NUM_POKEMON % 8 != 0 + ld [hl], (1 << (NUM_POKEMON % 8)) - 1 ; (1 << 151 % 8)) - 1 == %01111111 +ENDC ret DebugNewGameItemsList: diff --git a/macros/asserts.asm b/macros/asserts.asm index 11e0ee99..132006f9 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -11,7 +11,7 @@ MACRO? _redef_current_label DEF \1 EQUS #{__SCOPE__} ENDC ENDC - if !DEF(\1) + IF !DEF(\1) DEF \1 EQUS \2 {\1}: ENDC @@ -68,12 +68,7 @@ ENDM MACRO? nybble_array DEF CURRENT_NYBBLE_ARRAY_VALUE = 0 DEF CURRENT_NYBBLE_ARRAY_LENGTH = 0 - IF _NARG == 1 - REDEF CURRENT_NYBBLE_ARRAY_START EQUS "\1" - ELSE - REDEF CURRENT_NYBBLE_ARRAY_START EQUS "._nybble_array\@" - {CURRENT_NYBBLE_ARRAY_START}: - ENDC + _redef_current_label CURRENT_NYBBLE_ARRAY_START, "._nybble_array\@", \# ENDM MACRO? nybble @@ -103,12 +98,7 @@ ENDM MACRO? bit_array DEF CURRENT_BIT_ARRAY_VALUE = 0 DEF CURRENT_BIT_ARRAY_LENGTH = 0 - IF _NARG == 1 - REDEF CURRENT_BIT_ARRAY_START EQUS "\1" - ELSE - REDEF CURRENT_BIT_ARRAY_START EQUS "._bit_array\@" - {CURRENT_BIT_ARRAY_START}: - ENDC + _redef_current_label CURRENT_BIT_ARRAY_START, "._bit_array\@", \# ENDM MACRO? dbit diff --git a/scripts/SilphCo8F.asm b/scripts/SilphCo8F.asm index dcba85c0..6c449155 100644 --- a/scripts/SilphCo8F.asm +++ b/scripts/SilphCo8F.asm @@ -104,7 +104,7 @@ SilphCo8FSilphWorkerMText: jp TextScriptEnd .SilphIsFinishedText: - text_far __SilphCo8FSilphWorkerMThanksForSavingUsText + text_far _SilphCo8FSilphWorkerMSilphIsFinishedText text_end .ThanksForSavingUsText: diff --git a/text/SilphCo8F.asm b/text/SilphCo8F.asm index 8e4cf93f..97223960 100644 --- a/text/SilphCo8F.asm +++ b/text/SilphCo8F.asm @@ -1,4 +1,4 @@ -__SilphCo8FSilphWorkerMThanksForSavingUsText:: +_SilphCo8FSilphWorkerMSilphIsFinishedText:: text "I wonder if SILPH" line "is finished..." done |