From fbcf7d0e19a3a2db505440d3ccd3d40ca996c15c Mon Sep 17 00:00:00 2001 From: SnorlaxMonster <7100450+SnorlaxMonster@users.noreply.github.com> Date: Sun, 25 Jan 2026 01:30:02 +1030 Subject: Repair Iwata Asks URL (#568) Co-authored-by: SnorlaxMonster --- data/pokemon/mew.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/pokemon/mew.asm b/data/pokemon/mew.asm index c68867ee..7485f92a 100644 --- a/data/pokemon/mew.asm +++ b/data/pokemon/mew.asm @@ -6,7 +6,7 @@ ; weren't going to be included in the final version of the game were removed, ; creating a miniscule 300 bytes of free space. So we thought that we could ; slot Mew in there. What we did would be unthinkable nowadays!" -; http://iwataasks.nintendo.com/interviews/#/ds/pokemon/0/0 +; https://iwataasks.nintendo.com/interviews/ds/pokemon/0/0/ MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" -- cgit v1.3.1-sl0p From 812a7d17d7a0da29baedfdde4b493e6b79864ab3 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 30 Mar 2026 17:42:50 -0400 Subject: Don't pass redundant label names to `nybble_array` and `bit_array` --- data/items/key_items.asm | 2 +- data/items/tm_prices.asm | 2 +- data/pokemon/menu_icons.asm | 2 +- macros/asserts.asm | 16 +++------------- 4 files changed, 6 insertions(+), 16 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/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index d6ed5b35..207c31e9 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/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 -- cgit v1.3.1-sl0p From e82e0ead5066c006ce43a8a4b3a5b7285a037143 Mon Sep 17 00:00:00 2001 From: kagnusdev Date: Mon, 6 Apr 2026 20:55:39 +0200 Subject: Make `DebugSetPokedexEntries` automatically adapt to `NUM_POKEMON` changes (#576) --- engine/debug/debug_party.asm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index e51f0697..19cbea0a 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -126,13 +126,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: -- cgit v1.3.1-sl0p From 9441f1aafe96c1bb8160b94936a29207ad6a12c3 Mon Sep 17 00:00:00 2001 From: PokefanMarcel <166040321+PokefanMarcel@users.noreply.github.com> Date: Thu, 9 Apr 2026 21:55:34 +0200 Subject: Change text label `_SilphCo8FSilphWorkerMSilphIsFinishedText` (#578) --- scripts/SilphCo8F.asm | 2 +- text/SilphCo8F.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.3.1-sl0p From 3c814341c81307b3193a9ea890ff3a197b09b4e3 Mon Sep 17 00:00:00 2001 From: PokefanMarcel <166040321+PokefanMarcel@users.noreply.github.com> Date: Wed, 15 Apr 2026 19:02:35 +0200 Subject: Relabel SFX_SILPH_SCOPE to SFX_TRAINER_APPEARED (#580) --- audio.asm | 2 +- audio/headers/sfxheaders2.asm | 4 ++-- audio/sfx/silph_scope.asm | 9 --------- audio/sfx/trainer_appeared.asm | 9 +++++++++ constants/music_constants.asm | 6 +++--- data/moves/sfx.asm | 2 +- engine/battle/common_text.asm | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 audio/sfx/silph_scope.asm create mode 100644 audio/sfx/trainer_appeared.asm diff --git a/audio.asm b/audio.asm index 47ea6031..b5621346 100644 --- a/audio.asm +++ b/audio.asm @@ -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/silph_scope.asm deleted file mode 100644 index 4a565740..00000000 --- a/audio/sfx/silph_scope.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_Silph_Scope_Ch5: - duty_cycle 0 - square_note 0, 13, 2, 1792 - square_note 0, 13, 2, 1856 - square_note 0, 13, 2, 1920 - square_note 0, 13, 2, 1984 - square_note 10, 14, 1, 2016 - square_note 1, 0, 0, 0 - sound_ret diff --git a/audio/sfx/trainer_appeared.asm b/audio/sfx/trainer_appeared.asm new file mode 100644 index 00000000..3301a57f --- /dev/null +++ b/audio/sfx/trainer_appeared.asm @@ -0,0 +1,9 @@ +SFX_Trainer_Appeared_Ch5: + duty_cycle 0 + square_note 0, 13, 2, 1792 + square_note 0, 13, 2, 1856 + square_note 0, 13, 2, 1920 + square_note 0, 13, 2, 1984 + square_note 10, 14, 1, 2016 + square_note 1, 0, 0, 0 + sound_ret diff --git a/constants/music_constants.asm b/constants/music_constants.asm index e72e88d9..7c3651db 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -224,9 +224,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/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/engine/battle/common_text.asm b/engine/battle/common_text.asm index 810d3fb9..9e954877 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -64,7 +64,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 -- cgit v1.3.1-sl0p