From 695757abe50e8c189d14da666809119e37a9ed28 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 12 Jun 2015 11:00:48 -0500 Subject: Name a few unknowns --- engine/menu/pokedex.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 4351ae4c..7d8457f3 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -573,8 +573,8 @@ HeightWeightText: ; 40448 (10:4448) db "HT ?",$60,"??",$61,$4E,"WT ???lb@" ; XXX does anything point to this? -Unknown_4045D: ; 4045d (10:445d) - db $54,$50 +PokeText: ; 4045d (10:445d) + db "#@" ; horizontal line that divides the pokedex text description from the rest of the data PokedexDataDividerLine: ; 4045f (10:445f) -- cgit v1.3.1-sl0p From cd649184f556db777d592671a7274bfa4a8423d7 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 3 Jul 2015 14:37:53 -0500 Subject: Rename/organize part 1 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github --- constants/item_constants.asm | 1 - data/mapObjects/redshouse2f.asm | 2 +- data/mon_party_sprites.asm | 4 +- engine/HoF_room_pc.asm | 34 +-- engine/battle/animations.asm | 269 +++++++++++---------- engine/battle/bank_e_misc.asm | 28 +-- engine/battle/battle_transitions.asm | 8 +- engine/battle/common_text.asm | 8 +- engine/battle/core.asm | 108 +++++---- engine/battle/draw_hud_pokeball_gfx.asm | 38 +-- engine/battle/end_of_battle.asm | 2 +- engine/battle/moveEffects/focus_energy_effect.asm | 2 +- engine/battle/moveEffects/leech_seed_effect.asm | 6 +- .../moveEffects/reflect_light_screen_effect.asm | 2 +- engine/battle/scale_sprites.asm | 8 +- engine/battle/trainer_ai.asm | 17 +- engine/cable_club.asm | 8 +- engine/evolution.asm | 36 +-- engine/evolve_trade.asm | 4 +- engine/evos_moves.asm | 10 +- engine/experience.asm | 22 +- engine/gamefreak.asm | 32 +-- engine/give_pokemon.asm | 8 +- engine/hall_of_fame.asm | 50 ++-- engine/hidden_object_functions17.asm | 12 +- engine/hidden_object_functions18.asm | 8 +- engine/hidden_object_functions7.asm | 46 ++-- engine/hp_bar.asm | 2 +- engine/in_game_trades.asm | 2 +- engine/intro.asm | 50 ++-- engine/items/itemfinder.asm | 10 +- engine/items/items.asm | 114 ++++----- engine/items/tm_prices.asm | 6 +- engine/load_pokedex_tiles.asm | 4 +- engine/menu/bills_pc.asm | 4 +- engine/menu/diploma.asm | 10 +- engine/menu/main_menu.asm | 24 +- engine/menu/naming_screen.asm | 14 +- engine/menu/oaks_pc.asm | 2 +- engine/menu/party_menu.asm | 2 +- engine/menu/pc.asm | 36 +-- engine/menu/pokedex.asm | 4 +- engine/menu/prize_menu.asm | 4 +- engine/menu/start_menu.asm | 6 +- engine/menu/start_sub_menus.asm | 48 ++-- engine/menu/status_screen.asm | 42 ++-- engine/menu/vending_machine.asm | 6 +- engine/multiply_divide.asm | 68 +++--- engine/oak_speech.asm | 24 +- engine/oak_speech2.asm | 52 ++-- engine/overworld/cable_club_npc.asm | 12 +- engine/overworld/cinnabar_lab.asm | 14 +- engine/overworld/cut.asm | 38 +-- engine/overworld/cut2.asm | 8 +- engine/overworld/doors.asm | 4 +- engine/overworld/elevator.asm | 4 +- engine/overworld/emotion_bubbles.asm | 6 +- engine/overworld/healing_machine.asm | 16 +- engine/overworld/hidden_items.asm | 9 +- engine/overworld/item.asm | 4 +- engine/overworld/ledges.asm | 2 +- engine/overworld/movement.asm | 20 +- engine/overworld/npc_movement.asm | 4 +- engine/overworld/oaks_aide.asm | 14 +- engine/overworld/player_animations.asm | 22 +- engine/overworld/pokecenter.asm | 2 +- engine/overworld/pokemart.asm | 8 +- engine/overworld/ssanne.asm | 2 +- engine/overworld/trainers.asm | 24 +- engine/palettes.asm | 8 +- engine/pokedex_rating.asm | 2 +- engine/predefs.asm | 8 +- engine/predefs12.asm | 20 +- engine/predefs17.asm | 4 +- engine/save.asm | 50 ++-- engine/slot_machine.asm | 10 +- engine/titlescreen.asm | 46 ++-- engine/titlescreen2.asm | 4 +- engine/town_map.asm | 40 +-- engine/trade.asm | 2 +- home.asm | 194 +++++++-------- home/audio.asm | 20 +- home/init.asm | 2 +- home/overworld.asm | 20 +- home/pic.asm | 16 +- home/predef.asm | 6 +- home/text.asm | 8 +- main.asm | 142 +++++------ text.asm | 4 +- wram.asm | 10 +- 90 files changed, 1070 insertions(+), 1066 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/constants/item_constants.asm b/constants/item_constants.asm index be251e62..bc73a20b 100755 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -78,7 +78,6 @@ EXP__ALL EQU $4B OLD_ROD EQU $4C GOOD_ROD EQU $4D SUPER_ROD EQU $4E -; XXX todo: compare this to $32 PP_UP EQU $4F ETHER EQU $50 MAX_ETHER EQU $51 diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index f8680121..e7c64c6f 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -1,4 +1,4 @@ -RedsHouse2FObject: ; 0x5c0d0 ? +RedsHouse2FObject: ; 0x5c0d0 db $0A ; border block db $1 ; warps diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm index 92297b6d..7e434dce 100755 --- a/data/mon_party_sprites.asm +++ b/data/mon_party_sprites.asm @@ -13,8 +13,8 @@ MonPartyData: ; 7190d (1c:590d) dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok dn SPRITE_FAIRY, SPRITE_FAIRY ;Pikachu/Raichu dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash - dn SPRITE_MON, SPRITE_MON ;Nidoran?/Nidorina - dn SPRITE_MON, SPRITE_MON ;Nidoqueen/Nidoran? + dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina + dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index ae4ecb0d..c33e9141 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -1,7 +1,7 @@ HallOfFamePC: ; 7405c (1d:405c) callba AnimateHallOfFame call ClearScreen - ld c, $64 + ld c, 100 call DelayFrames call DisableLCD ld hl, vFont @@ -19,27 +19,27 @@ HallOfFamePC: ; 7405c (1d:405c) hlCoord 0, 14 call Func_7417b ld a, $c0 - ld [rBGP], a ; $ff47 + ld [rBGP], a call EnableLCD ld a, $ff call PlaySoundWaitForCurrent ld c, BANK(Music_Credits) ld a, MUSIC_CREDITS call PlayMusic - ld c, $80 + ld c, 128 call DelayFrames xor a - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a ld [wTrainerEngageDistance], a jp Credits Func_740ba: ; 740ba (1d:40ba) - ld hl, DataTable_74160 ; $4160 + ld hl, DataTable_74160 ld b, $4 .asm_740bf ld a, [hli] - ld [rBGP], a ; $ff47 - ld c, $5 + ld [rBGP], a + ld c, 5 call DelayFrames dec b jr nz, .asm_740bf @@ -116,7 +116,7 @@ Func_74152: ; 74152 (1d:4152) cp l jr nz, Func_74152 ld a, h - ld [rSCX], a ; $ff43 + ld [rSCX], a .asm_7415a ld a, [$ff44] cp h @@ -128,11 +128,11 @@ DataTable_74160: ; 74160 (1d:4160) Func_74164: ; 74164 (1d:4164) ld a, l - ld [H_AUTOBGTRANSFERDEST], a ; $ffbc + ld [H_AUTOBGTRANSFERDEST], a ld a, h ld [$ffbd], a ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 Func_74171: ; 74171 (1d:4171) @@ -157,7 +157,7 @@ FillMiddleOfScreenWithWhite: ; 74183 (1d:4183) jp FillMemory Credits: ; 7418e (1d:418e) - ld de, CreditsOrder ; $4243 + ld de, CreditsOrder push de .asm_74192 pop de @@ -183,7 +183,7 @@ Credits: ; 7418e (1d:418e) jr z, .showTheEnd push hl push hl - ld hl, CreditsTextPointers ; $42c3 + ld hl, CreditsTextPointers add a ld c, a ld b, $0 @@ -205,20 +205,20 @@ Credits: ; 7418e (1d:418e) jr .asm_7419b .asm_741d5 call Func_740ba - ld c, $5a + ld c, 90 jr .asm_741de .asm_741dc - ld c, $6e + ld c, 110 .asm_741de call DelayFrames call DisplayCreditsMon jr .asm_74192 .asm_741e6 call Func_740ba - ld c, $78 + ld c, 120 jr .asm_741ef .asm_741ed - ld c, $8c + ld c, 140 .asm_741ef call DelayFrames jr .asm_74192 @@ -229,7 +229,7 @@ Credits: ; 7418e (1d:418e) pop de jr .asm_7419b .showTheEnd - ld c, $10 + ld c, 16 call DelayFrames call FillMiddleOfScreenWithWhite pop de diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index dc08e0e1..cdd28422 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -170,7 +170,7 @@ PlayAnimation: ; 780f1 (1e:40f1) ld l,a ld h,0 add hl,hl - ld de,AttackAnimationPointers ; $607d ; animation command stream pointers + ld de,AttackAnimationPointers ; animation command stream pointers add hl,de ld a,[hli] ld h,[hl] @@ -199,7 +199,7 @@ PlayAnimation: ; 780f1 (1e:40f1) ld [wAnimSoundID],a ; store sound push hl push de - call Func_7986f + call GetMoveSound call PlaySound pop de pop hl @@ -383,7 +383,7 @@ MoveAnimation: ; 78d5e (1e:4d5e) push bc push af call WaitForSoundToFinish - call Func_78e23 + call SetAnimationPalette ld a,[W_ANIMATIONID] and a jr z,.AnimationFinished @@ -500,19 +500,19 @@ AnimationShakeScreenHorizontallySlow: ; 78e01 (1e:4e01) push bc push bc .asm_78e03 - ld a, [rWX] ; $ff4b + ld a, [rWX] inc a - ld [rWX], a ; $ff4b - ld c, $2 + ld [rWX], a + ld c, 2 call DelayFrames dec b jr nz, .asm_78e03 pop bc .asm_78e11 - ld a, [rWX] ; $ff4b + ld a, [rWX] dec a - ld [rWX], a ; $ff4b - ld c, $2 + ld [rWX], a + ld c, 2 call DelayFrames dec b jr nz, .asm_78e11 @@ -521,7 +521,7 @@ AnimationShakeScreenHorizontallySlow: ; 78e01 (1e:4e01) jr nz, AnimationShakeScreenHorizontallySlow ret -Func_78e23: ; 78e23 (1e:4e23) +SetAnimationPalette: ; 78e23 (1e:4e23) ld a, [wOnSGB] and a ld a, $e4 @@ -529,7 +529,7 @@ Func_78e23: ; 78e23 (1e:4e23) ld a, $f0 ld [wcc79], a ld b, $e4 - ld a, [W_ANIMATIONID] ; W_ANIMATIONID + ld a, [W_ANIMATIONID] cp TRADE_BALL_DROP_ANIM jr c, .asm_78e3f cp TRADE_BALL_POOF_ANIM + 1 @@ -537,24 +537,24 @@ Func_78e23: ; 78e23 (1e:4e23) ld b, $f0 .asm_78e3f ld a, b - ld [rOBP0], a ; $ff48 + ld [rOBP0], a ld a, $6c - ld [rOBP1], a ; $ff49 + ld [rOBP1], a ret .asm_78e47 ld a, $e4 ld [wcc79], a - ld [rOBP0], a ; $ff48 + ld [rOBP0], a ld a, $6c - ld [rOBP1], a ; $ff49 + ld [rOBP1], a ret PlaySubanimation: ; 78e53 (1e:4e53) ld a,[wAnimSoundID] cp a,$FF jr z,.skipPlayingSound - call Func_7986f - call PlaySound ; play sound effect + call GetMoveSound + call PlaySound .skipPlayingSound ld hl,wOAMBuffer ; base address of OAM buffer ld a,l @@ -581,7 +581,7 @@ PlaySubanimation: ; 78e53 (1e:4e53) push hl ld e,[hl] ; base coordinate ID ld d,0 - ld hl,FrameBlockBaseCoords ; $7c85 ; base coordinate table + ld hl,FrameBlockBaseCoords ; base coordinate table add hl,de add hl,de ld a,[hli] @@ -667,7 +667,7 @@ AnimationIdSpecialEffects: ; 78ef5 (1e:4ef5) dw AnimationFlashScreen db TAIL_WHIP - dw Func_790d0 + dw TailWhipAnimationUnused db GROWL dw DoGrowlSpecialEffects @@ -703,13 +703,13 @@ AnimationIdSpecialEffects: ; 78ef5 (1e:4ef5) dw DoRockSlideSpecialEffects db TRADE_BALL_DROP_ANIM - dw Func_79041 + dw TradeHidePokemon db TRADE_BALL_SHAKE_ANIM - dw Func_7904c + dw TradeShakePokeball db TRADE_BALL_TILT_ANIM - dw Func_7907c + dw TradeJumpPokeball db TOSS_ANIM dw DoBallTossSpecialEffects @@ -742,7 +742,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) jr nz,.skipPlayingSound ; if it is the beginning of the subanimation, play a sound ld a,(SFX_08_41 - SFX_Headers_08) / 3 - call PlaySound ; play sound + call PlaySound .skipPlayingSound ld a,[W_ISINBATTLE] cp a,02 ; is it a trainer battle? @@ -788,7 +788,7 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) jr nz,.skipPlayingSound ; if it is the beginning of a shake, play a sound and wait 2/3 of a second ld a,(SFX_08_3c - SFX_Headers_08) / 3 - call PlaySound ; play sound + call PlaySound ld c,40 call DelayFrames .skipPlayingSound @@ -875,8 +875,8 @@ DoBlizzardSpecialEffects: ; 79016 (1e:5016) ret ; flashes the screen at 3 points in the subanimation -; XXX is this unused? -Func_7902e: ; 7902e (1e:502e) +; unused +FlashScreenUnused: ; 7902e (1e:502e) ld a,[W_SUBANIMCOUNTER] cp a,14 jp z,AnimationFlashScreen @@ -887,8 +887,7 @@ Func_7902e: ; 7902e (1e:502e) ret ; function to make the pokemon disappear at the beginning of the animation -; XXX probably a trade-related animation -Func_79041: ; 79041 (1e:5041) +TradeHidePokemon: ; 79041 (1e:5041) ld a,[W_SUBANIMCOUNTER] cp a,6 ret nz @@ -896,8 +895,7 @@ Func_79041: ; 79041 (1e:5041) jp Func_7980c ; make pokemon disappear ; function to make a shaking pokeball jump up at the end of the animation -; XXX probably a trade-related animation -Func_7904c: ; 7904c (1e:504c) +TradeShakePokeball: ; 7904c (1e:504c) ld a,[W_SUBANIMCOUNTER] cp a,1 ret nz @@ -924,15 +922,14 @@ Func_7904c: ; 7904c (1e:504c) .done call AnimationCleanOAM ld a,(SFX_02_44 - SFX_Headers_02) / 3 - jp PlaySound ; play sound + jp PlaySound BallMoveDistances1: ; 79078 (1e:5078) db -12,-12,-8 db $ff ; terminator ; function to make the pokeball jump up -; XXX probably a trade-related animation -Func_7907c ; 507C +TradeJumpPokeball: ; 507C ld de,BallMoveDistances2 .loop ld hl,wOAMBuffer ; OAM buffer @@ -985,7 +982,7 @@ DoGrowlSpecialEffects: ; 790bc (1e:50bc) ret ; this is associated with Tail Whip, but Tail Whip doesn't use any subanimations -Func_790d0: ; 790d0 (1e:50d0) +TailWhipAnimationUnused: ; 790d0 (1e:50d0) ld a,1 ld [W_SUBANIMCOUNTER],a ld c,20 @@ -1183,46 +1180,46 @@ AnimationFlashScreen: ; 791be (1e:51be) AnimationDarkScreenPalette: ; 791d6 (1e:51d6) ; Changes the screen's palette to a dark palette. ld bc, $6f6f - jr Func_791fc + jr SetAnimationBGPalette AnimationDarkenMonPalette: ; 791db (1e:51db) ; Darkens the mon sprite's palette. ld bc, $f9f4 - jr Func_791fc + jr SetAnimationBGPalette -Func_791e0: ; 791e0 (1e:51e0) +AnimationUnusedPalette1: ; 791e0 (1e:51e0) ld bc, $fef8 - jr Func_791fc + jr SetAnimationBGPalette -Func_791e5: ; 791e5 (1e:51e5) +AnimationUnusedPalette2: ; 791e5 (1e:51e5) ld bc, $ffff - jr Func_791fc + jr SetAnimationBGPalette AnimationResetScreenPalette: ; 791ea (1e:51ea) ; Restores the screen's palette to the normal palette. ld bc, $e4e4 - jr Func_791fc + jr SetAnimationBGPalette -Func_791ef: ; 791ef (1e:51ef) +AnimationUnusedPalette3: ; 791ef (1e:51ef) ld bc, $0000 - jr Func_791fc + jr SetAnimationBGPalette AnimationLightScreenPalette: ; 791f4 (1e:51f4) ; Changes the screen to use a palette with light colors. ld bc, $9090 - jr Func_791fc + jr SetAnimationBGPalette -Func_791f9: ; 791f9 (1e:51f9) +AnimationUnusedPalette4: ; 791f9 (1e:51f9) ld bc, $4040 -Func_791fc: ; 791fc (1e:51fc) +SetAnimationBGPalette: ; 791fc (1e:51fc) ld a, [wOnSGB] and a ld a, b jr z, .asm_79204 ld a, c .asm_79204 - ld [rBGP], a ; $ff47 + ld [rBGP], a ret ld b, $5 @@ -1246,45 +1243,45 @@ AnimationWaterDropletsEverywhere: ; 79215 (1e:5215) call LoadAnimationTileset ld d, $20 ld a, $f0 - ld [W_BASECOORDX], a ; wd081 + ld [W_BASECOORDX], a ld a, $71 ld [wd09f], a .asm_79228 ld a, $10 - ld [W_BASECOORDY], a ; wd082 + ld [W_BASECOORDY], a ld a, $0 ld [wd08a], a - call Func_79246 + call _AnimationWaterDroplets ld a, $18 - ld [W_BASECOORDY], a ; wd082 + ld [W_BASECOORDY], a ld a, $20 ld [wd08a], a - call Func_79246 + call _AnimationWaterDroplets dec d jr nz, .asm_79228 ret -Func_79246: ; 79246 (1e:5246) +_AnimationWaterDroplets: ; 79246 (1e:5246) ld hl, wOAMBuffer .asm_79249 - ld a, [W_BASECOORDY] ; wd082 + ld a, [W_BASECOORDY] ld [hli], a - ld a, [W_BASECOORDX] ; wd081 + ld a, [W_BASECOORDX] add $1b - ld [W_BASECOORDX], a ; wd081 + ld [W_BASECOORDX], a ld [hli], a ld a, [wd09f] ld [hli], a xor a ld [hli], a - ld a, [W_BASECOORDX] ; wd081 + ld a, [W_BASECOORDX] cp $90 jr c, .asm_79249 sub $a8 - ld [W_BASECOORDX], a ; wd081 - ld a, [W_BASECOORDY] ; wd082 + ld [W_BASECOORDX], a + ld a, [W_BASECOORDY] add $10 - ld [W_BASECOORDY], a ; wd082 + ld [W_BASECOORDY], a cp $70 jr c, .asm_79249 call AnimationCleanOAM @@ -1304,7 +1301,7 @@ AnimationSlideMonUp: ; 7927a (1e:527a) ld a, $ff .asm_79291 ld [wd09f], a - jp Func_792bf + jp _AnimationSlideMonUp AnimationSlideMonDown: ; 79297 (1e:5297) ; Slides the mon's sprite down out of the screen. @@ -1314,7 +1311,7 @@ AnimationSlideMonDown: ; 79297 (1e:5297) call GetMonSpriteTileMapPointerFromRowCount push bc push de - call Func_79aae + call CopyPicTiles call Delay3 call AnimationHideMonPic pop de @@ -1327,15 +1324,15 @@ AnimationSlideMonOut: ; 792af (1e:52af) ; Slides the mon's sprite out of the screen horizontally. ld e, $8 ld a, $3 - ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM - jp Func_795f8 + ld [W_SUBANIMTRANSFORM], a + jp AnimationSlideMonLeft AnimationSlideEnemyMonOut: ; 792b9 (1e:52b9) ; Slides the enemy mon out of the screen horizontally. - ld hl, AnimationSlideMonOut ; $52af + ld hl, AnimationSlideMonOut jp CallWithTurnFlipped -Func_792bf: ; 792bf (1e:52bf) +_AnimationSlideMonUp: ; 792bf (1e:52bf) push de push hl push bc @@ -1368,16 +1365,16 @@ Func_792bf: ; 792bf (1e:52bf) add $7 dec c jr nz, .asm_792eb - ld c, $2 + ld c, 2 call DelayFrames pop bc pop hl pop de dec c - jr nz, Func_792bf + jr nz, _AnimationSlideMonUp ret -Func_792fd: ; 792fd (1e:52fd) +_AnimationShakeEnemyHUD: ; 792fd (1e:52fd) ld a, $10 ld [W_BASECOORDX], a ld a, $30 @@ -1390,7 +1387,7 @@ Func_792fd: ; 792fd (1e:52fd) ld e, a ld b, $5 .asm_79314 - call Func_79329 + call Animations_79329 inc d dec b jr nz, .asm_79314 @@ -1403,12 +1400,12 @@ Func_792fd: ; 792fd (1e:52fd) ld [W_BASECOORDX], a jr .asm_7930e -Func_79329: ; 79329 (1e:5329) +Animations_79329: ; 79329 (1e:5329) ld a, e add $8 ld e, a ld [hli], a - ld a, [W_BASECOORDX] ; wd081 + ld a, [W_BASECOORDX] ld [hli], a ld a, d ld [hli], a @@ -1464,7 +1461,7 @@ AdjustOAMBlockYPos2: ; 79352 (1e:5352) AnimationBlinkEnemyMon: ; 79369 (1e:5369) ; Make the enemy mon's sprite blink on and off for a second or two - ld hl, AnimationBlinkMon ; $536f + ld hl, AnimationBlinkMon jp CallWithTurnFlipped AnimationBlinkMon: ; 7936f (1e:536f) @@ -1474,10 +1471,10 @@ AnimationBlinkMon: ; 7936f (1e:536f) .asm_79372 push bc call AnimationHideMonPic - ld c, $5 + ld c, 5 call DelayFrames call AnimationShowMonPic - ld c, $5 + ld c, 5 call DelayFrames pop bc dec c @@ -1502,7 +1499,7 @@ AnimationShowMonPic: ; 7939e (1e:539e) xor a call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount - call Func_79aae + call CopyPicTiles jp Delay3 AnimationShowEnemyMonPic: ; 793ab (1e:53ab) @@ -1537,7 +1534,7 @@ AnimationShakeBackAndForth: ; 793b1 (1e:53b1) push hl call GetTileIDList pop hl - call Func_79aae + call CopyPicTiles call Delay3 pop hl ld bc, $0709 @@ -1545,7 +1542,7 @@ AnimationShakeBackAndForth: ; 793b1 (1e:53b1) pop af call GetTileIDList pop hl - call Func_79aae + call CopyPicTiles call Delay3 pop hl ld bc, $0709 @@ -1562,7 +1559,7 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9) ; Shifts the mon's sprite horizontally to a fixed location. Used by lots of ; animations like Tackle/Body Slam. call AnimationHideMonPic - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a hlCoord 2, 5 jr z, .asm_79407 @@ -1572,13 +1569,13 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9) push hl call GetTileIDList pop hl - call Func_79aae - ld c, $3 + call CopyPicTiles + ld c, 3 jp DelayFrames AnimationResetMonPosition: ; 79415 (1e:5415) ; Resets the mon's sprites to be located at the normal coordinates. - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a ld a, $66 jr z, .asm_7941e @@ -1590,24 +1587,24 @@ AnimationResetMonPosition: ; 79415 (1e:5415) AnimationSpiralBallsInward: ; 79424 (1e:5424) ; Creates an effect that looks like energy balls sprialing into the ; player mon's sprite. Used in Focus Energy, for example. - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a jr z, .asm_79435 ld a, $d8 ld [wd08a], a ld a, $50 - ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM + ld [W_SUBANIMTRANSFORM], a jr .asm_7943c .asm_79435 xor a ld [wd08a], a - ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM + ld [W_SUBANIMTRANSFORM], a .asm_7943c ld d, $7a ld c, $3 xor a call Func_797e8 - ld hl, SpiralBallAnimationCoordinates ; $5476 + ld hl, SpiralBallAnimationCoordinates .asm_79447 push hl ld c, $3 @@ -1621,7 +1618,7 @@ AnimationSpiralBallsInward: ; 79424 (1e:5424) ld [de], a inc de inc hl - ld a, [W_SUBANIMTRANSFORM] ; W_SUBANIMTRANSFORM + ld a, [W_SUBANIMTRANSFORM] add [hl] ld [de], a inc hl @@ -1630,7 +1627,7 @@ AnimationSpiralBallsInward: ; 79424 (1e:5424) inc de dec c jr nz, .asm_7944d - ld c, $5 + ld c, 5 call DelayFrames pop hl inc hl @@ -1674,7 +1671,7 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1) ld c, $4 .asm_794a3 push bc - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a jr z, .asm_794b1 hlCoord 16, 0 @@ -1687,11 +1684,11 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1) push de xor a ld [wd09f], a - call Func_794d4 + call _AnimationSquishMonPic pop hl ld a, $1 ld [wd09f], a - call Func_794d4 + call _AnimationSquishMonPic pop bc dec c jr nz, .asm_794a3 @@ -1699,7 +1696,7 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1) ld c, $2 jp DelayFrame -Func_794d4: ; 794d4 (1e:54d4) +_AnimationSquishMonPic: ; 794d4 (1e:54d4) ld c, $7 .asm_794d6 push bc @@ -1727,7 +1724,7 @@ Func_794d4: ; 794d4 (1e:54d4) AnimationShootBallsUpward: ; 794f9 (1e:54f9) ; Shoots one pillar of "energy" balls upwards. Used in Teleport/Sky Attack ; animations. - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a jr z, .asm_79503 ld bc, $80 @@ -1736,14 +1733,14 @@ AnimationShootBallsUpward: ; 794f9 (1e:54f9) ld bc, $3028 .asm_79506 ld a, b - ld [W_BASECOORDY], a ; wd082 + ld [W_BASECOORDY], a ld a, c - ld [W_BASECOORDX], a ; wd081 + ld [W_BASECOORDX], a ld bc, $501 - call Func_79517 + call _AnimationShootBallsUpward jp AnimationCleanOAM -Func_79517: ; 79517 (1e:5517) +_AnimationShootBallsUpward: ; 79517 (1e:5517) push bc xor a ld [wd09f], a @@ -1752,10 +1749,10 @@ Func_79517: ; 79517 (1e:5517) ld d, $7a ld hl, wOAMBuffer push bc - ld a, [W_BASECOORDY] ; wd082 + ld a, [W_BASECOORDY] ld e, a .asm_7952a - call Func_79329 + call Animations_79329 dec b jr nz, .asm_7952a call DelayFrame @@ -1766,7 +1763,7 @@ Func_79517: ; 79517 (1e:5517) push bc ld hl, wOAMBuffer .asm_7953c - ld a, [W_BASECOORDY] ; wd082 + ld a, [W_BASECOORDY] add $8 ld e, a ld a, [hl] @@ -1812,7 +1809,7 @@ AnimationShootManyBallsUpward: ; 79566 (1e:5566) ld [W_BASECOORDX], a ld bc, $0401 push hl - call Func_79517 + call _AnimationShootBallsUpward pop hl jr .loop @@ -1839,7 +1836,7 @@ AnimationMinimizeMon: ; 7959f (1e:559f) pop hl ld de, $194 add hl, de - ld de, MinimizedMonSprite ; $55c4 + ld de, MinimizedMonSprite ld c, $5 .asm_795b4 ld a, [de] @@ -1867,8 +1864,8 @@ AnimationSlideMonDownAndHide: ; 795c9 (1e:55c9) push af call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount - call Func_79aae - ld c, $8 + call CopyPicTiles + ld c, 8 call DelayFrames pop af inc a @@ -1882,8 +1879,8 @@ AnimationSlideMonDownAndHide: ; 795c9 (1e:55c9) call FillMemory jp Func_79652 -Func_795f8: ; 795f8 (1e:55f8) - ld a, [H_WHOSETURN] ; $fff3 +AnimationSlideMonLeft: ; 795f8 (1e:55f8) + ld a, [H_WHOSETURN] and a jr z, .asm_79602 hlCoord 12, 0 @@ -1898,7 +1895,7 @@ Func_795f8: ; 795f8 (1e:55f8) .asm_7960a ld c, $8 .asm_7960c - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a jr z, .asm_79616 call Func_7963c @@ -1915,7 +1912,7 @@ Func_795f8: ; 795f8 (1e:55f8) pop de dec b jr nz, .asm_7960a - ld a, [W_SUBANIMTRANSFORM] ; W_SUBANIMTRANSFORM + ld a, [W_SUBANIMTRANSFORM] ld c, a call DelayFrames pop hl @@ -1945,11 +1942,11 @@ AnimationSlideMonHalfLeft: ; 79645 (1e:5645) ld e, $4 ld a, $4 ld [W_SUBANIMTRANSFORM], a - call Func_795f8 + call AnimationSlideMonLeft jp Delay3 Func_79652: ; 79652 (1e:5652) - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a ld hl, vBackPic jr z, .asm_7965d @@ -2028,7 +2025,7 @@ AnimationSubstitute: ; 796e0 (1e:56e0) call FillMemory ld a, [$fff3] and a - jr z, .asm_79715 ; 0x796ed $26 + jr z, .asm_79715 ld hl, SlowbroSprite ; facing down sprite ld de, wTempPic + $120 call CopySlowbroSpriteData @@ -2065,13 +2062,13 @@ CopySlowbroSpriteData: ; 7973f (1e:573f) jp FarCopyData2 Func_79747: ; 79747 (1e:5747) - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a ld hl, wccf7 - ld a, [W_PLAYERBATTSTATUS2] ; W_PLAYERBATTSTATUS2 + ld a, [W_PLAYERBATTSTATUS2] jr z, .asm_79758 ld hl, wccf3 - ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2 + ld a, [W_ENEMYBATTSTATUS2] .asm_79758 push hl bit 4, a @@ -2102,7 +2099,7 @@ AnimationBoundUpAndDown: ; 7977a (1e:577a) call AnimationSlideMonDown pop bc dec c - jr nz, .asm_7977c ; 0x79782 $f8 + jr nz, .asm_7977c jp AnimationShowMonPic AnimationTransformMon: ; 79787 (1e:5787) @@ -2114,7 +2111,7 @@ AnimationTransformMon: ; 79787 (1e:5787) ld [wHPBarMaxHP], a Func_79793: ; 79793 (1e:5793) - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a jr z, .asm_797b0 ld a, [wHPBarMaxHP] @@ -2137,7 +2134,7 @@ Func_79793: ; 79793 (1e:5793) xor a call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount - call Func_79aae + call CopyPicTiles pop af ld [wBattleMonSpecies2], a .asm_797d3 @@ -2147,11 +2144,11 @@ Func_79793: ; 79793 (1e:5793) AnimationHideEnemyMonPic: ; 797d8 (1e:57d8) ; Hides the enemy mon's sprite xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba - ld hl, AnimationHideMonPic ; $5801 + ld [H_AUTOBGTRANSFERENABLED], a + ld hl, AnimationHideMonPic call CallWithTurnFlipped ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 Func_797e8: ; 797e8 (1e:57e8) @@ -2163,17 +2160,17 @@ Func_797e8: ; 797e8 (1e:57e8) pop bc xor a ld e, a - ld [W_BASECOORDX], a ; wd081 + ld [W_BASECOORDX], a ld hl, wOAMBuffer .asm_797fa - call Func_79329 + call Animations_79329 dec c jr nz, .asm_797fa ret AnimationHideMonPic: ; 79801 (1e:5801) ; Hides the mon's sprite. - ld a, [H_WHOSETURN] ; $fff3 + ld a, [H_WHOSETURN] and a jr z, .asm_7980a ld a, $c @@ -2269,13 +2266,15 @@ Func_79862: ; 79862 (1e:5862) jr nz, Func_79862 ret -Func_79869: ; 79869 (1e:5869) +; get the sound of the move id in b +GetMoveSoundB: ; 79869 (1e:5869) ld a, b - call Func_7986f + call GetMoveSound ld b, a ret -Func_7986f: ; 7986f (1e:586f) +; get the sound of the move id in a +GetMoveSound: ; 7986f (1e:586f) ld hl,MoveSoundTable ld e,a ld d,0 @@ -2496,7 +2495,7 @@ MoveSoundTable: ; 798bc (1e:58bc) db (SFX_08_4b - SFX_Headers_08) / 3,$00,$80 db (SFX_08_4b - SFX_Headers_08) / 3,$00,$80 -Func_79aae: ; 79aae (1e:5aae) +CopyPicTiles: ; 79aae (1e:5aae) ld a, [H_WHOSETURN] and a ld a, $31 ; base tile ID of player mon sprite @@ -2507,15 +2506,17 @@ Func_79aae: ; 79aae (1e:5aae) ld [hBaseTileID], a jr asm_79acb -Func_79aba: ; 79aba (1e:5aba) +; copy the tiles used when a mon is being sent out +; and "growing" out of the pokeball +CopyGrowingMonTiles: ; 79aba (1e:5aba) call GetPredefRegisters ld a, [wcd6c] and a jr nz, .asm_79ac8 - ld de, Unknown_79b02 ; $5b02 + ld de, Unknown_79b02 ; 5x5 jr asm_79acb .asm_79ac8 - ld de, Unknown_79b1b ; $5b1b + ld de, Unknown_79b1b ; 3x3 asm_79acb: ; 79acb (1e:5acb) xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -2811,7 +2812,7 @@ AnimationShakeEnemyHUD: ; 79d77 (1e:5d77) call Func_79e0d ld a, $38 ld [hWY], a - call Func_792fd + call _AnimationShakeEnemyHUD ld hl, vBGMap0 call Func_79e0d call AnimationHideMonPic @@ -2854,12 +2855,12 @@ Func_79de9: ; 79de9 (1e:5de9) ld a, [wTrainerSpriteOffset] add d ld [hSCX], a - ld c, $2 + ld c, 2 call DelayFrames ld a, [wTrainerSpriteOffset] sub d ld [hSCX], a - ld c, $2 + ld c, 2 call DelayFrames dec e jr nz, .asm_79dee @@ -2926,7 +2927,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ld [W_ANIMATIONID],a call PlayAnimation ld a,(SFX_08_43 - SFX_Headers_08) / 3 - call PlaySound ; play sound effect + call PlaySound ld a,BLOCKBALL_ANIM ld [W_ANIMATIONID],a jp PlayAnimation diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/bank_e_misc.asm index 6ef4065f..80fa971a 100755 --- a/engine/battle/bank_e_misc.asm +++ b/engine/battle/bank_e_misc.asm @@ -52,40 +52,40 @@ FormatMovesString: ; 39b87 (e:5b87) ret ; XXX this is called in a few places, but it doesn't appear to do anything useful -Func_39bd5: ; 39bd5 (e:5bd5) +InitList: ; 39bd5 (e:5bd5) ld a, [wd11b] cp $1 - jr nz, .asm_39be6 + jr nz, .notEnemy ld hl, wEnemyPartyCount ld de, wEnemyMonOT ld a, ENEMYOT_NAME - jr .asm_39c18 -.asm_39be6 + jr .done +.notEnemy cp $4 - jr nz, .calcAttackStat4 + jr nz, .notPlayer ld hl, wPartyCount ld de, wPartyMonOT ld a, PLAYEROT_NAME - jr .asm_39c18 -.calcAttackStat4 + jr .done +.notPlayer cp $5 - jr nz, .asm_39c02 + jr nz, .notMonster ld hl, wStringBuffer2 + 11 ld de, MonsterNames ld a, MONSTER_NAME - jr .asm_39c18 -.asm_39c02 + jr .done +.notMonster cp $2 - jr nz, .asm_39c10 + jr nz, .notBag ld hl, wNumBagItems ld de, ItemNames ld a, ITEM_NAME - jr .asm_39c18 -.asm_39c10 + jr .done +.notBag ld hl, wStringBuffer2 + 11 ld de, ItemNames ld a, ITEM_NAME -.asm_39c18 +.done ld [wNameListType], a ld a, l ld [wList], a diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index f1aa4161..b231459d 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -352,7 +352,7 @@ BattleTransition_FlashScreen_: ; 70b5d (1c:4b5d) cp $1 jr z, .done ld [rBGP], a - ld c, $2 + ld c, 2 call DelayFrames jr .loop .done @@ -389,13 +389,13 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f) call BattleTransition_CopyTiles2 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a - ld c, $6 + ld c, 6 call DelayFrames pop bc dec c jr nz, .loop call BattleTransition_BlackScreen - ld c, $a + ld c, 10 jp DelayFrames ; used for high level trainer dungeon battles @@ -427,7 +427,7 @@ BattleTransition_Split: ; 70bca (1c:4bca) dec c jr nz, .loop call BattleTransition_BlackScreen - ld c, $a + ld c, 10 jp DelayFrames BattleTransition_CopyTiles1: ; 70c12 (1c:4c12) diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 9a00bd98..6ba978b3 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -1,8 +1,8 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) - ld a, [W_ISINBATTLE] ; W_ISINBATTLE + ld a, [W_ISINBATTLE] dec a jr nz, .trainerBattle - ld a, [W_CURMAP] ; W_CURMAP + ld a, [W_CURMAP] cp POKEMONTOWER_3 jr c, .notPokemonTower cp LAVENDER_HOUSE_1 @@ -11,7 +11,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) ld a, [wEnemyMonSpecies2] call PlayCry ld hl, WildMonAppearedText - ld a, [W_MOVEMISSED] ; W_MOVEMISSED + ld a, [W_MOVEMISSED] and a jr z, .notFishing ld hl, HookedMonAttackedText @@ -19,7 +19,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) jr .wildBattle .trainerBattle call .playSFX - ld c, $14 + ld c, 20 call DelayFrames ld hl, TrainerWantsToFightText .wildBattle diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 0b1e8ea5..352a4677 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -177,7 +177,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld a, $31 ld [$ffe1], a hlCoord 1, 5 - predef Func_3f0c6 + predef CopyUncompressedPicToTilemap xor a ld [hWY], a ld [rWY], a @@ -620,7 +620,7 @@ HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd) or [hl] ret nz ; test if fainted call DrawHUDsAndHPBars - ld c, $14 + ld c, 20 call DelayFrames xor a ret @@ -823,7 +823,7 @@ HandleEnemyMonFainted: ; 3c525 (f:4525) ld [wcd6a], a jp MainInBattleLoop -FaintEnemyPokemon ; 0x3c567 +FaintEnemyPokemon: ; 0x3c567 call ReadPlayerMonCurHPAndStatus ld a, [W_ISINBATTLE] dec a @@ -1020,7 +1020,7 @@ TrainerBattleVictory: ; 3c696 (f:4696) cp LINK_STATE_BATTLING ret z call ScrollTrainerPicAfterBattle - ld c, $28 + ld c, 40 call DelayFrames call PrintEndBattleText ; win money @@ -1218,7 +1218,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) ld bc, $815 call ClearScreenArea call ScrollTrainerPicAfterBattle - ld c, $28 + ld c, 40 call DelayFrames ld hl, Sony1WinText call PrintText @@ -1506,7 +1506,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) ld a,$CF ld [$FFE1],a hlCoord 15, 6 - predef Func_3f073 + predef AnimateSendingOutMon ld a,[wEnemyMonSpecies2] call PlayCry call DrawEnemyHUDAndHPBar @@ -1836,7 +1836,7 @@ SendOutMon: ; 3cc91 (f:4c91) ld a, POOF_ANIM call PlayMoveAnimation hlCoord 4, 11 - predef Func_3f073 + predef AnimateSendingOutMon ld a, [wcf91] call PlayCry call PrintEmptyString @@ -1852,8 +1852,8 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) xor a ld [wcd6c], a ld [H_DOWNARROWBLINKCNT1], a - predef Func_79aba - ld c, $4 + predef CopyGrowingMonTiles + ld c, 4 call DelayFrames call .clearScreenArea hlCoord 4, 9 @@ -1862,7 +1862,7 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) ld [wcd6c], a xor a ld [H_DOWNARROWBLINKCNT1], a - predef Func_79aba + predef CopyGrowingMonTiles call Delay3 call .clearScreenArea ld a, $4c @@ -2110,12 +2110,12 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) ; the following simulates the keystrokes by drawing menus on screen hlCoord 9, 14 ld [hl], "▶" - ld c, $50 + ld c, 80 call DelayFrames ld [hl], $7f hlCoord 9, 16 ld [hl], "▶" - ld c, $32 + ld c, 50 call DelayFrames ld [hl], $ec ld a, $2 ; select the "ITEM" menu @@ -2490,7 +2490,7 @@ PartyMenuOrRockOrRun: SwitchPlayerMon: ; 3d1ba (f:51ba) callab RetreatMon - ld c, $32 + ld c, 50 call DelayFrames call AnimateRetreatingPlayerMon ld a, [wWhichPokemon] @@ -2815,7 +2815,7 @@ AnyMoveToSelect: ; 3d3f5 (f:53f5) .asm_3d423 ld hl, NoMovesLeftText call PrintText - ld c, $3c + ld c, 60 call DelayFrames xor a ret @@ -3232,7 +3232,7 @@ playPlayerMoveAnimation call nz,Bankswitch jr MirrorMoveCheck playerCheckIfFlyOrChargeEffect - ld c,$1E + ld c,30 call DelayFrames ld a,[W_PLAYERMOVEEFFECT] cp a,FLY_EFFECT @@ -3869,7 +3869,7 @@ ExclamationPoint5Text: ; 3db80 (f:5b80) ; if the move being used is in set [1-4] from ExclamationPointMoveSets, ; use ExclamationPoint[1-4]Text ; otherwise, use ExclamationPoint5Text -; but all five text strings are identical +; but all five text strings are identical ; this likely had to do with Japanese grammar that got translated, ; but the functionality didn't get removed DetermineExclamationPointTextNum: ; 3db85 (f:5b85) @@ -4004,7 +4004,7 @@ PrintCriticalOHKOText: ; 3dc5c (f:5c5c) xor a ld [wCriticalHitOrOHKO], a .done - ld c, $14 + ld c, 20 jp DelayFrames CriticalOHKOTextPointers: ; 3dc7a (f:5c7a) @@ -4691,7 +4691,7 @@ CriticalHitTest: ; 3e023 (f:6023) jr z, .calcCriticalHitProbability ld hl, W_ENEMYMOVEPOWER ld de, W_ENEMYBATTSTATUS2 -.calcCriticalHitProbability ; 0x3e04f +.calcCriticalHitProbability ld a, [hld] ; read base power from RAM and a ret z ; do nothing if zero @@ -5579,7 +5579,7 @@ CalcHitChance: ; 3e624 (f:6624) ; the second iteration multiplies by the evasion ratio .loop push bc - ld hl, StatModifierRatios ; $76cb ; stat modifier ratios + ld hl, StatModifierRatios ; stat modifier ratios dec b sla b ld c,b @@ -5785,7 +5785,7 @@ playEnemyMoveAnimation: ; 3e7a4 (f:67a4) EnemyCheckIfFlyOrChargeEffect: ; 3e7d1 (f:67d1) call SwapPlayerAndEnemyLevels - ld c, $1e + ld c, 30 call DelayFrames ld a, [W_ENEMYMOVEEFFECT] cp FLY_EFFECT @@ -6456,7 +6456,7 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) ld a, $31 ld [$ffe1], a hlCoord 1, 5 - predef_jump Func_3f0c6 + predef_jump CopyUncompressedPicToTilemap ; does nothing since no stats are ever selected (barring glitches) DoubleOrHalveSelectedStats: ; 3ed02 (f:6d02) @@ -6796,11 +6796,11 @@ BattleRandom: HandleExplodingAnimation: ; 3eed3 (f:6ed3) ld a, [H_WHOSETURN] and a - ld hl, wEnemyMonType1 ; wcfea + ld hl, wEnemyMonType1 ld de, W_ENEMYBATTSTATUS1 ld a, [W_PLAYERMOVENUM] jr z, .asm_3eeea - ld hl, wBattleMonType1 ; wd019 + ld hl, wBattleMonType1 ld de, W_ENEMYBATTSTATUS1 ld a, [W_ENEMYMOVENUM] .asm_3eeea @@ -6832,14 +6832,15 @@ PlayMoveAnimation: ; 3ef07 (f:6f07) InitBattle: ; 3ef12 (f:6f12) ld a, [W_CUROPPONENT] and a - jr z, asm_3ef23 + jr z, DetermineWildOpponent InitOpponent: ; 3ef18 (f:6f18) ld a, [W_CUROPPONENT] ld [wcf91], a ld [wEnemyMonSpecies2], a - jr asm_3ef3d -asm_3ef23: ; 3ef23 (f:6f23) + jr InitBattleCommon + +DetermineWildOpponent: ; 3ef23 (f:6f23) ld a, [wd732] bit 1, a jr z, .asm_3ef2f @@ -6852,7 +6853,7 @@ asm_3ef23: ; 3ef23 (f:6f23) ret nz callab TryDoWildEncounter ret nz -asm_3ef3d: ; 3ef3d (f:6f3d) +InitBattleCommon: ; 3ef3d (f:6f3d) ld a, [wMapPalOffset] push af ld hl, wd358 @@ -6874,7 +6875,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d) dec a ld [wAICount], a hlCoord 12, 0 - predef Func_3f0c6 + predef CopyUncompressedPicToTilemap ld a, $ff ld [wEnemyMonPartyPos], a ld a, $2 @@ -6928,7 +6929,7 @@ InitWildBattle: ; 3ef8b (f:6f8b) ld [W_TRAINERCLASS], a ld [$ffe1], a hlCoord 12, 0 - predef Func_3f0c6 + predef CopyUncompressedPicToTilemap ; common code that executes after init battle code specific to trainer or wild battles InitBattle_Common: ; 3efeb (f:6feb) @@ -6974,9 +6975,9 @@ InitBattle_Common: ; 3efeb (f:6feb) _LoadTrainerPic: ; 3f04b (f:704b) ; wd033-wd034 contain pointer to pic - ld a, [wTrainerPicPointer] ; wd033 + ld a, [wTrainerPicPointer] ld e, a - ld a, [wTrainerPicPointer + 1] ; wd034 + ld a, [wTrainerPicPointer + 1] ld d, a ; de contains pointer to trainer pic ld a, [wLinkState] and a @@ -6991,13 +6992,14 @@ _LoadTrainerPic: ; 3f04b (f:704b) jp LoadUncompressedSpriteData ; unreferenced -Func_3f069: ; 3f069 (f:7069) +ResetCryModifiers: ; 3f069 (f:7069) xor a ld [wc0f1], a ld [wc0f2], a jp PlaySound -Func_3f073: ; 3f073 (f:7073) +; animtes the mon "growing" out of the pokeball +AnimateSendingOutMon: ; 3f073 (f:7073) ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] @@ -7016,16 +7018,16 @@ Func_3f073: ; 3f073 (f:7073) ld a, $1 ld [wcd6c], a ld bc, $303 - predef Func_79aba - ld c, $4 + predef CopyGrowingMonTiles + ld c, 4 call DelayFrames ld bc, -41 add hl, bc xor a ld [wcd6c], a ld bc, $505 - predef Func_79aba - ld c, $5 + predef CopyGrowingMonTiles + ld c, 5 call DelayFrames ld bc, -41 jr .asm_3f0bf @@ -7035,15 +7037,15 @@ Func_3f073: ; 3f073 (f:7073) add hl, bc ld a, [H_DOWNARROWBLINKCNT1] add $31 - jr asm_3f0d0 + jr CopyUncompressedPicToHL -Func_3f0c6: ; 3f0c6 (f:70c6) +CopyUncompressedPicToTilemap: ; 3f0c6 (f:70c6) ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] ld l, a ld a, [$ffe1] -asm_3f0d0: ; 3f0d0 (f:70d0) +CopyUncompressedPicToHL: ; 3f0d0 (f:70d0) ld bc, $707 ld de, $14 push af @@ -7356,7 +7358,7 @@ PoisonEffect: ; 3f24f (f:724f) cp POISON_EFFECT ret nz .didntAffect - ld c, $32 + ld c, 50 call DelayFrames jp PrintDidntAffectText @@ -7652,7 +7654,7 @@ UpdateStat: ; 3f4c3 (f:74c3) UpdateStatDone: ; 3f4ca (f:74ca) ld b, c inc b - call Func_3f688 + call PrintStatText ld hl, W_PLAYERBATTSTATUS2 ld de, W_PLAYERMOVENUM ld bc, wccf7 @@ -7822,7 +7824,7 @@ StatModifierDownEffect: ; 3f54c (f:754c) jr nz, .recalculateStat ld a, [hl] and a - jp z, Func_3f64d + jp z, CantLowerAnymore_Pop .recalculateStat ; recalculate affected stat ; paralysis and burn penalties, as well as badge boosts are ignored @@ -7870,7 +7872,7 @@ UpdateLoweredStatDone: ; 3f62c (f:762c) ld b, c inc b push de - call Func_3f688 + call PrintStatText pop de ld a, [de] cp $44 @@ -7890,7 +7892,7 @@ UpdateLoweredStatDone: ; 3f62c (f:762c) call QuarterSpeedDueToParalysis jp HalveAttackDueToBurn -Func_3f64d: ; 3f64d (f:764d) +CantLowerAnymore_Pop: ; 3f64d (f:764d) pop de pop hl inc [hl] @@ -7933,7 +7935,7 @@ FellText: ; 3f683 (f:7683) TX_FAR _FellText db "@" -Func_3f688: ; 3f688 (f:7688) +PrintStatText: ; 3f688 (f:7688) ld hl, StatsTextStrings ld c, $50 .asm_3f68d @@ -8042,7 +8044,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) srl b cp b jr nc, .asm_3f76e - ld c, $32 + ld c, 50 call DelayFrames ld a, [W_PLAYERMOVENUM] cp TELEPORT @@ -8057,7 +8059,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) ld a, [W_PLAYERMOVENUM] jr .asm_3f7e4 .asm_3f77e - ld c, $32 + ld c, 50 call DelayFrames ld hl, IsUnaffectedText ld a, [W_PLAYERMOVENUM] @@ -8084,7 +8086,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) srl b cp b jr nc, .asm_3f7c1 - ld c, $32 + ld c, 50 call DelayFrames ld a, [W_ENEMYMOVENUM] cp TELEPORT @@ -8099,7 +8101,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) ld a, [W_ENEMYMOVENUM] jr .asm_3f7e4 .asm_3f7d1 - ld c, $32 + ld c, 50 call DelayFrames ld hl, IsUnaffectedText ld a, [W_ENEMYMOVENUM] @@ -8109,7 +8111,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739) .asm_3f7e4 push af call PlayBattleAnimation - ld c, $14 + ld c, 20 call DelayFrames pop af ld hl, RanFromBattleText @@ -8377,7 +8379,7 @@ BecameConfusedText: ; 3f9a1 (f:79a1) ConfusionEffectFailed: ; 3f9a6 (f:79a6) cp CONFUSION_SIDE_EFFECT ret z - ld c, $32 + ld c, 50 call DelayFrames jp ConditionalPrintButItFailed @@ -8424,7 +8426,7 @@ RageEffect: ; 3f9df (f:79df) ret MimicEffect: ; 3f9ed (f:79ed) - ld c, $32 + ld c, 50 call DelayFrames call MoveHitTest ld a, [W_MOVEMISSED] diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index fce3701c..ba47d8f3 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -1,7 +1,7 @@ DrawAllPokeballs: ; 3a849 (e:6849) call LoadPartyPokeballGfx call SetupOwnPartyPokeballs - ld a, [W_ISINBATTLE] ; W_ISINBATTLE + ld a, [W_ISINBATTLE] dec a ret z ; return if wild pokémon jp SetupEnemyPartyPokeballs @@ -11,7 +11,7 @@ DrawEnemyPokeballs: ; 0x3a857 jp SetupEnemyPartyPokeballs LoadPartyPokeballGfx: ; 3a85d (e:685d) - ld de, PokeballTileGraphics ; $697e + ld de, PokeballTileGraphics ld hl, vSprites + $310 ld bc, (BANK(PokeballTileGraphics) << 8) + $04 jp CopyVideoData @@ -19,10 +19,10 @@ LoadPartyPokeballGfx: ; 3a85d (e:685d) SetupOwnPartyPokeballs: ; 3a869 (e:6869) call PlacePlayerHUDTiles ld hl, wPartyMon1 - ld de, wPartyCount ; wPartyCount + ld de, wPartyCount call SetupPokeballs ld a, $60 - ld hl, W_BASECOORDX ; wd081 + ld hl, W_BASECOORDX ld [hli], a ld [hl], a ld a, $8 @@ -33,9 +33,9 @@ SetupOwnPartyPokeballs: ; 3a869 (e:6869) SetupEnemyPartyPokeballs: ; 3a887 (e:6887) call PlaceEnemyHUDTiles ld hl, wEnemyMons - ld de, wEnemyPartyCount ; wEnemyPartyCount + ld de, wEnemyPartyCount call SetupPokeballs - ld hl, W_BASECOORDX ; wd081 + ld hl, W_BASECOORDX ld a, $48 ld [hli], a ld [hl], $20 @@ -98,31 +98,31 @@ WritePokeballOAMData: ; 3a8e1 (e:68e1) ld de, wBuffer ld c, PARTY_LENGTH .loop - ld a, [W_BASECOORDY] ; wd082 + ld a, [W_BASECOORDY] ld [hli], a - ld a, [W_BASECOORDX] ; wd081 + ld a, [W_BASECOORDX] ld [hli], a ld a, [de] ld [hli], a xor a ld [hli], a - ld a, [W_BASECOORDX] ; wd081 + ld a, [W_BASECOORDX] ld b, a ld a, [wTrainerEngageDistance] add b - ld [W_BASECOORDX], a ; wd081 + ld [W_BASECOORDX], a inc de dec c jr nz, .loop ret PlacePlayerHUDTiles: ; 3a902 (e:6902) - ld hl, PlayerBattleHUDGraphicsTiles ; $6916 + ld hl, PlayerBattleHUDGraphicsTiles ld de, wTrainerFacingDirection ld bc, $3 call CopyData hlCoord 18, 10 - ld de, rIE ; $ffff + ld de, rIE jr PlaceHUDTiles PlayerBattleHUDGraphicsTiles: ; 3a916 (e:6916) @@ -132,7 +132,7 @@ PlayerBattleHUDGraphicsTiles: ; 3a916 (e:6916) db $6F ; lower-left triangle tile of the HUD PlaceEnemyHUDTiles: ; 3a919 (e:6919) - ld hl, EnemyBattleHUDGraphicsTiles ; $692d + ld hl, EnemyBattleHUDGraphicsTiles ld de, wTrainerFacingDirection ld bc, $3 call CopyData @@ -165,10 +165,10 @@ PlaceHUDTiles: ; 3a930 (e:6930) SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) call LoadPartyPokeballGfx - ld hl, wPartyMon1Species ; wPartyMon1Species (aliases: wPartyMon1) - ld de, wPartyCount ; wPartyCount + ld hl, wPartyMons + ld de, wPartyCount call SetupPokeballs - ld hl, W_BASECOORDX ; wd081 + ld hl, W_BASECOORDX ld a, $50 ld [hli], a ld [hl], $40 @@ -176,10 +176,10 @@ SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) ld [wTrainerEngageDistance], a ld hl, wOAMBuffer call WritePokeballOAMData - ld hl, wEnemyMons ; wEnemyMon1Species - ld de, wEnemyPartyCount ; wEnemyPartyCount + ld hl, wEnemyMons + ld de, wEnemyPartyCount call SetupPokeballs - ld hl, W_BASECOORDX ; wd081 + ld hl, W_BASECOORDX ld a, $50 ld [hli], a ld [hl], $68 diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index 5d78af5b..d1452770 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -21,7 +21,7 @@ EndOfBattle: ; 137aa (4:77aa) .placeWinOrLoseString hlCoord 6, 8 call PlaceString - ld c, $c8 + ld c, 200 call DelayFrames jr .evolution .notLinkBattle diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm index f01e61cc..20a0c07e 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -12,7 +12,7 @@ FocusEnergyEffect_: ; 27f86 (9:7f86) ld hl, GettingPumpedText jp PrintText .alreadyUsing - ld c, $32 + ld c, 50 call DelayFrames ld hl, PrintButItFailedText_ ld b, BANK(PrintButItFailedText_) diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/moveEffects/leech_seed_effect.asm index 284ca2c0..1b0afe4b 100644 --- a/engine/battle/moveEffects/leech_seed_effect.asm +++ b/engine/battle/moveEffects/leech_seed_effect.asm @@ -23,12 +23,12 @@ LeechSeedEffect_: ; 2bea9 (a:7ea9) jr nz, .moveMissed set Seeded, [hl] callab PlayCurrentMoveAnimation - ld hl, WasSeededText ; $7ef2 + ld hl, WasSeededText jp PrintText .moveMissed - ld c, $32 + ld c, 50 call DelayFrames - ld hl, EvadedAttackText ; $7ef7 + ld hl, EvadedAttackText jp PrintText WasSeededText: ; 2bef2 (a:7ef2) diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index 7da98699..df34827f 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -27,7 +27,7 @@ ReflectLightScreenEffect_: ; 3bb97 (e:7b97) pop hl jp PrintText .moveFailed - ld c, $32 + ld c, 50 call DelayFrames ld hl, PrintButItFailedText_ jp BankswitchEtoF diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm index dae4ad42..ed227984 100644 --- a/engine/battle/scale_sprites.asm +++ b/engine/battle/scale_sprites.asm @@ -41,16 +41,16 @@ ScaleFirstThreeSpriteColumnsByTwo: ; 2fe55 (b:7e55) ScaleLastSpriteColumnByTwo: ; 2fe7d (b:7e7d) ld a, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows - ld [H_SPRITEINTERLACECOUNTER], a ; $ff8b - ld bc, -1 ; $ffff + ld [H_SPRITEINTERLACECOUNTER], a + ld bc, -1 .columnInnerLoop ld a, [de] dec de swap a ; only high nybble contains information call ScalePixelsByTwo - ld a, [H_SPRITEINTERLACECOUNTER] ; $ff8b + ld a, [H_SPRITEINTERLACECOUNTER] dec a - ld [H_SPRITEINTERLACECOUNTER], a ; $ff8b + ld [H_SPRITEINTERLACECOUNTER], a jr nz, .columnInnerLoop dec de ; skip last 4 rows of new column dec de diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 8edf1920..59611ef1 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -40,7 +40,7 @@ AIEnemyTrainerChooseMoves: ; 39719 (e:5719) and a jr z, .loopFindMinimumEntries push hl - ld hl, AIMoveChoiceModificationFunctionPointers ; $57a3 + ld hl, AIMoveChoiceModificationFunctionPointers dec a add a ld c, a @@ -81,7 +81,7 @@ AIEnemyTrainerChooseMoves: ; 39719 (e:5719) .filterMinimalEntries ; all minimal entries now have value 1. All other slots will be disabled (move set to 0) ld a, [de] and a - jr nz, .moveExisting ; 0x3978a $1 + jr nz, .moveExisting ld [hl], a .moveExisting ld a, [hl] @@ -145,7 +145,7 @@ AIMoveChoiceModification1: ; 397ab (e:57ab) ld [hl], a jr .nextMove -StatusAilmentMoveEffects ; 57e2 +StatusAilmentMoveEffects: ; 57e2 db $01 ; unused sleep effect db SLEEP_EFFECT db POISON_EFFECT @@ -337,7 +337,6 @@ INCLUDE "data/trainer_moves.asm" INCLUDE "data/trainer_parties.asm" TrainerAI: ; 3a52e (e:652e) -;XXX called at 34964, 3c342, 3c398 and a ld a,[W_ISINBATTLE] dec a @@ -553,7 +552,7 @@ DecrementAICount: ; 3a695 (e:6695) scf ret -Func_3a69b: ; 3a69b (e:669b) +AIPlayRestoringSFX: ; 3a69b (e:669b) ld a,(SFX_08_3e - SFX_Headers_08) / 3 jp PlaySoundWaitForCurrent @@ -712,7 +711,7 @@ AIBattleWithdrawText: ; 3a781 (e:6781) db "@" AIUseFullHeal: ; 3a786 (e:6786) - call Func_3a69b + call AIPlayRestoringSFX call AICureStatus ld a,FULL_HEAL jp AIPrintItemUse @@ -731,21 +730,21 @@ AICureStatus: ; 3a791 (e:6791) ret AIUseXAccuracy: ; 0x3a7a8 unused - call Func_3a69b + call AIPlayRestoringSFX ld hl,W_ENEMYBATTSTATUS2 set 0,[hl] ld a,X_ACCURACY jp AIPrintItemUse AIUseGuardSpec: ; 3a7b5 (e:67b5) - call Func_3a69b + call AIPlayRestoringSFX ld hl,W_ENEMYBATTSTATUS2 set 1,[hl] ld a,GUARD_SPEC_ jp AIPrintItemUse AIUseDireHit: ; 0x3a7c2 unused - call Func_3a69b + call AIPlayRestoringSFX ld hl,W_ENEMYBATTSTATUS2 set 2,[hl] ld a,DIRE_HIT diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 2cfb1734..3cbc0867 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -2,7 +2,7 @@ ; In the Colosseum, it starts a battle. In the Trade Centre, it displays the trade selection screen. ; Before doing either action, it swaps random numbers, trainer names and party data with the other gameboy. CableClub_DoBattleOrTrade: ; 5317 (1:5317) - ld c, $50 + ld c, 80 call DelayFrames call ClearScreen call UpdateSprites @@ -359,7 +359,7 @@ TradeCenter_SelectMon: .displayEnemyMonStats ld a, $1 ld [wd11b], a - callab Func_39bd5 + callab InitList ld hl, wEnemyMons call TradeCenter_DisplayStats jp .getNewInput @@ -418,7 +418,7 @@ TradeCenter_SelectMon: ; unreachable code ld a, $4 ld [wd11b], a - callab Func_39bd5 + callab InitList call TradeCenter_DisplayStats jp .getNewInput .playerMonMenu_ANotPressed @@ -513,7 +513,7 @@ TradeCenter_SelectMon: ld [wCurrentMenuItem], a ld a, $4 ld [wd11b], a - callab Func_39bd5 + callab InitList call TradeCenter_DisplayStats call LoadScreenTilesFromBuffer1 jp .playerMonMenu diff --git a/engine/evolution.asm b/engine/evolution.asm index 7ae88fdf..76537530 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -1,4 +1,4 @@ -Func_7bde9: ; 7bde9 (1e:7de9) +EvolveMon: ; 7bde9 (1e:7de9) push hl push de push bc @@ -13,17 +13,17 @@ Func_7bde9: ; 7bde9 (1e:7de9) ld [wc0ee], a call PlaySound ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld a, (SFX_08_3c - SFX_Headers_08) / 3 call PlaySound call Delay3 xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld [hTilesetType], a ld a, [wHPBarMaxHP] ld [wcf1d], a ld c, $0 - call Func_7beb4 + call EvolutionSetWholeScreenPalette ld a, [wHPBarMaxHP + 1] ld [wcf91], a ld [wd0b5], a @@ -37,23 +37,23 @@ Func_7bde9: ; 7bde9 (1e:7de9) ld [wd0b5], a call Func_7beb9 ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld a, [wHPBarMaxHP] call PlayCry call WaitForSoundToFinish ld c, BANK(Music_SafariZone) ld a, MUSIC_SAFARI_ZONE call PlayMusic - ld c, $50 + ld c, 80 call DelayFrames ld c, $1 - call Func_7beb4 + call EvolutionSetWholeScreenPalette ld bc, $110 .asm_7be63 push bc - call asm_7befa + call Func_7befa jr c, .asm_7bea9 - call asm_7bec2 + call Func_7bec2 pop bc inc b dec c @@ -73,7 +73,7 @@ Func_7bde9: ; 7bde9 (1e:7de9) ld a, [wcf1d] call PlayCry ld c, $0 - call Func_7beb4 + call EvolutionSetWholeScreenPalette pop af ld [wd0b5], a pop af @@ -93,7 +93,7 @@ Func_7bde9: ; 7bde9 (1e:7de9) ld a, [wHPBarMaxHP] jr .asm_7be81 -Func_7beb4: ; 7beb4 (1e:7eb4) +EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) ld b, $b jp GoPAL_SET @@ -101,7 +101,8 @@ Func_7beb9: ; 7beb9 (1e:7eb9) call GetMonHeader hlCoord 7, 2 jp LoadFlippedFrontSpriteByMonIndex -asm_7bec2: ; 7bec2 (1e:7ec2) + +Func_7bec2: ; 7bec2 (1e:7ec2) ld a, $31 ld [wHPBarOldHP], a call Func_7bed6 @@ -109,13 +110,13 @@ asm_7bec2: ; 7bec2 (1e:7ec2) ld [wHPBarOldHP], a call Func_7bed6 dec b - jr nz, asm_7bec2 + jr nz, Func_7bec2 ret Func_7bed6: ; 7bed6 (1e:7ed6) push bc xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a hlCoord 7, 2 ld bc, $707 ld de, $d @@ -132,11 +133,12 @@ Func_7bed6: ; 7bed6 (1e:7ed6) dec b jr nz, .asm_7bee3 ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 pop bc ret -asm_7befa: ; 7befa (1e:7efa) + +Func_7befa: ; 7befa (1e:7efa) call DelayFrame push bc call JoypadLowSensitivity @@ -146,7 +148,7 @@ asm_7befa: ; 7befa (1e:7efa) jr nz, .asm_7bf0d .asm_7bf08 dec c - jr nz, asm_7befa + jr nz, Func_7befa and a ret .asm_7bf0d diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm index ec230677..c7297527 100755 --- a/engine/evolve_trade.asm +++ b/engine/evolve_trade.asm @@ -31,9 +31,9 @@ EvolveTradeMon: ; 17d7d (5:7d7d) ret nz .ok - ld a, [wPartyCount] ; wPartyCount + ld a, [wPartyCount] dec a - ld [wWhichPokemon], a ; wWhichPokemon + ld [wWhichPokemon], a ld a, $1 ld [wccd4], a ld a, LINK_STATE_TRADING diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 23bffa8d..bddaffe5 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -117,7 +117,7 @@ Evolution_PartyMonLoop: ; loop over party mons call CopyStringToCF4B ld hl, IsEvolvingText call PrintText - ld c, $32 + ld c, 50 call DelayFrames xor a ld [H_AUTOBGTRANSFERENABLED], a @@ -129,7 +129,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, $ff ld [wUpdateSpritesEnabled], a call ClearSprites - callab Func_7bde9 + callab EvolveMon jp c, CancelledEvolution ld hl, EvolvedText call PrintText @@ -149,7 +149,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, (SFX_02_3b - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent call WaitForSoundToFinish - ld c, $28 + ld c, 40 call DelayFrames call ClearScreen call RenameEvolvedMon @@ -407,13 +407,13 @@ WriteMonMoves: ; 3afb8 (e:6fb8) and a jp z, .done ; end of list ld b, a - ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL + ld a, [W_CURENEMYLVL] cp b jp c, .done ; mon level < move level (assumption: learnset is sorted by level) ld a, [wHPBarMaxHP] and a jr z, .skipMinLevelCheck - ld a, [wWhichTrade] ; wWhichTrade (min move level) + ld a, [wWhichTrade] ; min move level) cp b jr nc, .nextMove2 ; min level >= move level .skipMinLevelCheck diff --git a/engine/experience.asm b/engine/experience.asm index 68d22843..752536cf 100755 --- a/engine/experience.asm +++ b/engine/experience.asm @@ -38,19 +38,19 @@ CalcExperience: ; 58f6a (16:4f6a) add hl, bc call CalcDSquared ld a, d - ld [H_MULTIPLIER], a ; $ff99 + ld [H_MULTIPLIER], a call Multiply ld a, [hl] and $f0 swap a - ld [H_MULTIPLIER], a ; $ff99 + ld [H_MULTIPLIER], a call Multiply ld a, [hli] and $f - ld [H_DIVISOR], a ; $ff99 + ld [H_DIVISOR], a ld b, $4 call Divide - ld a, [H_MULTIPLICAND] ; $ff96 (aliases: H_NUMTOPRINT) + ld a, [H_MULTIPLICAND] ; (aliases: H_NUMTOPRINT) push af ld a, [H_MULTIPLICAND+1] push af @@ -59,9 +59,9 @@ CalcExperience: ; 58f6a (16:4f6a) call CalcDSquared ld a, [hl] and $7f - ld [H_MULTIPLIER], a ; $ff99 + ld [H_MULTIPLIER], a call Multiply - ld a, [H_MULTIPLICAND] ; $ff96 (aliases: H_NUMTOPRINT) + ld a, [H_MULTIPLICAND] ; (aliases: H_NUMTOPRINT) push af ld a, [H_MULTIPLICAND+1] push af @@ -70,7 +70,7 @@ CalcExperience: ; 58f6a (16:4f6a) ld a, [hli] push af xor a - ld [H_MULTIPLICAND], a ; $ff96 + ld [H_MULTIPLICAND], a ld [H_MULTIPLICAND+1], a ld a, d ld [H_MULTIPLICAND+2], a @@ -85,9 +85,9 @@ CalcExperience: ; 58f6a (16:4f6a) ld a, [H_MULTIPLICAND+1] sbc b ld [H_MULTIPLICAND+1], a - ld a, [H_MULTIPLICAND] ; $ff96 + ld a, [H_MULTIPLICAND] sbc b - ld [H_MULTIPLICAND], a ; $ff96 + ld [H_MULTIPLICAND], a pop af and $80 jr nz, .subtractSquaredTerm ; check sign @@ -135,11 +135,11 @@ CalcExperience: ; 58f6a (16:4f6a) ; calculates d*d CalcDSquared: ; 59010 (16:5010) xor a - ld [H_MULTIPLICAND], a ; $ff96 (aliases: H_NUMTOPRINT) + ld [H_MULTIPLICAND], a ; (aliases: H_NUMTOPRINT) ld [H_MULTIPLICAND+1], a ld a, d ld [H_MULTIPLICAND+2], a - ld [H_MULTIPLIER], a ; $ff99 (aliases: H_DIVISOR, H_REMAINDER, H_POWEROFTEN) + ld [H_MULTIPLIER], a ; (aliases: H_DIVISOR, H_REMAINDER, H_POWEROFTEN) jp Multiply ; each entry has the following scheme: diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index d0f1bbac..32dda60e 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -1,25 +1,25 @@ LoadShootingStarGraphics: ; 70000 (1c:4000) ld a, $f9 - ld [rOBP0], a ; $ff48 + ld [rOBP0], a ld a, $a4 - ld [rOBP1], a ; $ff49 - ld de, AnimationTileset2 + $30 ; $471e ; star tile (top left quadrant) + ld [rOBP1], a + ld de, AnimationTileset2 + $30 ; star tile (top left quadrant) ld hl, vChars1 + $200 ld bc, (BANK(AnimationTileset2) << 8) + $01 call CopyVideoData - ld de, AnimationTileset2 + $130 ; $481e ; star tile (bottom left quadrant) + ld de, AnimationTileset2 + $130 ; star tile (bottom left quadrant) ld hl, vChars1 + $210 ld bc, (BANK(AnimationTileset2) << 8) + $01 call CopyVideoData - ld de, FallingStar ; $4190 + ld de, FallingStar ld hl, vChars1 + $220 ld bc, (BANK(FallingStar) << 8) + $01 call CopyVideoData - ld hl, GameFreakLogoOAMData ; $4140 + ld hl, GameFreakLogoOAMData ld de, wOAMBuffer + $60 ld bc, $40 call CopyData - ld hl, GameFreakShootingStarOAMData ; $4180 + ld hl, GameFreakShootingStarOAMData ld de, wOAMBuffer ld bc, $10 jp CopyData @@ -66,7 +66,7 @@ AnimateShootingStar: ; 70044 (1c:4044) jr nz, .asm_7007b ld b, $3 .asm_70083 - ld hl, rOBP0 ; $ff48 + ld hl, rOBP0 rrc [hl] rrc [hl] ld c, $a @@ -78,15 +78,15 @@ AnimateShootingStar: ; 70044 (1c:4044) ld a, $18 .asm_70098 push af - ld hl, OAMData_700ee ; $40ee + ld hl, OAMData_700ee ld bc, $4 call CopyData pop af dec a jr nz, .asm_70098 xor a - ld [wWhichTrade], a ; wWhichTrade - ld hl, PointerTable_700f2 ; $40f2 + ld [wWhichTrade], a + ld hl, PointerTable_700f2 ld c, $6 .asm_700af ld a, [hli] @@ -110,11 +110,11 @@ AnimateShootingStar: ; 70044 (1c:4044) inc hl dec c jr nz, .asm_700ba - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] cp $18 jr z, .asm_700d5 add $6 - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a .asm_700d5 call Func_7011f push af @@ -174,7 +174,7 @@ Func_7011f: ; 7011f (1c:411f) ld b, $8 .asm_70121 ld hl, wOAMBuffer + $5c - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] ld de, $fffc ld c, a .asm_7012b @@ -182,9 +182,9 @@ Func_7011f: ; 7011f (1c:411f) add hl, de dec c jr nz, .asm_7012b - ld a, [rOBP1] ; $ff49 + ld a, [rOBP1] xor $a0 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a ld c, $3 call CheckForUserInterruption ret c diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 64876d22..0d451bf6 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -2,14 +2,14 @@ _GivePokemon: ; 4fda5 (13:7da5) call EnableAutoTextBoxDrawing xor a ld [wccd3], a - ld a, [wPartyCount] ; wPartyCount + ld a, [wPartyCount] cp PARTY_LENGTH jr c, .asm_4fe01 - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] cp MONS_PER_BOX jr nc, .asm_4fdf9 xor a - ld [W_ENEMYBATTSTATUS3], a ; W_ENEMYBATTSTATUS3 + ld [W_ENEMYBATTSTATUS3], a ld a, [wcf91] ld [wEnemyMonSpecies2], a callab LoadEnemyMonData @@ -56,7 +56,7 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11) ld a, [wd11e] dec a ld c, a - ld hl, wPokedexOwned ; wPokedexOwned + ld hl, wPokedexOwned ld b, $1 predef FlagActionPredef pop af diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 30979118..7882a226 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -11,7 +11,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld a, $7f call FillMemory call EnableLCD - ld hl, rLCDC ; $ff40 + ld hl, rLCDC set 3, [hl] xor a ld hl, wHallOfFame @@ -24,7 +24,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld [wd358], a ld [wTrainerScreenY], a inc a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld hl, wd5a2 ld a, [hl] inc a @@ -45,17 +45,17 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) inc c push hl push bc - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a ld a, c ld [wTrainerEngageDistance], a - ld hl, wPartyMon1Level ; wPartyMon1Level + ld hl, wPartyMon1Level ld bc, wPartyMon2 - wPartyMon1 call AddNTimes ld a, [hl] ld [wTrainerFacingDirection], a call Func_70278 call Func_702e1 - ld c, $50 + ld c, 80 call DelayFrames hlCoord 2, 13 ld b, $3 @@ -79,15 +79,15 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld [hl], $ff call SaveHallOfFameTeams xor a - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a inc a ld [wTrainerScreenY], a call Func_70278 - call Func_70377 + call HoFDisplayPlayerStats call Func_70423 xor a ld [hWY], a - ld hl, rLCDC ; $ff40 + ld hl, rLCDC res 3, [hl] ret @@ -100,7 +100,7 @@ Func_70278: ; 70278 (1c:4278) ld [hSCY], a ld a, $c0 ld [hSCX], a - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] ld [wcf91], a ld [wd0b5], a ld [wBattleMonSpecies2], a @@ -108,7 +108,7 @@ Func_70278: ; 70278 (1c:4278) ld a, [wTrainerScreenY] and a jr z, .asm_7029d - call Func_7033e + call HoFLoadPlayerPics jr .asm_702ab .asm_7029d hlCoord 12, 5 @@ -120,7 +120,7 @@ Func_70278: ; 70278 (1c:4278) ld c, $0 call GoPAL_SET ld a, $e4 - ld [rBGP], a ; $ff47 + ld [rBGP], a ld c, $31 call Func_7036d ld d, $a0 @@ -148,7 +148,7 @@ Func_70278: ; 70278 (1c:4278) Func_702e1: ; 702e1 (1c:42e1) ld a, [wTrainerEngageDistance] - ld hl, wPartyMonNicks ; wPartyMonNicks + ld hl, wPartyMonNicks call GetPartyMonName call Func_702f0 jp Func_70404 @@ -167,11 +167,11 @@ Func_702f0: ; 702f0 (1c:42f0) ld a, [wTrainerFacingDirection] hlCoord 8, 7 call PrintLevelCommon - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] ld [wd0b5], a hlCoord 3, 9 predef PrintMonType - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] jp PlayCry HoFMonInfoText: ; 70329 (1c:4329) @@ -179,8 +179,8 @@ HoFMonInfoText: ; 70329 (1c:4329) next "TYPE1/" next "TYPE2/@" -Func_7033e: ; 7033e (1c:433e) - ld de, RedPicFront ; $6ede +HoFLoadPlayerPics: ; 7033e (1c:433e) + ld de, RedPicFront ld a, BANK(RedPicFront) call UncompressSpriteFromDE ld hl, S_SPRITEBUFFER1 @@ -189,7 +189,7 @@ Func_7033e: ; 7033e (1c:433e) call CopyData ld de, vFrontPic call InterlaceMergeSpriteBuffers - ld de, RedPicBack ; $7e0a + ld de, RedPicBack ld a, BANK(RedPicBack) call UncompressSpriteFromDE predef ScaleSpriteByTwo @@ -202,7 +202,7 @@ Func_7036d: ; 7036d (1c:436d) hlCoord 12, 5 predef_jump CopyTileIDsFromList -Func_70377: ; 70377 (1c:4377) +HoFDisplayPlayerStats: ; 70377 (1c:4377) ld hl, wd747 set 3, [hl] predef DisplayDexRating @@ -215,7 +215,7 @@ Func_70377: ; 70377 (1c:4377) ld c, $9 call TextBoxBorder hlCoord 7, 2 - ld de, wPlayerName ; wd158 + ld de, wPlayerName call PlaceString hlCoord 1, 6 ld de, HoFPlayTimeText @@ -233,18 +233,18 @@ Func_70377: ; 70377 (1c:4377) ld de, HoFMoneyText call PlaceString hlCoord 4, 10 - ld de, wPlayerMoney ; wPlayerMoney + ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber ld hl, DexSeenOwnedText - call Func_703e2 + call HoFPrintTextAndDelay ld hl, DexRatingText - call Func_703e2 + call HoFPrintTextAndDelay ld hl, wcc5d -Func_703e2: ; 703e2 (1c:43e2) +HoFPrintTextAndDelay: ; 703e2 (1c:43e2) call PrintText - ld c, $78 + ld c, 120 jp DelayFrames HoFPlayTimeText: ; 703ea (1c:43ea) @@ -266,7 +266,7 @@ Func_70404: ; 70404 (1c:4404) ld bc, HOF_MON ld a, [wTrainerEngageDistance] call AddNTimes - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] ld [hli], a ld a, [wTrainerFacingDirection] ld [hli], a diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 69f3c7f4..822f59a5 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -61,7 +61,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ; Displays a pokemon's front sprite in a pop-up window. ; [wcf91] = pokemon interal id number ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a ld [hWY], a @@ -78,7 +78,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ld a, $80 ld [$ffe1], a hlCoord 10, 11 - predef Func_3f073 + predef AnimateSendingOutMon call WaitForTextScrollButtonPress call LoadScreenTilesFromBuffer1 call Delay3 @@ -125,10 +125,10 @@ LinkCableHelp: ; 5dc29 (17:5c29) call PrintText call HandleMenuInput bit 1, a - jr nz, .asm_5dc93 ; 0x5dc74 $1d + jr nz, .asm_5dc93 ld a, [wCurrentMenuItem] cp $3 - jr z, .asm_5dc93 ; 0x5dc7b $16 + jr z, .asm_5dc93 ld hl, wd730 res 6, [hl] ld hl, LinkCableInfoTexts @@ -316,7 +316,7 @@ VermilionGymTrashText: ; 5ddf7 (17:5df7) GymTrashScript: ; 5ddfc (17:5dfc) call EnableAutoTextBoxDrawing - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] ld [wcd5b], a ; Don't do the trash can puzzle if it's already been done. @@ -345,7 +345,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) ld hl, wd773 set 1, [hl] - ld hl, GymTrashCans ; $5e7d + ld hl, GymTrashCans ld a, [wcd5b] ; * 5 ld b, a diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index 7696626f..a378adcc 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -14,16 +14,16 @@ GymStatues: ; 62419 (18:6419) cp $ff ret z cp b - jr z, .asm_62433 ; 0x6242e $3 + jr z, .asm_62433 inc hl - jr .asm_62429 ; 0x62431 $f6 + jr .asm_62429 .asm_62433 ld b, [hl] ld a, [wd72a] and b cp b ld a, $d - jr z, .asm_6243f ; 0x6243b $2 + jr z, .asm_6243f ld a, $c .asm_6243f jp PrintPredefTextID @@ -143,7 +143,7 @@ SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4) ld a, [wd838] bit 7, a ld hl, SaffronCityPokecenterBenchGuyText2 - jr nz, .asm_624f2 ; 0x624ed $3 + jr nz, .asm_624f2 ld hl, SaffronCityPokecenterBenchGuyText1 .asm_624f2 call PrintText diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index f97190de..ce6d901f 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -40,29 +40,29 @@ StrengthsAndWeaknessesText: ; 1e983 (7:6983) SafariZoneCheck: ; 1e988 (7:6988) ld hl, wd790 bit 7, [hl] - jr z, asm_1e9ab - ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS + jr z, SafariZoneGameOver + ld a, [W_NUMSAFARIBALLS] and a - jr z, asm_1e9b0 - jr asm_1e9ab + jr z, SafariZoneGameStillGoing + jr SafariZoneGameOver SafariZoneCheckSteps: ; 1e997 (7:6997) - ld a, [wSafariSteps] ; wd70d + ld a, [wSafariSteps] ld b, a - ld a, [wSafariSteps + 1] ; wd70e + ld a, [wSafariSteps + 1] ld c, a or b - jr z, asm_1e9b0 + jr z, SafariZoneGameStillGoing dec bc ld a, b - ld [wSafariSteps], a ; wd70d + ld [wSafariSteps], a ld a, c - ld [wSafariSteps + 1], a ; wd70e -asm_1e9ab: ; 1e9ab (7:69ab) + ld [wSafariSteps + 1], a +SafariZoneGameOver: ; 1e9ab (7:69ab) xor a ld [wSafariZoneGameOver], a ret -asm_1e9b0: ; 1e9b0 (7:69b0) +SafariZoneGameStillGoing: ; 1e9b0 (7:69b0) call EnableAutoTextBoxDrawing xor a ld [wMusicHeaderPointer], a @@ -76,12 +76,12 @@ asm_1e9b0: ; 1e9b0 (7:69b0) cp $b9 jr nz, .asm_1e9c2 ld a, $d3 - ld [H_DOWNARROWBLINKCNT2], a ; $ff8c + ld [H_DOWNARROWBLINKCNT2], a call DisplayTextID xor a ld [wd528], a ld a, SAFARI_ZONE_ENTRANCE - ld [H_DOWNARROWBLINKCNT1], a ; $ff8b + ld [H_DOWNARROWBLINKCNT1], a ld a, $3 ld [wDestinationWarpID], a ld a, $5 @@ -100,7 +100,7 @@ PrintSafariGameOverText: ; 1e9ed (7:69ed) SafariGameOverText: ; 1e9f7 (7:69f7) db $08 ; asm - ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS + ld a, [W_NUMSAFARIBALLS] and a jr z, .asm_1ea04 ld hl, TimesUpText @@ -130,7 +130,7 @@ CinnabarGymQuiz: ; 1ea25 (7:6a25) db $08 ; asm xor a ld [wda38], a - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] push af and $f ld [$ffdb], a @@ -200,7 +200,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) call YesNoChoice ld a, [$ffdc] ld c, a - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] cp c jr nz, .asm_1eab8 ld hl, wd126 @@ -267,7 +267,7 @@ CinnabarGymQuiz_1eb0a: ; 1eb0a (7:6b0a) add a ld d, $0 ld e, a - ld hl, CinnabarGymGateCoords ; $6b48 + ld hl, CinnabarGymGateCoords add hl, de ld a, [hli] ld b, [hl] @@ -337,22 +337,22 @@ BillsHousePC: ; 1eb6e (7:6b6e) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, $2e call PrintPredefTextID - ld c, $20 + ld c, 32 call DelayFrames ld a, (SFX_02_3c - SFX_Headers_02) / 3 call PlaySound call WaitForSoundToFinish - ld c, $50 + ld c, 80 call DelayFrames ld a, (SFX_02_48 - SFX_Headers_02) / 3 call PlaySound call WaitForSoundToFinish - ld c, $30 + ld c, 48 call DelayFrames ld a, (SFX_02_3c - SFX_Headers_02) / 3 call PlaySound call WaitForSoundToFinish - ld c, $20 + ld c, 32 call DelayFrames ld a, (SFX_02_3a - SFX_Headers_02) / 3 call PlaySound @@ -379,12 +379,12 @@ BillsHouseInitiatedText: ; 1ebe2 (7:6be2) ld a, $ff ld [wc0ee], a call PlaySound - ld c, $10 + ld c, 16 call DelayFrames ld a, (SFX_02_49 - SFX_Headers_02) / 3 call PlaySound call WaitForSoundToFinish - ld c, $3c + ld c, 60 call DelayFrames jp TextScriptEnd diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index 333b0b90..61209778 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -143,7 +143,7 @@ UpdateHPBar_AnimateHPBar: ; fab1 (3:7ab1) push de ld d, $6 call DrawHPBar - ld c, $2 + ld c, 2 call DelayFrames pop de ld a, [wHPBarDelta] ; +1 or -1 diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index cb03a074..32b55002 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -22,7 +22,7 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) pop af ld l,a ld h,$0 - ld de,InGameTradeTextPointers ; $5d64 + ld de,InGameTradeTextPointers add hl,hl add hl,de ld a,[hli] diff --git a/engine/intro.asm b/engine/intro.asm index 7c0464d3..2043771d 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -106,12 +106,12 @@ PlayIntroScene: ; 4169d (10:569d) call PlaySound xor a ld [wd09f], a - ld de, IntroNidorinoAnimation4 ; $5931 + ld de, IntroNidorinoAnimation4 call AnimateIntroNidorino ; hop ld a, (SFX_1f_60 - SFX_Headers_1f) / 3 call PlaySound - ld de, IntroNidorinoAnimation5 ; $593c + ld de, IntroNidorinoAnimation5 call AnimateIntroNidorino ld c, $14 call CheckForUserInterruption @@ -119,7 +119,7 @@ PlayIntroScene: ; 4169d (10:569d) ld a, $24 ld [wd09f], a - ld de, IntroNidorinoAnimation6 ; $5947 + ld de, IntroNidorinoAnimation6 call AnimateIntroNidorino ld c, $1e call CheckForUserInterruption @@ -130,17 +130,17 @@ PlayIntroScene: ; 4169d (10:569d) call PlaySound ld a, $48 ld [wd09f], a - ld de, IntroNidorinoAnimation7 ; $5950 + ld de, IntroNidorinoAnimation7 jp AnimateIntroNidorino AnimateIntroNidorino: ; 41793 (10:5793) ld a, [de] cp $50 ret z - ld [W_BASECOORDY], a ; wd082 + ld [W_BASECOORDY], a inc de ld a, [de] - ld [W_BASECOORDX], a ; wd081 + ld [W_BASECOORDX], a push de ld c, $24 call Func_417ae @@ -155,10 +155,10 @@ Func_417ae: ; 417ae (10:57ae) ld a, [wd09f] ld d, a .asm_417b5 - ld a, [W_BASECOORDY] ; wd082 + ld a, [W_BASECOORDY] add [hl] ld [hli], a - ld a, [W_BASECOORDX] ; wd081 + ld a, [W_BASECOORDX] add [hl] ld [hli], a ld a, d @@ -174,14 +174,14 @@ Func_417c7: ; 417c7 (10:57c7) ld d, $0 .asm_417cc push bc - ld a, [W_BASECOORDY] ; wd082 + ld a, [W_BASECOORDY] ld e, a .asm_417d1 ld a, e add $8 ld e, a ld [hli], a - ld a, [W_BASECOORDX] ; wd081 + ld a, [W_BASECOORDX] ld [hli], a ld a, d ld [hli], a @@ -190,9 +190,9 @@ Func_417c7: ; 417c7 (10:57c7) inc d dec c jr nz, .asm_417d1 - ld a, [W_BASECOORDX] ; wd081 + ld a, [W_BASECOORDX] add $8 - ld [W_BASECOORDX], a ; wd081 + ld [W_BASECOORDX], a pop bc dec b jr nz, .asm_417cc @@ -236,9 +236,9 @@ Func_4180e: ; 4180e (10:580e) .asm_4181d push de ld a, $2 - ld [W_BASECOORDX], a ; wd081 + ld [W_BASECOORDX], a xor a - ld [W_BASECOORDY], a ; wd082 + ld [W_BASECOORDY], a ld c, $24 call Func_417ae pop de @@ -265,27 +265,27 @@ CopyTileIDsFromList_ZeroBaseTileID: ; 41842 (10:5842) predef_jump CopyTileIDsFromList Func_41849: ; 41849 (10:5849) - predef Func_79869 + predef GetMoveSoundB ld a, b jp PlaySound LoadIntroGraphics: ; 41852 (10:5852) - ld hl, FightIntroBackMon ; $5a99 + ld hl, FightIntroBackMon ld de, vChars2 ld bc, $600 ld a, BANK(FightIntroBackMon) call FarCopyData2 - ld hl, GameFreakIntro ; $5959 + ld hl, GameFreakIntro ld de, vChars2 + $600 ld bc, $140 ld a, BANK(GameFreakIntro) call FarCopyData2 - ld hl, GameFreakIntro ; $5959 + ld hl, GameFreakIntro ld de, vChars1 ld bc, $140 ld a, BANK(GameFreakIntro) call FarCopyData2 - ld hl, FightIntroFrontMon ; $6099 + ld hl, FightIntroFrontMon ld de, vChars0 ld bc, $6c0 ld a, BANK(FightIntroFrontMon) @@ -296,26 +296,26 @@ PlayShootingStar: ; 4188a (10:588a) call GoPAL_SET callba LoadCopyrightAndTextBoxTiles ld a, $e4 - ld [rBGP], a ; $ff47 - ld c, $b4 + ld [rBGP], a + ld c, 180 call DelayFrames call ClearScreen call DisableLCD xor a - ld [W_CUROPPONENT], a ; wd059 + ld [W_CUROPPONENT], a call Func_418e9 call LoadIntroGraphics call EnableLCD - ld hl, rLCDC ; $ff40 + ld hl, rLCDC res 5, [hl] set 3, [hl] - ld c, $40 + ld c, 64 call DelayFrames callba AnimateShootingStar push af pop af jr c, .asm_418d0 - ld c, $28 + ld c, 40 call DelayFrames .asm_418d0 ld a, BANK(Music_IntroBattle) diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index d7e5b3ce..96abecd3 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -22,23 +22,23 @@ HiddenItemNear: ; 7481f (1d:481f) inc hl ld e, [hl] inc hl - jr nz, .asm_74824 ; 0x74845 $dd + jr nz, .asm_74824 ld a, [W_YCOORD] call Func_7486b cp d - jr nc, .asm_74824 ; 0x7484e $d4 + jr nc, .asm_74824 ld a, [W_YCOORD] add $4 cp d - jr c, .asm_74824 ; 0x74856 $cc + jr c, .asm_74824 ld a, [W_XCOORD] call Func_7486b cp e - jr nc, .asm_74824 ; 0x7485f $c3 + jr nc, .asm_74824 ld a, [W_XCOORD] add $5 cp e - jr c, .asm_74824 ; 0x74867 $bb + jr c, .asm_74824 scf ret diff --git a/engine/items/items.asm b/engine/items/items.asm index 21e6e924..ea4b7403 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -115,7 +115,7 @@ ItemUseBall: ; d687 (3:5687) ld a,[W_NUMINBOX] ;is Box full? cp a,MONS_PER_BOX jp z,BoxFullCannotThrowBall -.UseBall ;$56a7 +.UseBall ;ok, you can use a ball xor a ld [wd11c],a @@ -126,7 +126,7 @@ ItemUseBall: ; d687 (3:5687) ; remove a Safari Ball from inventory ld hl,W_NUMSAFARIBALLS dec [hl] -.skipSafariZoneCode ;$56b6 +.skipSafariZoneCode call GoPAL_SET_CF1C ld a,$43 ld [wd11e],a @@ -144,8 +144,8 @@ ItemUseBall: ; d687 (3:5687) ld de,wPlayerName ld bc,11 call CopyData ; save the player's name in the Wild Monster data (part of the Cinnabar Island Missingno glitch) - jp .BallSuccess ;$578b -.notOldManBattle ;$56e9 + jp .BallSuccess +.notOldManBattle ld a,[W_CURMAP] cp a,POKEMONTOWER_6 jr nz,.loop @@ -155,13 +155,13 @@ ItemUseBall: ; d687 (3:5687) jp z,.next12 ; if not fighting ghost Marowak, loop until a random number in the current ; pokeball's allowed range is found -.loop ;$56fa +.loop call Random ld b,a ld hl,wcf91 ld a,[hl] cp a,MASTER_BALL - jp z,.BallSuccess ;$578b + jp z,.BallSuccess cp a,POKE_BALL jr z,.checkForAilments ld a,200 @@ -173,7 +173,7 @@ ItemUseBall: ; d687 (3:5687) ld a,150 ;get only numbers <= 150 for Ultra Ball cp b jr c,.loop -.checkForAilments ;$571a +.checkForAilments ; pokemon can be caught more easily with any (primary) status ailment ; Frozen/Asleep pokemon are relatively even easier to catch ; for Frozen/Asleep pokemon, any random number from 0-24 ensures a catch. @@ -185,12 +185,12 @@ ItemUseBall: ; d687 (3:5687) ld c,12 jr z,.notFrozenOrAsleep ld c,25 -.notFrozenOrAsleep ;$5728 +.notFrozenOrAsleep ld a,b sub c - jp c,.BallSuccess ;$578b + jp c,.BallSuccess ld b,a -.noAilments ;$572e +.noAilments push bc ;save RANDOM number xor a ld [H_MULTIPLICAND],a @@ -207,7 +207,7 @@ ItemUseBall: ; d687 (3:5687) ld a,12 ;any other BallFactor jr nz,.next7 ld a,8 -.next7 ;$574d +.next7 ld [H_DIVISOR],a ld b,4 ; number of bytes in dividend call Divide @@ -226,7 +226,7 @@ ItemUseBall: ; d687 (3:5687) and a jr nz,.next8 inc a -.next8 ;$5766 +.next8 ld [H_DIVISOR],a ld b,4 call Divide ; ((MaxHP * 255) / BallFactor) / (CurHP / 4) @@ -235,7 +235,7 @@ ItemUseBall: ; d687 (3:5687) jr z,.next9 ld a,255 ld [H_QUOTIENT + 3],a -.next9 ;$5776 +.next9 pop bc ld a,[wEnemyMonCatchRate] ;enemy: Catch Rate cp b @@ -248,9 +248,9 @@ ItemUseBall: ; d687 (3:5687) ld a,[H_QUOTIENT + 3] cp b jr c,.next10 -.BallSuccess ;$578b +.BallSuccess jr .BallSuccess2 -.next10 ;$578d +.next10 ld a,[H_QUOTIENT + 3] ld [wd11e],a xor a @@ -271,7 +271,7 @@ ItemUseBall: ; d687 (3:5687) ld b,150 cp a,ULTRA_BALL jr z,.next11 -.next11 ;$57b8 +.next11 ld a,b ld [H_DIVISOR],a ld b,4 @@ -294,11 +294,11 @@ ItemUseBall: ; d687 (3:5687) ld b,5 jr z,.next14 ld b,10 -.next14 ;$57e6 +.next14 ld a,[H_QUOTIENT + 3] add b ld [H_QUOTIENT + 3],a -.next13 ;$57eb +.next13 ld a,[H_QUOTIENT + 3] cp a,10 ld b,$20 @@ -310,10 +310,10 @@ ItemUseBall: ; d687 (3:5687) ld b,$62 jr c,.next12 ld b,$63 -.next12 ;$5801 +.next12 ld a,b ld [wd11e],a -.BallSuccess2 ;$5805 +.BallSuccess2 ld c,20 call DelayFrames ld a,TOSS_ANIM @@ -362,14 +362,14 @@ ItemUseBall: ; d687 (3:5687) ld a,$4c ld [wEnemyMonSpecies2],a jr .next16 -.next15 ;$5871 +.next15 set Transformed,[hl] ld hl,wcceb ld a,[wEnemyMonDVs] ld [hli],a ld a,[wEnemyMonDVs + 1] ld [hl],a -.next16 ;$587e +.next16 ld a,[wcf91] push af ld a,[wEnemyMonSpecies2] @@ -419,7 +419,7 @@ ItemUseBall: ; d687 (3:5687) ld a,[wEnemyMonSpecies] ;caught mon_ID ld [wd11e],a predef ShowPokedexData -.checkParty ;$58f4 +.checkParty ld a,[wPartyCount] cp a,PARTY_LENGTH ;is party full? jr z,.sendToBox @@ -428,7 +428,7 @@ ItemUseBall: ; d687 (3:5687) call ClearSprites call AddPartyMon ;add mon to Party jr .End -.sendToBox ;$5907 +.sendToBox call ClearSprites call SendNewMonToBox ld hl,ItemUseBallText07 @@ -436,22 +436,22 @@ ItemUseBall: ; d687 (3:5687) bit 0,a ;already met Bill? jr nz,.sendToBox2 ld hl,ItemUseBallText08 -.sendToBox2 ;$591a +.sendToBox2 call PrintText jr .End -.printText1 ;$591f +.printText1 ld hl,ItemUseBallText05 -.printText0 ;$5922 +.printText0 call PrintText call ClearSprites -.End ;$5928 +.End ld a,[W_BATTLETYPE] and a ret nz ld hl,wNumBagItems inc a ld [wcf96],a - jp RemoveItemFromInventory ;remove ITEM (XXX) + jp RemoveItemFromInventory ItemUseBallText00: ; d937 (3:5937) ;"It dodged the thrown ball!" ;"This pokemon can't be caught" @@ -645,8 +645,8 @@ ItemUseEvoStone: ; da5b (3:5a5b) ld a,$01 ld [wccd4],a ld a,(SFX_02_3e - SFX_Headers_02) / 3 - call PlaySoundWaitForCurrent ; play sound - call WaitForSoundToFinish ; wait for sound to end + call PlaySoundWaitForCurrent + call WaitForSoundToFinish callab TryEvolvingMon ; try to evolve pokemon ld a,[wd121] and a @@ -918,7 +918,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld bc,2 * 20 call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled ld a,(SFX_02_3d - SFX_Headers_02) / 3 - call PlaySoundWaitForCurrent ; play sound + call PlaySoundWaitForCurrent ld a,[hFlags_0xFFF6] set 0,a ld [hFlags_0xFFF6],a @@ -1068,7 +1068,7 @@ ItemUseMedicine: ; dabb (3:5abb) cp a,FULL_HEAL jr z,.playStatusAilmentCuringSound ld a,(SFX_02_3d - SFX_Headers_02) / 3 ; HP healing sound - call PlaySoundWaitForCurrent ; play sound + call PlaySoundWaitForCurrent ld a,[hFlags_0xFFF6] set 0,a ld [hFlags_0xFFF6],a @@ -1179,7 +1179,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld bc,10 call CopyData ; copy the stat's name to wcf4b ld a,(SFX_02_3e - SFX_Headers_02) / 3 - call PlaySound ; play sound + call PlaySound ld hl,VitaminStatRoseText call PrintText jp RemoveUsedItem @@ -1722,7 +1722,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215) call PlaySound ; turn off music ld a, (SFX_02_5e - SFX_Headers_02) / 3 ld c, BANK(SFX_02_5e) - call PlayMusic ; play music + call PlayMusic .musicWaitLoop ; wait for music to finish playing ld a,[wc028] cp a,$b8 @@ -1747,7 +1747,7 @@ OldRodCode: ; e24c (3:624c) jp c, ItemUseNotTime ld bc, (5 << 8) | MAGIKARP ld a, $1 ; set bite - jr RodResponse ; 0xe257 $34 + jr RodResponse GoodRodCode: ; e259 (3:6259) call FishingInit @@ -1780,7 +1780,7 @@ INCLUDE "data/good_rod.asm" SuperRodCode: ; e283 (3:6283) call FishingInit jp c, ItemUseNotTime - call ReadSuperRodData ; 0xe8ea + call ReadSuperRodData ld a, e RodResponse: ; e28d (3:628d) ld [wWhichTrade], a @@ -1825,7 +1825,7 @@ FishingInit: ; e2b4 (3:62b4) ld hl,ItemUseText00 call PrintText ld a,(SFX_02_3e - SFX_Headers_02) / 3 - call PlaySound ; play sound + call PlaySound ld c,80 call DelayFrames and a @@ -1848,9 +1848,9 @@ ItemUseItemfinder: ; e2e1 (3:62e1) ld c,4 .loop ld a,(SFX_02_4a - SFX_Headers_02) / 3 - call PlaySoundWaitForCurrent ; play sound + call PlaySoundWaitForCurrent ld a,(SFX_02_5a - SFX_Headers_02) / 3 - call PlaySoundWaitForCurrent ; play sound + call PlaySoundWaitForCurrent dec c jr nz,.loop ld hl,ItemfinderFoundItemText @@ -2147,7 +2147,7 @@ ItemUseTMHM: ; e479 (3:6479) jr nz,.checkIfAlreadyLearnedMove ; if the pokemon can't learn the move ld a,(SFX_02_51 - SFX_Headers_02) / 3 - call PlaySoundWaitForCurrent ; play sound + call PlaySoundWaitForCurrent ld hl,MonCannotLearnMachineMoveText call PrintText jr .chooseMon @@ -2187,7 +2187,7 @@ PrintItemUseTextAndRemoveItem: ; e563 (3:6563) ld hl,ItemUseText00 call PrintText ld a,(SFX_02_3e - SFX_Headers_02) / 3 - call PlaySound ; play sound + call PlaySound call WaitForTextScrollButtonPress ; wait for button press RemoveUsedItem: ; e571 (3:6571) @@ -2568,7 +2568,7 @@ IsKeyItem_: ; e764 (3:6764) INCLUDE "data/key_items.asm" SendNewMonToBox: ; e7a4 (3:67a4) - ld de, W_NUMINBOX ; wda80 + ld de, W_NUMINBOX ld a, [de] inc a ld [de], a @@ -2587,7 +2587,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) call GetMonHeader ld hl, wBoxMonOT ld bc, $b - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] dec a jr z, .asm_e7ee dec a @@ -2598,7 +2598,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld d, h ld e, l pop hl - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] dec a ld b, a .asm_e7db @@ -2615,11 +2615,11 @@ SendNewMonToBox: ; e7a4 (3:67a4) dec b jr nz, .asm_e7db .asm_e7ee - ld hl, wPlayerName ; wd158 + ld hl, wPlayerName ld de, wBoxMonOT ld bc, $b call CopyData - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] dec a jr z, .asm_e82a ld hl, wBoxMonNicks @@ -2632,7 +2632,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld d, h ld e, l pop hl - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] dec a ld b, a .asm_e817 @@ -2653,7 +2653,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld a, $2 ld [wd07d], a predef AskName - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] dec a jr z, .asm_e867 ld hl, wBoxMons @@ -2666,7 +2666,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld d, h ld e, l pop hl - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] dec a ld b, a .asm_e854 @@ -2683,13 +2683,13 @@ SendNewMonToBox: ; e7a4 (3:67a4) dec b jr nz, .asm_e854 .asm_e867 - ld a, [wEnemyMonLevel] ; wEnemyMonLevel + ld a, [wEnemyMonLevel] ld [wEnemyMonBoxLevel], a ld hl, wEnemyMon ld de, wBoxMon1 ld bc, $c call CopyData - ld hl, wPlayerID ; wPlayerID + ld hl, wPlayerID ld a, [hli] ld [de], a inc de @@ -2697,11 +2697,11 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld [de], a inc de push de - ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL + ld a, [W_CURENEMYLVL] ld d, a callab CalcExperience pop de - ld a, [H_NUMTOPRINT] ; $ff96 (aliases: H_MULTIPLICAND) + ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) ld [de], a inc de ld a, [$ff97] @@ -2723,7 +2723,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) inc de ld a, [hli] ld [de], a - ld hl, wEnemyMonPP ; wcffe + ld hl, wEnemyMonPP ld b, $4 .asm_e8b1 ld a, [hli] @@ -2777,7 +2777,7 @@ ReadSuperRodData: ; e8ea (3:68ea) ld e, $2 ; $2 if no fishing groups found ret -.ReadFishingGroup ; 0xe8f6 +.ReadFishingGroup ; hl points to the fishing group entry in the index inc hl ; skip map id @@ -2790,7 +2790,7 @@ ReadSuperRodData: ; e8ea (3:68ea) inc hl ; point to data ld e, $0 ; no bite yet -.RandomLoop ; 0xe90c +.RandomLoop call Random srl a ret c ; 50% chance of no battle diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm index 7c5c56fa..4decc82d 100755 --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm @@ -6,7 +6,7 @@ GetMachinePrice: ; 7bf86 (1e:7f86) sub TM_01 ret c ld d, a - ld hl, TechnicalMachinePrices ; $7fa7 + ld hl, TechnicalMachinePrices srl a ld c, a ld b, 0 @@ -17,9 +17,9 @@ GetMachinePrice: ; 7bf86 (1e:7f86) swap a .highNybbleIsPrice and $f0 - ld [H_DOWNARROWBLINKCNT2], a ; $ff8c + ld [H_DOWNARROWBLINKCNT2], a xor a - ld [H_DOWNARROWBLINKCNT1], a ; $ff8b + ld [H_DOWNARROWBLINKCNT1], a ld [$ff8d], a ret diff --git a/engine/load_pokedex_tiles.asm b/engine/load_pokedex_tiles.asm index e8205ef8..5c1f1c93 100755 --- a/engine/load_pokedex_tiles.asm +++ b/engine/load_pokedex_tiles.asm @@ -1,11 +1,11 @@ ; Loads tile patterns for tiles used in the pokedex. LoadPokedexTilePatterns: ; 17840 (5:7840) call LoadHpBarAndStatusTilePatterns - ld de,PokedexTileGraphics ; $6488 + ld de,PokedexTileGraphics ld hl,vChars2 + $600 ld bc,(BANK(PokedexTileGraphics) << 8) + $12 call CopyVideoData - ld de,PokeballTileGraphics ; $697e + ld de,PokeballTileGraphics ld hl,vChars2 + $720 ld bc,(BANK(PokeballTileGraphics) << 8) + $01 jp CopyVideoData ; load pokeball tile for marking caught mons diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 61e6204e..3018529a 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -357,7 +357,7 @@ BoxNoPCText: ; 21713 (8:5713) Func_2171b:: ; 2171b (8:571b) ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 - jr .asm_21729 ; 0x21721 $6 + jr .asm_21729 ld hl, wBoxMon1Moves ld bc, wBoxMon2 - wBoxMon1 .asm_21729 @@ -375,7 +375,7 @@ Func_2171b:: ; 2171b (8:571b) pop hl ret c dec b - jr nz, .asm_21731 ; 0x21741 $ee + jr nz, .asm_21731 and a ret diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 1624ed70..067cd7d2 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -7,7 +7,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ld hl, wd730 set 6, [hl] call DisableLCD - ld hl, CircleTile ; $7d88 + ld hl, CircleTile ld de, vChars2 + $700 ld bc, $0010 ld a, BANK(CircleTile) @@ -15,7 +15,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ld hl, wTileMap ld bc, $1012 predef Diploma_TextBoxBorder - ld hl, DiplomaTextPointersAndCoords ; $6784 + ld hl, DiplomaTextPointersAndCoords ld c, $5 .asm_56715 push bc @@ -32,7 +32,7 @@ DisplayDiploma: ; 566e2 (15:66e2) inc hl pop bc dec c - jr nz, .asm_56715 ; 0x56725 $ee + jr nz, .asm_56715 hlCoord 10, 4 ld de, wPlayerName call PlaceString @@ -48,7 +48,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ld [hli], a inc hl dec c - jr nz, .asm_5673e ; 0x56747 $f5 + jr nz, .asm_5673e call EnableLCD callba LoadTrainerInfoTextBoxTiles ld b, $8 @@ -73,7 +73,7 @@ Func_56777: ; 56777 (15:6777) cp $50 ret z dec c - jr .asm_5677d ; 0x56782 $f9 + jr .asm_5677d DiplomaTextPointersAndCoords: ; 56784 (15:6784) dw DiplomaText diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 756c7755..f0628367 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -52,7 +52,7 @@ MainMenu: ; 5af2 (1:5af2) .next2 ld hl,wd730 res 6,[hl] - call UpdateSprites ; OAM? + call UpdateSprites xor a ld [wCurrentMenuItem],a ld [wLastMenuItem],a @@ -208,7 +208,7 @@ LinkMenu: ; 5c0a (1:5c0a) ld a, b ld [wLinkMenuSelectionSendBuffer], a and $3 - ld [wCurrentMenuItem], a ; wCurrentMenuItem + ld [wCurrentMenuItem], a .doneChoosingMenuSelection ld a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK @@ -261,14 +261,14 @@ LinkMenu: ; 5c0a (1:5c0a) ld [wd72d], a ld hl, PleaseWaitText call PrintText - ld c, $32 + ld c, 50 call DelayFrames ld hl, wd732 res 1, [hl] ld a, [W_ANIMATIONID] ld [wDestinationMap], a call SpecialWarpIn - ld c, $14 + ld c, 20 call DelayFrames xor a ld [wMenuJoypadPollCount], a @@ -304,7 +304,7 @@ Func_5d52: ; 5d52 (1:5d52) ld hl, wd732 res 1, [hl] call OakSpeech - ld c, $14 + ld c, 20 call DelayFrames ; enter map after using a special warp or loading the game from the main menu @@ -338,7 +338,7 @@ TradeCenterText: ; 5d97 (1:5d97) ContinueGame: ; 5db5 (1:5db5) xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a hlCoord 4, 7 ld b, $8 ld c, $e @@ -347,7 +347,7 @@ ContinueGame: ; 5db5 (1:5db5) ld de, SaveScreenInfoText call PlaceString hlCoord 12, 9 - ld de, wPlayerName ; wd158 + ld de, wPlayerName call PlaceString hlCoord 17, 11 call Func_5e2f @@ -356,8 +356,8 @@ ContinueGame: ; 5db5 (1:5db5) hlCoord 13, 15 call Func_5e55 ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba - ld c, $1e + ld [H_AUTOBGTRANSFERENABLED], a + ld c, 30 jp DelayFrames PrintSaveScreenText: ; 5def (1:5def) @@ -383,7 +383,7 @@ PrintSaveScreenText: ; 5def (1:5def) call Func_5e55 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a - ld c, $1e + ld c, 30 jp DelayFrames Func_5e2f: ; 5e2f (1:5e2f) @@ -398,7 +398,7 @@ Func_5e2f: ; 5e2f (1:5e2f) Func_5e42: ; 5e42 (1:5e42) push hl - ld hl, wPokedexOwned ; wPokedexOwned + ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits pop hl @@ -481,7 +481,7 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) jr nz,.loop .exitMenu ld a,(SFX_02_40 - SFX_Headers_02) / 3 - call PlaySound ; play sound + call PlaySound ret .eraseOldMenuCursor ld [wTopMenuItemX],a diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index df862d69..bd1c39dd 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -195,7 +195,7 @@ DisplayNamingScreen: ; 6596 (1:6596) .asm_667e pop de - ld de, .asm_65ed ; $65ed + ld de, .asm_65ed push de .asm_6683 ld a, [wHPBarOldHP] @@ -231,10 +231,10 @@ DisplayNamingScreen: ; 6596 (1:6596) call CalcStringLength ld a, [wHPBarNewHP] cp $e5 - ld de, Dakutens ; $6885 + ld de, Dakutens jr z, .asm_66e3 cp $e4 - ld de, Handakutens ; $68d6 + ld de, Handakutens jr z, .asm_66e3 ld a, [wd07d] cp $2 @@ -332,12 +332,12 @@ ED_Tile: ; 6767 (1:6767) PrintAlphabet: ; 676f (1:676f) xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld a, [wHPBarOldHP] and a - ld de, LowerCaseAlphabet ; $679e + ld de, LowerCaseAlphabet jr nz, .asm_677e - ld de, UpperCaseAlphabet ; $67d6 + ld de, UpperCaseAlphabet .asm_677e hlCoord 2, 5 ld bc, $509 @@ -357,7 +357,7 @@ PrintAlphabet: ; 676f (1:676f) jr nz, .asm_6784 call PlaceString ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 LowerCaseAlphabet: ; 679e (1:679e) diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm index 6e7edda2..7ff03c46 100755 --- a/engine/menu/oaks_pc.asm +++ b/engine/menu/oaks_pc.asm @@ -5,7 +5,7 @@ OpenOaksPC: ; 1e915 (7:6915) ld hl, GetDexRatedText call PrintText call YesNoChoice - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] and a jr nz, .asm_1e932 predef DisplayDexRating diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 242edd40..6b365e2b 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -21,7 +21,7 @@ DrawPartyMenu_: ; 12cd2 (4:6cd2) xor a ld [H_AUTOBGTRANSFERENABLED],a call ClearScreen - call UpdateSprites ; move sprites + call UpdateSprites callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics RedrawPartyMenu_: ; 12ce3 (4:6ce3) diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm index 97895ca6..edc8a751 100755 --- a/engine/menu/pc.asm +++ b/engine/menu/pc.asm @@ -1,13 +1,13 @@ ActivatePC: ; 17e2c (5:7e2c) - call SaveScreenTilesToBuffer2 ;XXX: copy background from wTileMap to wTileMapBackup2 + call SaveScreenTilesToBuffer2 ld a, (SFX_02_45 - SFX_Headers_02) / 3 - call PlaySound ;XXX: play sound or stop music + call PlaySound ld hl, TurnedOnPC1Text call PrintText - call WaitForSoundToFinish ;XXX: wait for sound to be done + call WaitForSoundToFinish ld hl, wFlags_0xcd60 set 3, [hl] - call LoadScreenTilesFromBuffer2 ;XXX: restore saved screen + call LoadScreenTilesFromBuffer2 call Delay3 PCMainMenu: ; 17e48 (5:7e48) callba Func_213c8 @@ -52,28 +52,28 @@ PCMainMenu: ; 17e48 (5:7e48) res 5, [hl] set 3, [hl] ld a, (SFX_02_47 - SFX_Headers_02) / 3 - call PlaySound ;XXX: play sound or stop music - call WaitForSoundToFinish ;XXX: wait for sound to be done + call PlaySound + call WaitForSoundToFinish ld hl, AccessedMyPCText call PrintText callba PlayerPC jr ReloadMainMenu OaksPC: ; 17ec0 (5:7ec0) ld a, (SFX_02_47 - SFX_Headers_02) / 3 - call PlaySound ;XXX: play sound or stop music - call WaitForSoundToFinish ;XXX: wait for sound to be done + call PlaySound + call WaitForSoundToFinish callba OpenOaksPC jr ReloadMainMenu PKMNLeague: ; 17ed2 (5:7ed2) ld a, (SFX_02_47 - SFX_Headers_02) / 3 - call PlaySound ;XXX: play sound or stop music - call WaitForSoundToFinish ;XXX: wait for sound to be done + call PlaySound + call WaitForSoundToFinish callba PKMNLeaguePC jr ReloadMainMenu BillsPC: ; 17ee4 (5:7ee4) ld a, (SFX_02_47 - SFX_Headers_02) / 3 - call PlaySound ;XXX: play sound or stop music - call WaitForSoundToFinish ;XXX: wait for sound to be done + call PlaySound + call WaitForSoundToFinish ld a, [wd7f1] ;has to do with having met Bill bit 0, a jr nz, .billsPC ;if you've met bill, use that bill's instead of someone's @@ -88,12 +88,12 @@ ReloadMainMenu: ; 17f06 (5:7f06) xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a call ReloadMapData - call UpdateSprites ;XXX: moves sprites + call UpdateSprites jp PCMainMenu LogOff: ; 17f13 (5:7f13) ld a, (SFX_02_46 - SFX_Headers_02) / 3 - call PlaySound ;XXX: play sound or stop music - call WaitForSoundToFinish ;XXX: wait for sound to be done + call PlaySound + call WaitForSoundToFinish ld hl, wFlags_0xcd60 res 3, [hl] res 5, [hl] @@ -117,7 +117,7 @@ AccessedMyPCText: ; 17f32 (5:7f32) ; removes one of the specified item ID [$FFdb] from bag (if existent) RemoveItemByID: ; 17f37 (5:7f37) - ld hl, wBagItems ; wd31e + ld hl, wBagItems ld a, [$ffdb] ld b, a xor a @@ -137,6 +137,6 @@ RemoveItemByID: ; 17f37 (5:7f37) ld a, $1 ld [wcf96], a ld a, [$ffdc] - ld [wWhichPokemon], a ; wWhichPokemon - ld hl, wNumBagItems ; wNumBagItems + ld [wWhichPokemon], a + ld hl, wNumBagItems jp RemoveItemFromInventory diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 7d8457f3..e2e53d45 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -1,7 +1,7 @@ ShowPokedexMenu: ; 40000 (10:4000) call GBPalWhiteOut call ClearScreen - call UpdateSprites ; move sprites + call UpdateSprites ld a,[wListScrollOffset] push af xor a @@ -140,7 +140,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) .choseCry ld a,[wd11e] call GetCryData ; get cry data - call PlaySound ; play sound + call PlaySound jr .handleMenuInput .choseArea predef LoadTownMap_Nest ; display pokemon areas diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index 0e904200..d12308f8 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -79,7 +79,7 @@ GetPrizeMenuId: ; 5278e (14:678e) inc hl push hl ld hl,W_PRIZE1 - call CopyString ; XXX what does this do + call CopyString pop hl ld a,[hli] ld h,[hl] @@ -152,7 +152,7 @@ PrintPrizePrice: ; 5287a (14:687a) ld b,$01 ld c,$07 call TextBoxBorder - call UpdateSprites ; XXX save OAM? + call UpdateSprites hlCoord 12, 0 ld de,.CoinText call PlaceString diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index da17822b..0db0d052 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -1,7 +1,7 @@ DisplayStartMenu:: ; 2acd (0:2acd) - ld a,$04 ; hardcoded Bank, not sure what's it refers to + ld a,BANK(StartMenu_Pokedex) ld [H_LOADEDROMBANK],a - ld [$2000],a ; ROM bank 4 + ld [MBC1RomBank],a ld a,[wWalkBikeSurfState] ; walking/biking/surfing ld [wWalkBikeSurfStateCopy],a ld a, (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound @@ -10,7 +10,7 @@ DisplayStartMenu:: ; 2acd (0:2acd) RedisplayStartMenu:: ; 2adf (0:2adf) callba DrawStartMenu callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone - call UpdateSprites ; move sprites + call UpdateSprites .loop call HandleMenuInput ld b,a diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 589224ab..b84657d5 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -325,7 +325,7 @@ StartMenu_Item: ; 13302 (4:7302) .exitMenu call LoadScreenTilesFromBuffer2 ; restore saved screen call LoadTextBoxTilePatterns - call UpdateSprites ; move sprites + call UpdateSprites jp RedisplayStartMenu .choseItem ; erase menu cursor (blank each tile in front of an item name) @@ -499,7 +499,7 @@ UsableItems_CloseMenu: ; 13459 (4:7459) StartMenu_TrainerInfo: ; 13460 (4:7460) call GBPalWhiteOut call ClearScreen - call UpdateSprites ; move sprites + call UpdateSprites ld a,[hTilesetType] push af xor a @@ -535,25 +535,25 @@ DrawTrainerInfo: ; 1349a (4:749a) ld de,vChars2 ld bc,$70 * 4 call CopyData - ld hl,TrainerInfoTextBoxTileGraphics ; $7b98 ; trainer info text box tile patterns + ld hl,TrainerInfoTextBoxTileGraphics ; trainer info text box tile patterns ld de,vChars2 + $770 ld bc,$0080 push bc call TrainerInfo_FarCopyData - ld hl,BlankLeaderNames ; $7c28 + ld hl,BlankLeaderNames ld de,vChars2 + $600 ld bc,$0170 call TrainerInfo_FarCopyData pop bc - ld hl,BadgeNumbersTileGraphics ; $7d98 ; badge number tile patterns + ld hl,BadgeNumbersTileGraphics ; badge number tile patterns ld de,vChars1 + $580 call TrainerInfo_FarCopyData - ld hl,GymLeaderFaceAndBadgeTileGraphics ; $6a9e ; gym leader face and badge tile patterns + ld hl,GymLeaderFaceAndBadgeTileGraphics ; gym leader face and badge tile patterns ld de,vChars2 + $200 ld bc,$0400 ld a,$03 call FarCopyData2 - ld hl,TextBoxGraphics ; $6288 + ld hl,TextBoxGraphics ld de,$00d0 add hl,de ; hl = colon tile pattern ld de,vChars1 + $560 @@ -562,7 +562,7 @@ DrawTrainerInfo: ; 1349a (4:749a) push bc call FarCopyData2 pop bc - ld hl,TrainerInfoTextBoxTileGraphics + $80 ; $7c18 ; background tile pattern + ld hl,TrainerInfoTextBoxTileGraphics + $80 ; background tile pattern ld de,vChars1 + $570 call TrainerInfo_FarCopyData call EnableLCD @@ -705,9 +705,9 @@ StartMenu_Option: ; 135f6 (4:75f6) SwitchPartyMon: ; 13613 (4:7613) call SwitchPartyMon_Stats - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] call SwitchPartyMon_OAM - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] call SwitchPartyMon_OAM jp RedrawPartyMenu_ @@ -741,7 +741,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld a, [wMenuItemToSwap] and a jr nz, .asm_13661 - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] inc a ld [wMenuItemToSwap], a ret @@ -751,8 +751,8 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld a, [wMenuItemToSwap] dec a ld b, a - ld a, [wCurrentMenuItem] ; wCurrentMenuItem - ld [wWhichTrade], a ; wWhichTrade + ld a, [wCurrentMenuItem] + ld [wWhichTrade], a cp b jr nz, .asm_1367b xor a @@ -767,7 +767,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld hl, wPartySpecies ld d, h ld e, l - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] add l ld l, a jr nc, .asm_1368e @@ -780,14 +780,14 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) inc d .asm_13696 ld a, [hl] - ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld a, [de] ld [hl], a - ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld [de], a ld hl, wPartyMons ld bc, wPartyMon2 - wPartyMon1 - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] call AddNTimes push hl ld de, wSwitchPartyMonTempBuffer @@ -805,14 +805,14 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld hl, wSwitchPartyMonTempBuffer ld bc, $2c call CopyData - ld hl, wPartyMonOT ; wd273 - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld hl, wPartyMonOT + ld a, [wCurrentMenuItem] call SkipFixedLengthTextEntries push hl ld de, wSwitchPartyMonTempBuffer ld bc, $b call CopyData - ld hl, wPartyMonOT ; wd273 + ld hl, wPartyMonOT ld a, [wMenuItemToSwap] call SkipFixedLengthTextEntries pop de @@ -823,14 +823,14 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld hl, wSwitchPartyMonTempBuffer ld bc, $b call CopyData - ld hl, wPartyMonNicks ; wPartyMonNicks - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld hl, wPartyMonNicks + ld a, [wCurrentMenuItem] call SkipFixedLengthTextEntries push hl ld de, wSwitchPartyMonTempBuffer ld bc, $b call CopyData - ld hl, wPartyMonNicks ; wPartyMonNicks + ld hl, wPartyMonNicks ld a, [wMenuItemToSwap] call SkipFixedLengthTextEntries pop de @@ -842,7 +842,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653) ld bc, $b call CopyData ld a, [wMenuItemToSwap] - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a xor a ld [wMenuItemToSwap], a ld [wd07d], a diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index b5254694..c9261804 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -67,7 +67,7 @@ StatusScreen: ; 12953 (4:6953) call LoadMonData ld a, [wcc49] cp $2 ; 2 means we're in a PC box - jr c, .DontRecalculate ; 0x1295b $14 + jr c, .DontRecalculate ld a, [wLoadedMonBoxLevel] ld [wLoadedMonLevel], a ld [W_CURENEMYLVL], a @@ -82,17 +82,17 @@ StatusScreen: ; 12953 (4:6953) ld [$ff24], a ; Reduce the volume call GBPalWhiteOutWithDelay3 call ClearScreen - call UpdateSprites ; move sprites (?) + call UpdateSprites call LoadHpBarAndStatusTilePatterns - ld de, BattleHudTiles1 ; $6080 ; source + ld de, BattleHudTiles1 ; source ld hl, vChars2 + $6d0 ; dest ld bc, (BANK(BattleHudTiles1) << 8) + $03 ; bank bytes/8 call CopyVideoDataDouble ; ·│ :L and halfarrow line end - ld de, BattleHudTiles2 ; $6098 + ld de, BattleHudTiles2 ld hl, vChars2 + $780 ld bc, (BANK(BattleHudTiles2) << 8) + $01 call CopyVideoDataDouble ; │ - ld de, BattleHudTiles3 ; $60b0 + ld de, BattleHudTiles3 ld hl, vChars2 + $760 ld bc, (BANK(BattleHudTiles3) << 8) + $02 call CopyVideoDataDouble ; ─┘ @@ -127,7 +127,7 @@ StatusScreen: ; 12953 (4:6953) hlCoord 16, 6 ld de, wLoadedMonStatus call PrintStatusCondition - jr nz, .StatusWritten ; 0x129fc $9 + jr nz, .StatusWritten hlCoord 16, 6 ld de, OKText call PlaceString ; "OK" @@ -147,14 +147,14 @@ StatusScreen: ; 12953 (4:6953) call PrintNumber ; Pokémon no. hlCoord 11, 10 predef PrintMonType - ld hl, NamePointers2 ; $6a9d - call .unk_12a7e + ld hl, NamePointers2 + call .asm_12a7e ld d, h ld e, l hlCoord 9, 1 call PlaceString ; Pokémon name - ld hl, OTPointers ; $6a95 - call .unk_12a7e + ld hl, OTPointers + call .asm_12a7e ld d, h ld e, l hlCoord 12, 16 @@ -175,7 +175,7 @@ StatusScreen: ; 12953 (4:6953) pop af ld [hTilesetType], a ret -.unk_12a7e ; 0x12a7e ; I don't know what this does, iterates over pointers? +.asm_12a7e ; I don't know what this does, iterates over pointers? ld a, [wcc49] add a ld c, a @@ -221,20 +221,20 @@ OKText: ; 12ac4 (4:6ac4) db "OK@" ; Draws a line starting from hl high b and wide c -DrawLineBox ; 0x12ac7 +DrawLineBox: ; 0x12ac7 ld de, $0014 ; New line .PrintVerticalLine ld [hl], $78 ; │ add hl, de dec b - jr nz, .PrintVerticalLine ; 0x12ace $fa + jr nz, .PrintVerticalLine ld [hl], $77 ; ┘ dec hl .PrintHorizLine ld [hl], $76 ; ─ dec hl dec c - jr nz, .PrintHorizLine ; 0x12ad7 $fa + jr nz, .PrintHorizLine ld [hl], $6f ; ← (halfarrow ending) ret @@ -244,14 +244,14 @@ PTile: ; 12adc (4:6adc) ; This is a single 1bpp "P" tile PrintStatsBox: ; 12ae4 (4:6ae4) ld a, d and a ; a is 0 from the status screen - jr nz, .DifferentBox ; 0x12ae6 $12 + jr nz, .DifferentBox hlCoord 0, 8 ld b, $8 ld c, $8 call TextBoxBorder ; Draws the box hlCoord 1, 9 ; Start printing stats from here ld bc, $0019 ; Number offset - jr .PrintStats ; 0x12af8 $10 + jr .PrintStats .DifferentBox hlCoord 9, 2 ld b, $8 @@ -328,7 +328,7 @@ StatusScreen2: ; 12b57 (4:6b57) call Func_12ccb ; Print "PP" ld a, b and a - jr z, .InitPP ; 0x12bb3 $6 + jr z, .InitPP ld c, a ld a, "-" call Func_12ccb ; Fill the rest with -- @@ -339,7 +339,7 @@ StatusScreen2: ; 12b57 (4:6b57) .PrintPP ; 12bc3 ld a, [hli] and a - jr z, .PPDone ; 0x12bc5 $4a + jr z, .PPDone push bc push hl push de @@ -382,7 +382,7 @@ StatusScreen2: ; 12b57 (4:6b57) inc b ld a, b cp $4 - jr nz, .PrintPP ; 0x12c0f $b2 + jr nz, .PrintPP .PPDone hlCoord 9, 3 ld de, EXPPointsText @@ -390,7 +390,7 @@ StatusScreen2: ; 12b57 (4:6b57) ld a, [wLoadedMonLevel] ; level push af cp MAX_LEVEL - jr z, .Level100 ; 0x12c20 $4 + jr z, .Level100 inc a ld [wLoadedMonLevel], a ; Increase temporarily if not 100 .Level100 @@ -434,7 +434,7 @@ StatusScreen2: ; 12b57 (4:6b57) .asm_12c86 ; This does some magic with lvl/exp? ld a, [wLoadedMonLevel] ; Load level cp MAX_LEVEL - jr z, .asm_12ca7 ; 0x12c8b $1a ; If 100 + jr z, .asm_12ca7 ; If 100 inc a ld d, a callab CalcExperience diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 88cfcf65..d5209440 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -52,9 +52,9 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld c, 1 call GiveItem jr nc, .BagFull - ld b, $3c ; number of times to play the "brrrrr" sound -.playDeliverySound ; 0x74f63 - ld c, $2 + ld b, 60 ; number of times to play the "brrrrr" sound +.playDeliverySound + ld c, 2 call DelayFrames push bc ld a, (SFX_02_53 - SFX_Headers_02) / 3 diff --git a/engine/multiply_divide.asm b/engine/multiply_divide.asm index 4aa5fa26..e55ab430 100755 --- a/engine/multiply_divide.asm +++ b/engine/multiply_divide.asm @@ -2,15 +2,15 @@ _Multiply: ; 37d41 (d:7d41) ld a, $8 ld b, a xor a - ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld [$ff9b], a - ld [H_SAVEDNUMTOPRINT], a ; $ff9c + ld [H_SAVEDNUMTOPRINT], a ld [$ff9d], a ld [$ff9e], a .asm_37d4f - ld a, [H_REMAINDER] ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld a, [H_REMAINDER] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) srl a - ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) jr nc, .asm_37d77 ld a, [$ff9e] ld c, a @@ -22,14 +22,14 @@ _Multiply: ; 37d41 (d:7d41) ld a, [$ff97] adc c ld [$ff9d], a - ld a, [H_SAVEDNUMTOPRINT] ; $ff9c + ld a, [H_SAVEDNUMTOPRINT] ld c, a - ld a, [H_NUMTOPRINT] ; $ff96 (aliases: H_MULTIPLICAND) + ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) adc c - ld [H_SAVEDNUMTOPRINT], a ; $ff9c + ld [H_SAVEDNUMTOPRINT], a ld a, [$ff9b] ld c, a - ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) adc c ld [$ff9b], a .asm_37d77 @@ -41,29 +41,29 @@ _Multiply: ; 37d41 (d:7d41) ld a, [$ff97] rl a ld [$ff97], a - ld a, [H_NUMTOPRINT] ; $ff96 (aliases: H_MULTIPLICAND) + ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) rl a - ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) - ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) + ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) rl a - ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) jr .asm_37d4f .asm_37d94 ld a, [$ff9e] ld [$ff98], a ld a, [$ff9d] ld [$ff97], a - ld a, [H_SAVEDNUMTOPRINT] ; $ff9c - ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) + ld a, [H_SAVEDNUMTOPRINT] + ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) ld a, [$ff9b] - ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ret _Divide: ; 37da5 (d:7da5) xor a ld [$ff9a], a ld [$ff9b], a - ld [H_SAVEDNUMTOPRINT], a ; $ff9c + ld [H_SAVEDNUMTOPRINT], a ld [$ff9d], a ld [$ff9e], a ld a, $9 @@ -71,17 +71,17 @@ _Divide: ; 37da5 (d:7da5) .asm_37db3 ld a, [$ff9a] ld c, a - ld a, [H_NUMTOPRINT] ; $ff96 (aliases: H_MULTIPLICAND) + ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) sub c ld d, a - ld a, [H_REMAINDER] ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld a, [H_REMAINDER] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) ld c, a - ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) sbc c jr c, .asm_37dce - ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld a, d - ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) + ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) ld a, [$ff9e] inc a ld [$ff9e], a @@ -96,9 +96,9 @@ _Divide: ; 37da5 (d:7da5) ld a, [$ff9d] rl a ld [$ff9d], a - ld a, [H_SAVEDNUMTOPRINT] ; $ff9c + ld a, [H_SAVEDNUMTOPRINT] rl a - ld [H_SAVEDNUMTOPRINT], a ; $ff9c + ld [H_SAVEDNUMTOPRINT], a ld a, [$ff9b] rl a ld [$ff9b], a @@ -107,13 +107,13 @@ _Divide: ; 37da5 (d:7da5) ld a, $8 ld e, a ld a, [$ff9a] - ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) xor a ld [$ff9a], a - ld a, [H_NUMTOPRINT] ; $ff96 (aliases: H_MULTIPLICAND) - ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) + ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ld a, [$ff97] - ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) + ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) ld a, [$ff98] ld [$ff97], a .asm_37e04 @@ -122,22 +122,22 @@ _Divide: ; 37da5 (d:7da5) jr nz, .asm_37e0a dec b .asm_37e0a - ld a, [H_REMAINDER] ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld a, [H_REMAINDER] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) srl a - ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) ld a, [$ff9a] rr a ld [$ff9a], a jr .asm_37db3 .asm_37e18 - ld a, [H_NUMTOPRINT] ; $ff96 (aliases: H_MULTIPLICAND) - ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) + ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) ld a, [$ff9e] ld [$ff98], a ld a, [$ff9d] ld [$ff97], a - ld a, [H_SAVEDNUMTOPRINT] ; $ff9c - ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) + ld a, [H_SAVEDNUMTOPRINT] + ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) ld a, [$ff9b] - ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) ret diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 0cbdaa3d..72ccc389 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -1,11 +1,11 @@ SetDefaultNames: ; 60ca (1:60ca) ld a, [wd358] push af - ld a, [W_OPTIONS] ; W_OPTIONS + ld a, [W_OPTIONS] push af ld a, [wd732] push af - ld hl, wPlayerName ; wd158 + ld hl, wPlayerName ld bc, $d8a xor a call FillMemory @@ -16,18 +16,18 @@ SetDefaultNames: ; 60ca (1:60ca) pop af ld [wd732], a pop af - ld [W_OPTIONS], a ; W_OPTIONS + ld [W_OPTIONS], a pop af ld [wd358], a ld a, [wd08a] and a call z, Func_5bff ld hl, NintenText - ld de, wPlayerName ; wd158 + ld de, wPlayerName ld bc, $b call CopyData ld hl, SonyText - ld de, W_RIVALNAME ; wd34a + ld de, W_RIVALNAME ld bc, $b jp CopyData @@ -37,7 +37,7 @@ OakSpeech: ; 6115 (1:6115) ld a, BANK(Music_Routes2) ; bank of song ld c,a ld a, MUSIC_ROUTES2 ; song # - call PlayMusic ; plays music + call PlayMusic call ClearScreen call LoadTextBoxTilePatterns call SetDefaultNames @@ -111,10 +111,10 @@ Func_61bc: ; 61bc (1:61bc) call PlaySound pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ld c,4 call DelayFrames - ld de,RedSprite ; $4180 + ld de,RedSprite ld hl,vSprites ld bc,(BANK(RedSprite) << 8) | $0C call CopyVideoData @@ -139,8 +139,8 @@ Func_61bc: ; 61bc (1:61bc) call PlaySound ; stop music pop af ld [H_LOADEDROMBANK],a - ld [$2000],a - ld c,$14 + ld [MBC1RomBank],a + ld c,20 call DelayFrames hlCoord 6, 5 ld b,7 @@ -149,7 +149,7 @@ Func_61bc: ; 61bc (1:61bc) call LoadTextBoxTilePatterns ld a,1 ld [wUpdateSpritesEnabled],a - ld c,$32 + ld c,50 call DelayFrames call GBFadeOutToWhite jp ClearScreen @@ -229,4 +229,4 @@ IntroPredef3B: ; 62a4 (1:62a4) .next xor a ld [$FFE1],a - predef_jump Func_3f0c6 + predef_jump CopyUncompressedPicToTilemap diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 34d98fd7..d8043484 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -1,17 +1,17 @@ LoadDefaultNamesPlayer: ; 695d (1:695d) call Func_6a12 - ld de, DefaultNamesPlayer ; $6aa8 + ld de, DefaultNamesPlayer call DisplayIntroNameTextBox - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] and a jr z, .asm_697a - ld hl, DefaultNamesPlayerList ; $6af2 + ld hl, DefaultNamesPlayerList call Func_6ad6 - ld de, wPlayerName ; wd158 + ld de, wPlayerName call Func_69ec jr .asm_6999 .asm_697a - ld hl, wPlayerName ; wd158 + ld hl, wPlayerName xor a ld [wd07d], a call DisplayNamingScreen @@ -20,7 +20,7 @@ LoadDefaultNamesPlayer: ; 695d (1:695d) jr z, .asm_697a call ClearScreen call Delay3 - ld de, RedPicFront ; $6ede + ld de, RedPicFront ld b, BANK(RedPicFront) call IntroPredef3B .asm_6999 @@ -32,19 +32,19 @@ YourNameIsText: ; 699f (1:699f) db "@" LoadDefaultNamesRival: ; 69a4 (1:69a4) - call Func_6a12 ; 0x69a4 call 0x6a12 + call Func_6a12 ld de, DefaultNamesRival call DisplayIntroNameTextBox - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] and a jr z, .asm_69c1 ld hl, DefaultNamesRivalList call Func_6ad6 - ld de, W_RIVALNAME ; wd34a + ld de, W_RIVALNAME call Func_69ec jr .asm_69e1 .asm_69c1 - ld hl, W_RIVALNAME ; wd34a + ld hl, W_RIVALNAME ld a, $1 ld [wd07d], a call DisplayNamingScreen @@ -53,7 +53,7 @@ LoadDefaultNamesRival: ; 69a4 (1:69a4) jr z, .asm_69c1 call ClearScreen call Delay3 - ld de, Rival1Pic ; $6049 + ld de, Rival1Pic ld b, $13 call IntroPredef3B .asm_69e1 @@ -69,7 +69,7 @@ Func_69ec: ; 69ec (1:69ec) ld hl, wTileMap ld bc, $c0b call ClearScreenArea - ld c, $a + ld c, 10 call DelayFrames pop de ld hl, wcd6d @@ -91,9 +91,9 @@ asm_6a19: ; 6a19 (1:6a19) push bc ld [$ff8d], a ld a, d - ld [H_DOWNARROWBLINKCNT1], a ; $ff8b + ld [H_DOWNARROWBLINKCNT1], a ld a, e - ld [H_DOWNARROWBLINKCNT2], a ; $ff8c + ld [H_DOWNARROWBLINKCNT2], a ld c, a ld a, [$ff8d] and a @@ -105,7 +105,7 @@ asm_6a19: ; 6a19 (1:6a19) ld e, l .asm_6a2f xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld a, [$ff8d] and a jr nz, .asm_6a3c @@ -128,9 +128,9 @@ asm_6a19: ; 6a19 (1:6a19) ld [hl], a .asm_6a4a ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 - ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c + ld a, [H_DOWNARROWBLINKCNT2] ld c, a ld h, d ld l, e @@ -144,9 +144,9 @@ asm_6a19: ; 6a19 (1:6a19) .asm_6a5f ld d, h ld e, l - ld a, [H_DOWNARROWBLINKCNT1] ; $ff8b + ld a, [H_DOWNARROWBLINKCNT1] dec a - ld [H_DOWNARROWBLINKCNT1], a ; $ff8b + ld [H_DOWNARROWBLINKCNT1], a jr nz, .asm_6a2f pop bc pop de @@ -160,22 +160,22 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c) ld c, $9 call TextBoxBorder hlCoord 3, 0 - ld de, .namestring ; $6aa3 + ld de, .namestring call PlaceString pop de hlCoord 2, 2 call PlaceString call UpdateSprites xor a - ld [wCurrentMenuItem], a ; wCurrentMenuItem - ld [wLastMenuItem], a ; wLastMenuItem + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a inc a - ld [wTopMenuItemX], a ; wTopMenuItemX - ld [wMenuWatchedKeys], a ; wMenuWatchedKeys + ld [wTopMenuItemX], a + ld [wMenuWatchedKeys], a inc a - ld [wTopMenuItemY], a ; wTopMenuItemY + ld [wTopMenuItemY], a inc a - ld [wMaxMenuItem], a ; wMaxMenuItem + ld [wMaxMenuItem], a jp HandleMenuInput .namestring ; 6aa3 (1:6aa3) diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index bdab41a6..86a7ab7d 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -5,7 +5,7 @@ CableClubNPC: ; 71c5 (1:71c5) bit 5, a ; received pokedex? jp nz, .receivedPokedex ; if the player hasn't received the pokedex - ld c, $3c + ld c, 60 call DelayFrames ld hl, CableClubNPCMakingPreparationsText call PrintText @@ -72,24 +72,24 @@ CableClubNPC: ; 71c5 (1:71c5) ld hl, wUnknownSerialCounter ld a, [hli] inc a - jr nz, Func_72a8 ; 0x726b $3b + jr nz, Func_72a8 ld a, [hl] inc a - jr nz, Func_72a8 ; 0x726f $37 + jr nz, Func_72a8 ld b, $a .asm_7273 call DelayFrame call Serial_SendZeroByte dec b - jr nz, .asm_7273 ; 0x727a $f7 + jr nz, .asm_7273 call CloseLinkConnection ld hl, CableClubNPCLinkClosedBecauseOfInactivityText call PrintText - jr Func_7298 ; 0x7285 $11 + jr Func_7298 .failedToEstablishConnection ld hl, CableClubNPCAreaReservedFor2FriendsLinkedByCableText call PrintText - jr Func_7298 ; 0x728d $9 + jr Func_7298 .choseNo call CloseLinkConnection ld hl, CableClubNPCPleaseComeAgainText diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index eefa2176..a23348db 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -2,16 +2,16 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) ld hl, wd730 set 6, [hl] xor a - ld [wCurrentMenuItem], a ; wCurrentMenuItem + ld [wCurrentMenuItem], a ld a, $3 - ld [wMenuWatchedKeys], a ; wMenuWatchedKeys + ld [wMenuWatchedKeys], a ld a, [wcd37] dec a - ld [wMaxMenuItem], a ; wMaxMenuItem + ld [wMaxMenuItem], a ld a, $2 - ld [wTopMenuItemY], a ; wTopMenuItemY + ld [wTopMenuItemY], a ld a, $1 - ld [wTopMenuItemX], a ; wTopMenuItemX + ld [wTopMenuItemX], a ld a, [wcd37] dec a ld bc, $2 @@ -30,7 +30,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) bit 1, a jr nz, .asm_610a7 ld hl, wcc5b - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] ld d, $0 ld e, a add hl, de @@ -55,7 +55,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) ld hl, LabFossil_610ae call PrintText call YesNoChoice - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] and a jr nz, .asm_610a7 ld hl, LabFossil_610b3 diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 7b92bca3..215bf103 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -1,7 +1,7 @@ UsedCut: ; ef54 (3:6f54) xor a ld [wcd6a], a - ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET + ld a, [W_CURMAPTILESET] and a ; OVERWORLD jr z, .asm_ef6b cp GYM @@ -9,28 +9,28 @@ UsedCut: ; ef54 (3:6f54) ld a, [wTileInFrontOfPlayer] cp $50 ; gym cut tree jr nz, .asm_ef77 - jr asm_ef82 + jr .asm_ef82 .asm_ef6b dec a ld a, [wTileInFrontOfPlayer] cp $3d ; cut tree - jr z, asm_ef82 + jr z, .asm_ef82 cp $52 ; grass - jr z, asm_ef82 + jr z, .asm_ef82 .asm_ef77 - ld hl, NothingToCutText + ld hl, .NothingToCutText jp PrintText -NothingToCutText: ; ef7d (3:6f7d) +.NothingToCutText TX_FAR _NothingToCutText db "@" -asm_ef82: ; ef82 (3:6f82) +.asm_ef82 ld [wcd4d], a ld a, $1 ld [wcd6a], a - ld a, [wWhichPokemon] ; wWhichPokemon - ld hl, wPartyMonNicks ; wPartyMonNicks + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks call GetPartyMonName ld hl, wd730 set 6, [hl] @@ -54,7 +54,7 @@ asm_ef82: ; ef82 (3:6f82) ld a, $ff ld [wUpdateSpritesEnabled], a call AnimateCutTree - ld de, CutTreeBlockSwaps ; $7100 + ld de, CutTreeBlockSwaps call Func_f09f call RedrawMapView callba Func_79e96 @@ -75,15 +75,15 @@ AnimateCutTree: ; eff7 (3:6ff7) xor a ld [wcd50], a ld a, $e4 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a ld a, [wcd4d] cp $52 jr z, .asm_f020 - ld de, Overworld_GFX + $2d0 ; $42d0 ; cuttable tree sprite top row + ld de, Overworld_GFX + $2d0 ; cuttable tree sprite top row ld hl, vChars1 + $7c0 ld bc, (BANK(Overworld_GFX) << 8) + $02 call CopyVideoData - ld de, Overworld_GFX + $3d0 ; $43d0 ; cuttable tree sprite bottom row + ld de, Overworld_GFX + $3d0 ; cuttable tree sprite bottom row ld hl, vChars1 + $7e0 ld bc, (BANK(Overworld_GFX) << 8) + $02 call CopyVideoData @@ -111,7 +111,7 @@ AnimateCutTree: ; eff7 (3:6ff7) ret LoadCutTreeAnimationTilePattern: ; f04c (3:704c) - ld de, AnimationTileset2 + $60 ; $474e ; tile depicting a leaf + ld de, AnimationTileset2 + $60 ; tile depicting a leaf ld bc, (BANK(AnimationTileset2) << 8) + $01 jp CopyVideoData @@ -173,7 +173,7 @@ BoulderDustAnimationOffsets: ; f097 (3:7097) Func_f09f: ; f09f (3:709f) push de - ld a, [W_CURMAPWIDTH] ; wd369 + ld a, [W_CURMAPWIDTH] add $6 ld c, a ld b, $0 @@ -190,22 +190,22 @@ Func_f09f: ; f09f (3:709f) jr z, .asm_f0cf cp $8 jr z, .asm_f0d7 - ld a, [W_XBLOCKCOORD] ; wd364 + ld a, [W_XBLOCKCOORD] and a jr z, .asm_f0e0 jr .asm_f0ec .asm_f0c7 - ld a, [W_YBLOCKCOORD] ; wd363 + ld a, [W_YBLOCKCOORD] and a jr z, .asm_f0e0 jr .asm_f0df .asm_f0cf - ld a, [W_YBLOCKCOORD] ; wd363 + ld a, [W_YBLOCKCOORD] and a jr z, .asm_f0e1 jr .asm_f0e0 .asm_f0d7 - ld a, [W_XBLOCKCOORD] ; wd364 + ld a, [W_XBLOCKCOORD] and a jr z, .asm_f0e6 jr .asm_f0e0 diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm index de2b9d55..9cb011b4 100755 --- a/engine/overworld/cut2.asm +++ b/engine/overworld/cut2.asm @@ -15,9 +15,9 @@ Func_79e96: ; 79e96 (1e:5e96) ld [wd08a], a ld c, $2 call AdjustOAMBlockXPos2 - ld a, [rOBP1] ; $ff49 + ld a, [rOBP1] xor $64 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a call DelayFrame pop bc dec c @@ -65,9 +65,9 @@ Func_79eed: ; 79eed (1e:5eed) ld [wd08a], a ld c, $1 call AdjustOAMBlockXPos2 - ld a, [rOBP1] ; $ff49 + ld a, [rOBP1] xor $64 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a call DelayFrame pop bc dec c diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index ac345af9..641c021f 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -1,8 +1,8 @@ ; returns whether the player is standing on a door tile in carry IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) push de - ld hl, DoorTileIDPointers ; $662c - ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET + ld hl, DoorTileIDPointers + ld a, [W_CURMAPTILESET] ld de, $3 call IsInArray pop de diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 3a23d410..f5b1d14c 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -10,7 +10,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld d, a ld e, $1 ; number of times to play collision sfx - ld b, $64 + ld b, 100 .asm_7bf30 ld a, e xor $fe @@ -22,7 +22,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld a, (SFX_02_5b - SFX_Headers_02) / 3 call PlayMusic pop bc - ld c, $2 + ld c, 2 call DelayFrames dec b jr nz, .asm_7bf30 diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index 7106063b..01b3ae85 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -2,7 +2,7 @@ EmotionBubble: ; 17c47 (5:7c47) ld a, [wcd50] ld c, a ld b, $0 - ld hl, EmotionBubblesPointerTable ; $7caf + ld hl, EmotionBubblesPointerTable add hl, bc add hl, bc ld e, [hl] @@ -45,10 +45,10 @@ EmotionBubble: ; 17c47 (5:7c47) ld a, [hl] add $8 ld c, a - ld de, EmotionBubblesOAM ; $7cb5 + ld de, EmotionBubblesOAM xor a call WriteOAMBlock - ld c, $3c + ld c, 60 call DelayFrames pop af ld [wUpdateSpritesEnabled], a diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 1c61eac8..d00bbc05 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,5 +1,5 @@ AnimateHealingMachine: ; 70433 (1c:4433) - ld de, PokeCenterFlashingMonitorAndHealBall ; $44b7 + ld de, PokeCenterFlashingMonitorAndHealBall ld hl, vChars0 + $7c0 ld bc, (BANK(PokeCenterFlashingMonitorAndHealBall) << 8) + $03 call CopyVideoData @@ -8,12 +8,12 @@ AnimateHealingMachine: ; 70433 (1c:4433) push af ld [hl], $ff push hl - ld a, [rOBP1] ; $ff49 + ld a, [rOBP1] push af ld a, $e0 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a ld hl, wOAMBuffer + $84 - ld de, PokeCenterOAMData ; $44d7 + ld de, PokeCenterOAMData call Func_70503 ld a, $4 ld [wMusicHeaderPointer], a @@ -24,13 +24,13 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld a, [wMusicHeaderPointer] and a jr nz, .asm_70464 - ld a, [wPartyCount] ; wPartyCount + ld a, [wPartyCount] ld b, a .asm_7046e call Func_70503 ld a, (SFX_02_4a - SFX_Headers_02) / 3 call PlaySound - ld c, $1e + ld c, 30 call DelayFrames dec b jr nz, .asm_7046e @@ -53,10 +53,10 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld a, [wc026] cp MUSIC_PKMN_HEALED jr z, .asm_704a2 - ld c, $20 + ld c, 32 call DelayFrames pop af - ld [rOBP1], a ; $ff49 + ld [rOBP1], a pop hl pop af ld [hl], a diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 17288a17..0b9e316e 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -22,7 +22,6 @@ HiddenItems: ; 76688 (1d:6688) INCLUDE "data/hidden_item_coords.asm" FoundHiddenItemText: ; 7675b (1d:675b) -; XXX where is the pointer to this? TX_FAR _FoundHiddenItemText db $8 ld a, [wWhichTrade] ; item ID @@ -36,8 +35,8 @@ FoundHiddenItemText: ; 7675b (1d:675b) ld b, $1 predef FlagActionPredef ld a, (SFX_02_3b - SFX_Headers_02) / 3 - call PlaySoundWaitForCurrent ; play sound - call WaitForSoundToFinish ; wait for sound to finish playing + call PlaySoundWaitForCurrent + call WaitForSoundToFinish jp TextScriptEnd .BagFull call WaitForTextScrollButtonPress ; wait for button press @@ -146,10 +145,10 @@ Func_76857: ; 76857 (1d:6857) cp $ff ; end of the list? ret z ; if so, we're done here cp b - jr nz, .asm_76877 ; 0x7686b $a + jr nz, .asm_76877 ld a, [hli] cp d - jr nz, .asm_76878 ; 0x7686f $7 + jr nz, .asm_76878 ld a, [hli] cp e jr nz, .loop diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index a49fc268..b00405bf 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -1,7 +1,7 @@ PickupItem: call EnableAutoTextBoxDrawing - ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c + ld a, [H_DOWNARROWBLINKCNT2] ld b, a ld hl, W_MISSABLEOBJECTLIST .missableObjectsListLoop @@ -18,7 +18,7 @@ PickupItem: ld [$ffdb], a ld hl, W_MAPSPRITEEXTRADATA - ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c + ld a, [H_DOWNARROWBLINKCNT2] dec a add a ld d, 0 diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index b8c19181..3a183c0f 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -2,7 +2,7 @@ HandleLedges: ; 1a672 (6:6672) ld a, [wd736] bit 6, a ; already jumping down ledge ret nz - ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET + ld a, [W_CURMAPTILESET] and a ; OVERWORLD ret nz predef GetTileAndCoordsInFrontOfPlayer diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index c4482700..75b4f3ea 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -22,7 +22,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31) .lowerLeftTileIsMapTile call DetectCollisionBetweenSprites ld h, $c1 - ld a, [wWalkCounter] ; wcfc5 + ld a, [wWalkCounter] and a jr nz, .asm_4e90 ld a, [wd528] @@ -108,7 +108,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) swap a dec a add a - ld hl, W_MAPSPRITEDATA ; wd4e4 + ld hl, W_MAPSPRITEDATA add l ld l, a ld a, [hl] ; read movement byte 2 @@ -138,7 +138,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) jp z, UpdateSpriteMovementDelay ; c1x1 == 2 cp $3 jp z, UpdateSpriteInWalkingAnimation ; c1x1 == 3 - ld a, [wWalkCounter] ; wcfc5 + ld a, [wWalkCounter] and a ret nz ; don't do anything yet if player is currently moving (redundant, already tested in CheckSpriteAvailability) call InitializeSpriteScreenPosition @@ -212,7 +212,7 @@ Func_4ed1: ; 4ed1 (1:4ed1) cp $2 jr z, .moveRight ; movement byte 2 = $2 only allows left or right .moveUp - ld de, -2*20 ; $ffd8 + ld de, -2*20 add hl, de ; move tile pointer two rows up ld de, $ff00 ld bc, $804 @@ -440,7 +440,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) ld a, [H_CURRENTSPRITEOFFSET] add $4 ld l, a - ld a, [W_YCOORD] ; wd361 + ld a, [W_YCOORD] ld b, a ld a, [hl] ; c2x4 (Y position + 4) sub b ; relative to player position @@ -449,7 +449,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) dec h ld [hli], a ; c1x4 (screen Y position) inc h - ld a, [W_XCOORD] ; wd362 + ld a, [W_XCOORD] ld b, a ld a, [hli] ; c2x6 (X position + 4) sub b ; relative to player position @@ -475,7 +475,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) add $4 ld l, a ld b, [hl] ; c2x4: Y pos (+4) - ld a, [W_YCOORD] ; wd361 + ld a, [W_YCOORD] cp b jr z, .skipYVisibilityTest jr nc, .spriteInvisible ; above screen region @@ -485,7 +485,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) .skipYVisibilityTest inc l ld b, [hl] ; c2x5: X pos (+4) - ld a, [W_XCOORD] ; wd362 + ld a, [W_XCOORD] cp b jr z, .skipXVisibilityTest jr nc, .spriteInvisible ; left of screen region @@ -503,7 +503,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) ld a, [hld] cp d jr nc, .spriteInvisible ; standing on tile with ID >=$60 (bottom right tile) - ld bc, -20 ; $ffec + ld bc, -20 add hl, bc ; go back one row of tiles ld a, [hli] cp d @@ -521,7 +521,7 @@ CheckSpriteAvailability: ; 50dc (1:50dc) jr .done .spriteVisible ld c, a - ld a, [wWalkCounter] ; wcfc5 + ld a, [wWalkCounter] and a jr nz, .done ; if player is currently walking, we're done call UpdateSpriteImage diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 84e39853..73a3fdfb 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -52,7 +52,7 @@ ProfOakMovementScriptPointerTable: ; 1a442 (6:6442) dw Func_1a4f4 Func_1a44c: ; 1a44c (6:644c) - ld a, [W_XCOORD] ; wd362 + ld a, [W_XCOORD] sub $a ld [wcca1], a jr z, .asm_1a475 @@ -63,7 +63,7 @@ Func_1a44c: ; 1a44c (6:644c) call FillMemory ld [hl], $ff ld a, [wSpriteIndex] - ld [H_DOWNARROWBLINKCNT2], a ; $ff8c + ld [H_DOWNARROWBLINKCNT2], a ld de, wNPCMovementDirections2 call MoveSprite ld a, $1 diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm index 68135287..00f6ea82 100755 --- a/engine/overworld/oaks_aide.asm +++ b/engine/overworld/oaks_aide.asm @@ -1,10 +1,10 @@ -OaksAideScript ; 0x59035 +OaksAideScript: ; 0x59035 ld hl, OaksAideHiText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_59086 ; 0x59042 $42 + jr nz, .asm_59086 ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits @@ -13,8 +13,8 @@ OaksAideScript ; 0x59035 ld b, a ld a, [$ffdb] cp b - jr z, .asm_59059 ; 0x59055 $2 - jr nc, .asm_5907c ; 0x59057 $23 + jr z, .asm_59059 + jr nc, .asm_5907c .asm_59059 ld hl, OaksAideHereYouGoText call PrintText @@ -26,17 +26,17 @@ OaksAideScript ; 0x59035 ld hl, OaksAideGotItemText call PrintText ld a, $1 - jr .asm_5908e ; 0x59071 $1b + jr .asm_5908e .BagFull ld hl, OaksAideNoRoomText call PrintText xor a - jr .asm_5908e ; 0x5907a $12 + jr .asm_5908e .asm_5907c ld hl, OaksAideUhOhText call PrintText ld a, $80 - jr .asm_5908e ; 0x59084 $8 + jr .asm_5908e .asm_59086 ld hl, OaksAideComeBackText call PrintText diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 6602cedd..d68e4e57 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -58,7 +58,7 @@ EnterMapAnim: ; 70510 (1c:4510) ld a, 12 ld [hli], a ; wFlyAnimCounter ld [hl], $8 ; wFlyAnimBirdSpriteImageIndex (facing right) - ld de, FlyAnimationEnterScreenCoords ; $4592 + ld de, FlyAnimationEnterScreenCoords call DoFlyAnimation call LoadPlayerSpriteGraphics jr .restoreDefaultMusic @@ -154,7 +154,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld a, $c ld [hli], a ; wFlyAnimCounter ld [hl], $c ; wFlyAnimBirdSpriteImageIndex (facing right) - ld de, FlyAnimationScreenCoords1 ; $464f + ld de, FlyAnimationScreenCoords1 call DoFlyAnimation ld c, 40 call DelayFrames @@ -162,7 +162,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld a, 11 ld [hli], a ; wFlyAnimCounter ld [hl], $8 ; wFlyAnimBirdSpriteImageIndex (facing left) - ld de, FlyAnimationScreenCoords2 ; $4667 + ld de, FlyAnimationScreenCoords2 call DoFlyAnimation call GBFadeOutToWhite jp RestoreFacingDirectionAndYScreenPos @@ -248,11 +248,11 @@ DoFlyAnimation: ; 706ae (1c:46ae) ret LoadBirdSpriteGraphics: ; 706d7 (1c:46d7) - ld de, BirdSprite ; $4d80 + ld de, BirdSprite ld hl, vNPCSprites ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData - ld de, BirdSprite + $c0 ; $4e40 ; moving amination sprite + ld de, BirdSprite + $c0 ; moving amination sprite ld hl, vNPCSprites2 ld bc, (BANK(BirdSprite) << 8) + $0c jp CopyVideoData @@ -379,28 +379,28 @@ IsPlayerStandingOnWarpPadOrHole: ; 70787 (1c:4787) db $FF Func_707b6: ; 707b6 (1c:47b6) - ld c, $a + ld c, 10 call DelayFrames ld hl, wd736 set 6, [hl] - ld de, RedSprite ; $4180 + ld de, RedSprite ld hl, vNPCSprites ld bc, (BANK(RedSprite) << 8) + $0c call CopyVideoData ld a, $4 - ld hl, RedFishingTiles ; $4866 + ld hl, RedFishingTiles call LoadAnimSpriteGfx ld a, [wSpriteStateData1 + 2] ld c, a ld b, $0 - ld hl, FishingRodGfxProperties ; $4856 + ld hl, FishingRodGfxProperties add hl, bc ld de, wOAMBuffer + $9c ld bc, $4 call CopyData - ld c, $64 + ld c, 100 call DelayFrames - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] and a ld hl, NoNibbleText jr z, .asm_70836 diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 3c640d8e..5b2e4cbb 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -43,7 +43,7 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) .done ld hl, PokemonCenterFarewellText call PrintText - jp UpdateSprites ; move sprites + jp UpdateSprites PokemonCenterWelcomeText: ; 705d (1:705d) TX_FAR _PokemonCenterWelcomeText diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index 8325b93f..fa93e1db 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -1,7 +1,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld a,[wListScrollOffset] ld [wd07e],a - call UpdateSprites ; move sprites + call UpdateSprites xor a ld [wcf0a],a ; flag that is set if something is sold or bought .loop @@ -36,7 +36,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld [wcf93],a ld a,$02 ld [wd11b],a - callab Func_39bd5 + callab InitList ld a,[wNumBagItems] and a jp z,.bagEmpty @@ -113,7 +113,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld [wcf93],a ld a,$03 ld [wd11b],a - callab Func_39bd5 + callab InitList ld hl,PokemartBuyingGreetingText call PrintText call SaveScreenTilesToBuffer1 ; save screen @@ -204,7 +204,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) call PrintText ld a,$01 ld [wUpdateSpritesEnabled],a - call UpdateSprites ; move sprites + call UpdateSprites ld a,[wd07e] ld [wListScrollOffset],a ret diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm index f1a8ecf9..4cac4957 100755 --- a/engine/overworld/ssanne.asm +++ b/engine/overworld/ssanne.asm @@ -84,7 +84,7 @@ LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0) ret LoadSmokeTile: ; 79fd4 (1e:5fd4) - ld de, SSAnneSmokePuffTile ; $5fdd + ld de, SSAnneSmokePuffTile ld bc, (BANK(SSAnneSmokePuffTile) << 8) + $01 jp CopyVideoData diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm index 4aaab3ed..2b08997b 100755 --- a/engine/overworld/trainers.asm +++ b/engine/overworld/trainers.asm @@ -77,7 +77,7 @@ _SetSpritePosition2: ; 5685d (15:685d) TrainerWalkUpToPlayer: ; 56881 (15:6881) ld a, [wSpriteIndex] swap a - ld [wTrainerSpriteOffset], a ; wWhichTrade + ld [wTrainerSpriteOffset], a call ReadTrainerScreenPosition ld a, [wTrainerFacingDirection] and a @@ -164,7 +164,7 @@ GetSpriteDataPointer: ; 56903 (15:6903) TrainerEngage: ; 5690f (15:690f) push hl push de - ld a, [wTrainerSpriteOffset] ; wWhichTrade + ld a, [wTrainerSpriteOffset] add $2 ld d, $0 ld e, a @@ -175,7 +175,7 @@ TrainerEngage: ; 5690f (15:690f) jr nz, .spriteOnScreen ; test if sprite is on screen jp .noEngage .spriteOnScreen - ld a, [wTrainerSpriteOffset] ; wWhichTrade + ld a, [wTrainerSpriteOffset] add $9 ld d, $0 ld e, a @@ -218,7 +218,7 @@ TrainerEngage: ; 5690f (15:690f) jp .noEngage .engage call CheckPlayerIsInFrontOfSprite - ld a, [wTrainerSpriteOffset] ; wWhichTrade + ld a, [wTrainerSpriteOffset] and a jr z, .noEngage ld hl, wFlags_0xcd60 @@ -226,14 +226,14 @@ TrainerEngage: ; 5690f (15:690f) call EngageMapTrainer ld a, $ff .noEngage: ; 56988 (15:6988) - ld [wTrainerSpriteOffset], a ; wWhichTrade + ld [wTrainerSpriteOffset], a pop de pop hl ret ; reads trainer's Y position to wTrainerScreenY and X position to wTrainerScreenX ReadTrainerScreenPosition: ; 5698e (15:698e) - ld a, [wTrainerSpriteOffset] ; wWhichTrade + ld a, [wTrainerSpriteOffset] add $4 ld d, $0 ld e, a @@ -241,7 +241,7 @@ ReadTrainerScreenPosition: ; 5698e (15:698e) add hl, de ld a, [hl] ld [wTrainerScreenY], a - ld a, [wTrainerSpriteOffset] ; wWhichTrade + ld a, [wTrainerSpriteOffset] add $6 ld d, $0 ld e, a @@ -291,10 +291,10 @@ CheckSpriteCanSeePlayer: ; 569af (15:69af) ; tests if the player is in front of the sprite (rather than behind it) CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) - ld a, [W_CURMAP] ; W_CURMAP + ld a, [W_CURMAP] cp POWER_PLANT - jp z, .engage ; XXX not sure why bypass this for power plant (maybe to get voltorb fake items to work?) - ld a, [wTrainerSpriteOffset] ; wWhichTrade + jp z, .engage ; bypass this for power plant to get voltorb fake items to work + ld a, [wTrainerSpriteOffset] add $4 ld d, $0 ld e, a @@ -306,7 +306,7 @@ CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) ld a, $c .notOnTopmostTile ld [wTrainerScreenY], a - ld a, [wTrainerSpriteOffset] ; wWhichTrade + ld a, [wTrainerSpriteOffset] add $6 ld d, $0 ld e, a @@ -345,5 +345,5 @@ CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) .noEngage xor a .done - ld [wTrainerSpriteOffset], a ; wWhichTrade + ld [wTrainerSpriteOffset], a ret diff --git a/engine/palettes.asm b/engine/palettes.asm index ca8ba224..a9160d21 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -280,7 +280,7 @@ DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d) ret SendBlkPacket_PartyMenu: ; 71fb6 (1c:5fb6) - ld hl, BlkPacket_PartyMenu ; $62f4 + ld hl, BlkPacket_PartyMenu ld de, wcf2e ld bc, $30 jp CopyData @@ -501,7 +501,7 @@ Func_7210b: ; 7210b (1c:610b) push de call DisableLCD ld a, $e4 - ld [rBGP], a ; $ff47 + ld [rBGP], a ld de, vChars1 ld a, [wcf2d] and a @@ -527,11 +527,11 @@ Func_7210b: ; 7210b (1c:610b) dec c jr nz, .asm_72132 ld a, $e3 - ld [rLCDC], a ; $ff40 + ld [rLCDC], a pop hl call SendSGBPacket xor a - ld [rBGP], a ; $ff47 + ld [rBGP], a ei ret diff --git a/engine/pokedex_rating.asm b/engine/pokedex_rating.asm index 080025c6..881c9716 100755 --- a/engine/pokedex_rating.asm +++ b/engine/pokedex_rating.asm @@ -33,7 +33,7 @@ DisplayDexRating: ; 44169 (11:4169) call PrintText pop hl call PrintText - callba Func_7d13b + callba PlayPokedexRatingSfx jp WaitForTextScrollButtonPress ; wait for button press .label3 ld de, wcc5b diff --git a/engine/predefs.asm b/engine/predefs.asm index f6ecf018..90065d51 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -53,11 +53,11 @@ PredefPointers:: ; 4fe79 (13:7e79) ; these are pointers to ASM routines. ; they appear to be used in overworld map scripts. add_predef DrawPlayerHUDAndHPBar - add_predef Func_3f0c6 - add_predef Func_3f073 + add_predef CopyUncompressedPicToTilemap + add_predef AnimateSendingOutMon add_predef ScaleSpriteByTwo add_predef LoadMonBackPic - add_predef Func_79aba + add_predef CopyGrowingMonTiles add_predef LoadMissableObjects add_predef HealParty add_predef MoveAnimation; 08 play move animation @@ -103,7 +103,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef BattleTransition add_predef CopyTileIDsFromList add_predef PlayIntro - add_predef Func_79869 + add_predef GetMoveSoundB add_predef FlashScreen add_predef GetTileAndCoordsInFrontOfPlayer add_predef StatusScreen diff --git a/engine/predefs12.asm b/engine/predefs12.asm index 90032a14..f318447e 100755 --- a/engine/predefs12.asm +++ b/engine/predefs12.asm @@ -4,7 +4,7 @@ ChangeBGPalColor0_4Frames: ; 480eb (12:40eb) ld a, [rBGP] or b ld [rBGP], a - ld c, $4 + ld c, 4 call DelayFrames ld a, [rBGP] and %11111100 @@ -17,7 +17,7 @@ Func_480ff: ; 480ff (12:40ff) ld [wd0a0], a xor a .asm_48108 - ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) + ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) call Func_48119 call Func_48119 dec b @@ -28,11 +28,11 @@ Func_480ff: ; 480ff (12:40ff) ret Func_48119: ; 48119 (12:4119) - ld a, [H_NUMTOPRINT] ; $ff96 (aliases: H_MULTIPLICAND) + ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) xor b - ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) - ld [rWY], a ; $ff4a - ld c, $3 + ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) + ld [rWY], a + ld c, 3 jp DelayFrames Func_48125: ; 48125 (12:4125) @@ -41,14 +41,14 @@ Func_48125: ; 48125 (12:4125) .asm_48129 ld [$ff97], a call Func_4813f - ld c, $1 + ld c, 1 call DelayFrames call Func_4813f dec b ld a, b jr nz, .asm_48129 ld a, $7 - ld [rWX], a ; $ff4b + ld [rWX], a ret Func_4813f: ; 4813f (12:413f) @@ -60,6 +60,6 @@ Func_4813f: ; 4813f (12:413f) xor a .asm_48149 add $7 - ld [rWX], a ; $ff4b - ld c, $4 + ld [rWX], a + ld c, 4 jp DelayFrames diff --git a/engine/predefs17.asm b/engine/predefs17.asm index 74977ee8..a674b45a 100755 --- a/engine/predefs17.asm +++ b/engine/predefs17.asm @@ -2,8 +2,8 @@ ; so that the full Pokedex information gets displayed in Oak's lab StarterDex: ; 5c0dc (17:40dc) ld a, %01001011 ; set starter flags - ld [wPokedexOwned], a ; wPokedexOwned + ld [wPokedexOwned], a predef ShowPokedexData xor a ; unset starter flags - ld [wPokedexOwned], a ; wPokedexOwned + ld [wPokedexOwned], a ret diff --git a/engine/save.asm b/engine/save.asm index d3127f04..60af9a81 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -18,7 +18,7 @@ LoadSAV: ; 735e8 (1c:75e8) set 6, [hl] ld hl, FileDataDestroyedText call PrintText - ld c, $64 + ld c, 100 call DelayFrames pop hl res 6, [hl] @@ -54,7 +54,7 @@ LoadSAVCheckSum: ; 73623 (1c:7623) .Func_73652 ; 73652 (1c:7652) ld hl, $a598 - ld de, wPlayerName ; wd158 + ld de, wPlayerName ld bc, $b call CopyData ld hl, $a5a3 @@ -110,11 +110,11 @@ LoadSAVCheckSum2: ; 736bd (1c:76bd) cp c jp nz, SAVBadCheckSum ld hl, $af2c - ld de, wPartyCount ; wPartyCount + ld de, wPartyCount ld bc, $194 call CopyData ld hl, $a5a3 - ld de, wPokedexOwned ; wPokedexOwned + ld de, wPokedexOwned ld bc, wPokedexSeenEnd - wPokedexOwned call CopyData and a @@ -129,12 +129,12 @@ SAVGoodChecksum: ; 736f8 (1c:76f8) ld [MBC1SRamEnable], a ret -Func_73701: ; 0x73701 +Func_73701: ; 73701 (1c:7701) call LoadSAVCheckSum call LoadSAVCheckSum1 jp LoadSAVCheckSum2 -SaveSAV: ;$770a +SaveSAV: ; 7370a (1c:770a) callba PrintSaveScreenText ld hl,WouldYouLikeToSaveText call SaveSAVConfirm @@ -149,22 +149,22 @@ SaveSAV: ;$770a call SaveSAVConfirm and a ret nz -.save ;$772d - call SaveSAVtoSRAM ;$7848 +.save + call SaveSAVtoSRAM hlCoord 1, 13 ld bc,$0412 call ClearScreenArea ; clear area 4x12 starting at 13,1 hlCoord 1, 14 ld de,NowSavingString call PlaceString - ld c,$78 + ld c,120 call DelayFrames ld hl,GameSavedText call PrintText ld a, (SFX_02_5d - SFX_Headers_02) / 3 ;sound for saved game call PlaySoundWaitForCurrent call WaitForSoundToFinish - ld c,$1e + ld c,30 jp DelayFrames NowSavingString: @@ -308,7 +308,7 @@ Func_73863: ; 73863 (1c:7863) ret Func_7387b: ; 7387b (1c:787b) - ld hl, PointerTable_73895 ; $7895 + ld hl, PointerTable_73895 ld a, [wd5a0] and $7f cp $6 @@ -411,21 +411,21 @@ Func_7390e: ; 7390e (1c:790e) Func_7393f: ; 7393f (1c:793f) xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld a, $3 - ld [wMenuWatchedKeys], a ; wMenuWatchedKeys + ld [wMenuWatchedKeys], a ld a, $b - ld [wMaxMenuItem], a ; wMaxMenuItem + ld [wMaxMenuItem], a ld a, $1 - ld [wTopMenuItemY], a ; wTopMenuItemY + ld [wTopMenuItemY], a ld a, $c - ld [wTopMenuItemX], a ; wTopMenuItemX + ld [wTopMenuItemX], a xor a ld [wcc37], a ld a, [wd5a0] and $7f - ld [wCurrentMenuItem], a ; wCurrentMenuItem - ld [wLastMenuItem], a ; wLastMenuItem + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a ld hl, wTileMap ld b, $2 ld c, $9 @@ -438,7 +438,7 @@ Func_7393f: ; 7393f (1c:793f) call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] - ld de, BoxNames ; $79d9 + ld de, BoxNames hlCoord 13, 1 call PlaceString ld hl, hFlags_0xFFF6 @@ -461,7 +461,7 @@ Func_7393f: ; 7393f (1c:793f) call PlaceString call Func_73a84 hlCoord 18, 1 - ld de, wWhichTrade ; wWhichTrade + ld de, wWhichTrade ld bc, $14 ld a, $c .asm_739c2 @@ -477,7 +477,7 @@ Func_7393f: ; 7393f (1c:793f) dec a jr nz, .asm_739c2 ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ret ChooseABoxText: ; 739d4 (1c:79d4) @@ -545,7 +545,7 @@ Func_73a7f: ; 73a7f (1c:7a7f) ret Func_73a84: ; 73a84 (1c:7a84) - ld hl, wWhichTrade ; wWhichTrade + ld hl, wWhichTrade push hl ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -566,7 +566,7 @@ Func_73a84: ; 73a84 (1c:7a84) ld c, a ld b, $0 add hl, bc - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] ld [hl], a ret @@ -585,7 +585,7 @@ Func_73ab8: ; 73ab8 (1c:7ab8) ld [hli], a ret -SAVCheckRandomID: ;$7ad1 +SAVCheckRandomID: ; 73ad1 (1c:7ad1) ;checks if Sav file is the same by checking player's name 1st letter ($a598) ; and the two random numbers generated at game beginning ;(which are stored at wPlayerID) @@ -646,7 +646,7 @@ SaveHallOfFameTeams: ; 73b0d (1c:7b0d) LoadHallOfFameTeams: ; 73b3f (1c:7b3f) ld hl, sHallOfFame ld bc, HOF_TEAM - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] call AddNTimes ld de, wcc5b ld bc, HOF_TEAM diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index e3e452f3..7198f289 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -128,7 +128,7 @@ MainSlotMachineLoop: ; 37395 (d:7395) jr nz, .skip2 ld hl, OutOfCoinsSlotMachineText call PrintText - ld c, $3c + ld c, 60 jp DelayFrames .skip2 ld hl, OneMoreGoSlotMachineText @@ -202,13 +202,13 @@ SlotMachine_37480: ; 37480 (d:7480) ret SlotMachine_374ad: ; 374ad (d:74ad) - ld c, $14 + ld c, 20 .loop1 push bc call SlotMachine_37813 call SlotMachine_37823 call SlotMachine_37833 - ld c, $2 + ld c, 2 call DelayFrames pop bc dec c @@ -437,7 +437,7 @@ SlotMachine_37588: ; 37588 (d:7588) ld a, [$ff47] xor $40 ld [$ff47], a - ld c, $5 + ld c, 5 call DelayFrames dec b jr nz, .asm_37638 @@ -674,7 +674,7 @@ SlotMachine_3776b: ; 3776b (d:776b) ld [W_SUBANIMTRANSFORM], a ld a, [wTrainerScreenX] cp $7 - ld c, $8 + ld c, 8 jr nc, .skip2 srl c .skip2 diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index ed23fbc4..e582d1be 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -5,10 +5,10 @@ CopyFixedLengthText: ; 42b1 (1:42b1) SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) ld hl, NintenText - ld de, wPlayerName ; wd158 + ld de, wPlayerName call CopyFixedLengthText ld hl, SonyText - ld de, W_RIVALNAME ; wd34a + ld de, W_RIVALNAME call CopyFixedLengthText xor a ld [hWY], a @@ -24,7 +24,7 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) LoadTitlescreenGraphics: ; 42dd (1:42dd) call GBPalWhiteOut ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a xor a ld [hTilesetType], a ld [hSCX], a @@ -35,27 +35,27 @@ LoadTitlescreenGraphics: ; 42dd (1:42dd) call ClearScreen call DisableLCD call LoadFontTilePatterns - ld hl, NintendoCopyrightLogoGraphics ; $60c8 + ld hl, NintendoCopyrightLogoGraphics ld de, vTitleLogo2 + $100 ld bc, $50 ld a, BANK(NintendoCopyrightLogoGraphics) call FarCopyData2 - ld hl, GamefreakLogoGraphics ; $61f8 + ld hl, GamefreakLogoGraphics ld de, vTitleLogo2 + $100 + $50 ld bc, $90 ld a, BANK(GamefreakLogoGraphics) call FarCopyData2 - ld hl, PokemonLogoGraphics ; $5380 + ld hl, PokemonLogoGraphics ld de, vTitleLogo ld bc, $600 ld a, BANK(PokemonLogoGraphics) call FarCopyData2 ; first chunk - ld hl, PokemonLogoGraphics+$600 ; $5980 + ld hl, PokemonLogoGraphics+$600 ld de, vTitleLogo2 ld bc, $100 ld a, BANK(PokemonLogoGraphics) call FarCopyData2 ; second chunk - ld hl, Version_GFX ; $402f + ld hl, Version_GFX IF DEF(_RED) ld de,vChars2 + $600 ld bc,$50 @@ -97,7 +97,7 @@ ENDC ld a, $74 ld [hl], a hlCoord 2, 17 - ld de, .titlescreenTilemap ; $437f + ld de, .titlescreenTilemap ld b, $10 .asm_4377 ld a, [de] @@ -121,7 +121,7 @@ IF DEF(_BLUE) ld a,SQUIRTLE ; which Pokemon to show first on the title screen ENDC - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a call Func_4524 ld a, $9b call Func_4533 @@ -135,9 +135,9 @@ ENDC call GoPAL_SET call GBPalNormal ld a, $e4 - ld [rOBP0], a ; $ff48 + ld [rOBP0], a ld bc, $ffaf ; background scroll Y - ld hl, .TitleScreenPokemonLogoYScrolls ; $43db + ld hl, .TitleScreenPokemonLogoYScrolls .asm_43c6 ld a, [hli] and a @@ -176,7 +176,7 @@ ENDC ret .asm_43f4 call LoadScreenTilesFromBuffer1 - ld c, $24 + ld c, 36 call DelayFrames ld a, (SFX_1f_63 - SFX_Headers_1f) / 3 call PlaySound @@ -219,7 +219,7 @@ ENDC call Func_4496 jr .asm_443b .asm_4459 - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] call PlayCry call WaitForSoundToFinish call GBPalWhiteOutWithDelay3 @@ -227,7 +227,7 @@ ENDC xor a ld [hWY], a inc a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a call ClearScreen ld a, $98 call Func_4533 @@ -260,7 +260,7 @@ Func_4496: ; 4496 (1:4496) ld hl, TitleMons add hl, bc ld a, [hl] - ld hl, wWhichTrade ; wWhichTrade + ld hl, wWhichTrade ; Can't be the same as before. cp [hl] @@ -289,7 +289,7 @@ Func_44cf: ; 44cf (1:44cf) jr nz, .wait ld a, h - ld [rSCX], a ; $ff43 + ld [rSCX], a .wait2 ld a, [$ff44] ; rLY @@ -298,14 +298,14 @@ Func_44cf: ; 44cf (1:44cf) ret Func_44dd: ; 44dd (1:44dd) - ld hl, PlayerCharacterTitleGraphics ; $66a8 + ld hl, PlayerCharacterTitleGraphics ld de, vSprites ld bc, $230 ld a, BANK(PlayerCharacterTitleGraphics) call FarCopyData2 call ClearSprites xor a - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a ld hl, wOAMBuffer ld de, $605a ld b, $7 @@ -319,10 +319,10 @@ Func_44dd: ; 44dd (1:44dd) ld [hli], a add $8 ld e, a - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] ld [hli], a inc a - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a inc hl dec c jr nz, .asm_44fd @@ -358,12 +358,12 @@ LoadCopyrightAndTextBoxTiles: ; 4538 (1:4538) call LoadTextBoxTilePatterns LoadCopyrightTiles: ; 4541 (1:4541) - ld de, NintendoCopyrightLogoGraphics ; $60c8 + ld de, NintendoCopyrightLogoGraphics ld hl, vChars2 + $600 ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c call CopyVideoData hlCoord 2, 7 - ld de, CopyrightTextString ; $4556 + ld de, CopyrightTextString jp PlaceString CopyrightTextString: ; 4556 (1:4556) diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm index dc1c633a..57e5c3d5 100755 --- a/engine/titlescreen2.asm +++ b/engine/titlescreen2.asm @@ -74,7 +74,7 @@ _TitleScroll: ; 3726a (d:726a) jr nz, .wait ld a, h - ld [rSCX], a ; $ff43 + ld [rSCX], a .wait2 ld a, [$ff44] ; rLY @@ -89,7 +89,7 @@ TitleBallYTable: ; 372a0 (d:72a0) Func_372ac: ; 372ac (d:72ac) ; Animate the TitleBall if a starter just got scrolled out. - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] cp STARTER1 jr z, .ok cp STARTER2 diff --git a/engine/town_map.asm b/engine/town_map.asm index 5a718519..0dd84226 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -7,7 +7,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) push hl ld a, $1 ld [hJoy7], a - ld a, [W_CURMAP] ; W_CURMAP + ld a, [W_CURMAP] push af ld b, $0 call Func_711c4 @@ -19,11 +19,11 @@ DisplayTownMap: ; 70e3e (1c:4e3e) ld bc, $10 call CopyData ld hl, vSprites + $40 - ld de, TownMapCursor ; $4f40 + ld de, TownMapCursor ld bc, (BANK(TownMapCursor) << 8) + $04 call CopyVideoDataDouble xor a - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a pop af jr Func_70e92 @@ -31,8 +31,8 @@ Func_70e7e: ; 70e7e (1c:4e7e) ld hl, wTileMap ld bc, $114 call ClearScreenArea - ld hl, TownMapOrder ; $4f11 - ld a, [wWhichTrade] ; wWhichTrade + ld hl, TownMapOrder + ld a, [wWhichTrade] ld c, a ld b, $0 add hl, bc @@ -86,22 +86,22 @@ Func_70e92: ; 70e92 (1c:4e92) ld [hl], a ret .asm_70ef2 - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] inc a cp $2f jr nz, .asm_70efb xor a .asm_70efb - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a jp Func_70e7e .asm_70f01 - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] dec a cp $ff jr nz, .asm_70f0b ld a, $2e .asm_70f0b - ld [wWhichTrade], a ; wWhichTrade + ld [wWhichTrade], a jp Func_70e7e INCLUDE "data/town_map_order.asm" @@ -139,11 +139,11 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) call LoadTownMap call LoadPlayerSpriteGraphics call LoadFontTilePatterns - ld de, BirdSprite ; $4d80 + ld de, BirdSprite ld hl, vSprites + $40 ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData - ld de, TownMapUpArrow ; $5093 + ld de, TownMapUpArrow ld hl, vChars1 + $6d0 ld bc, (BANK(TownMapUpArrow) << 8) + $01 call CopyVideoDataDouble @@ -156,7 +156,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) ld hl, wTileMap ld de, ToText call PlaceString - ld a, [W_CURMAP] ; W_CURMAP + ld a, [W_CURMAP] ld b, $0 call Func_711c4 ld hl, wTrainerEngageDistance @@ -177,7 +177,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) hlCoord 3, 0 ld de, wcd6d call PlaceString - ld c, $f + ld c, 15 call DelayFrames hlCoord 18, 0 ld [hl], $ed @@ -248,7 +248,7 @@ ToText: ; 7106d (1c:506d) db "To@" Func_71070: ; 71070 (1c:5070) - ld hl, wWhichTrade ; wWhichTrade + ld hl, wWhichTrade ld [hl], $ff inc hl ld a, [W_TOWNVISITEDFLAG] @@ -283,18 +283,18 @@ LoadTownMap: ; 7109b (1c:509b) ld c, $12 call TextBoxBorder call DisableLCD - ld hl, WorldMapTileGraphics ; $65a8 + ld hl, WorldMapTileGraphics ld de, vChars2 + $600 ld bc, $100 ld a, BANK(WorldMapTileGraphics) call FarCopyData2 - ld hl, MonNestIcon ; $56be + ld hl, MonNestIcon ld de, vSprites + $40 ld bc, $8 ld a, BANK(MonNestIcon) call FarCopyDataDouble ld hl, wTileMap - ld de, CompressedMap ; $5100 + ld de, CompressedMap .asm_710d3 ld a, [de] and a @@ -401,7 +401,7 @@ Func_711ef: ; 711ef (1c:51ef) call PlaceString jr .asm_7123e .asm_71236 - ld a, [W_CURMAP] ; W_CURMAP + ld a, [W_CURMAP] ld b, $0 call Func_711c4 .asm_7123e @@ -545,7 +545,7 @@ Func_712f1: ; 712f1 (1c:52f1) cp REDS_HOUSE_1F jr c, .asm_71304 ld bc, $4 - ld hl, InternalMapEntries ; $5382 + ld hl, InternalMapEntries .asm_712fb cp [hl] jr c, .asm_71301 @@ -555,7 +555,7 @@ Func_712f1: ; 712f1 (1c:52f1) inc hl jr .asm_7130d .asm_71304 - ld hl, ExternalMapEntries ; $5313 + ld hl, ExternalMapEntries ld c, a ld b, $0 add hl, bc diff --git a/engine/trade.asm b/engine/trade.asm index bb4fa4e1..6309e8d5 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -662,7 +662,7 @@ Trade_AnimMonMoveVertical: ; 41525 (10:5525) .loop call Trade_AddOffsetsToOAMCoords call Trade_AnimCircledMon - ld c, $8 + ld c, 8 call DelayFrames dec d jr nz, .loop diff --git a/home.asm b/home.asm index 53d08d64..07811175 100644 --- a/home.asm +++ b/home.asm @@ -154,7 +154,7 @@ LoadDestinationWarpPosition:: ; 1313 (0:1313) push af ld a,[wPredefParentBank] ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ld a,b add a add a @@ -166,7 +166,7 @@ LoadDestinationWarpPosition:: ; 1313 (0:1313) call CopyData pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret @@ -258,7 +258,7 @@ LoadMonData:: ; 1372 (0:1372) jp Bankswitch -Func_137a:: ; 137a (0:137a) +OverwritewMoves:: ; 137a (0:137a) ; Write c to [wMoves + b]. Unused. ld hl, wMoves ld e, b @@ -299,17 +299,17 @@ LoadFrontSpriteByMonIndex:: ; 1389 (0:1389) pop hl ld a, [H_LOADEDROMBANK] push af - ld a, Bank(asm_3f0d0) + ld a, Bank(CopyUncompressedPicToHL) ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a xor a ld [$ffe1], a - call asm_3f0d0 + call CopyUncompressedPicToHL xor a ld [W_SPRITEFLIPPED], a pop af ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ret @@ -499,17 +499,17 @@ PrintStatusCondition:: ; 14e1 (0:14e1) ld [hl],"T" and a ret -PrintStatusConditionNotFainted ; 14f6 +PrintStatusConditionNotFainted: ; 14f6 ld a,[H_LOADEDROMBANK] push af ld a,BANK(PrintStatusAilment) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call PrintStatusAilment ; print status condition pop bc ld a,b ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; function to print pokemon level, leaving off the ":L" if the level is at least 100 @@ -544,8 +544,8 @@ PrintLevelCommon:: ; 1523 (0:1523) ld b,$41 ; no leading zeroes, left-aligned, one byte jp PrintNumber -Func_152e:: ; 152e (0:152e) -; Unused. +GetwMoves:: ; 152e (0:152e) +; Unused. Returns the move at index a from wMoves in a ld hl,wMoves ld c,a ld b,0 @@ -561,7 +561,7 @@ GetMonHeader:: ; 1537 (0:1537) push af ld a,BANK(BaseStats) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a push bc push de push hl @@ -616,7 +616,7 @@ GetMonHeader:: ; 1537 (0:1537) pop bc pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; copy party pokemon's name to wcd6d @@ -800,7 +800,7 @@ LoadUncompressedSpriteData:: ; 1672 (0:1672) add a add a add a ; 8*tiles is height in bytes - ld [H_SPRITEHEIGHT], a ; $ff8c + ld [H_SPRITEHEIGHT], a ld a, $7 sub b ; 7-h ; skip for vertical center (in tiles, relative to current column) ld b, a @@ -832,11 +832,11 @@ AlignSpriteDataCentered:: ; 16c2 (0:16c2) ld b, $0 ld c, a add hl, bc - ld a, [H_SPRITEWIDTH] ; $ff8b + ld a, [H_SPRITEWIDTH] .columnLoop push af push hl - ld a, [H_SPRITEHEIGHT] ; $ff8c + ld a, [H_SPRITEHEIGHT] ld c, a .columnInnerLoop ld a, [de] @@ -875,7 +875,7 @@ InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea) ld de, S_SPRITEBUFFER1 + (SPRITEBUFFERSIZE - 1) ; source 2: end of buffer 1 ld bc, S_SPRITEBUFFER0 + (SPRITEBUFFERSIZE - 1) ; source 1: end of buffer 0 ld a, SPRITEBUFFERSIZE/2 ; $c4 - ld [H_SPRITEINTERLACECOUNTER], a ; $ff8b + ld [H_SPRITEINTERLACECOUNTER], a .interlaceLoop ld a, [de] dec de @@ -889,9 +889,9 @@ InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea) ld a, [bc] dec bc ld [hld], a ; write byte of source 1 - ld a, [H_SPRITEINTERLACECOUNTER] ; $ff8b + ld a, [H_SPRITEINTERLACECOUNTER] dec a - ld [H_SPRITEINTERLACECOUNTER], a ; $ff8b + ld [H_SPRITEINTERLACECOUNTER], a jr nz, .interlaceLoop ld a, [W_SPRITEFLIPPED] and a @@ -934,11 +934,11 @@ UpdateSprites:: ; 2429 (0:2429) push af ld a, Bank(_UpdateSprites) ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a call _UpdateSprites pop af ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ret INCLUDE "data/mart_inventories.asm" @@ -1130,7 +1130,7 @@ DisplayTextID:: ; 2920 (0:2920) jp z,FuncTX_PokemonCenterPC cp a,$f5 ; Vending Machine jr nz,.notVendingMachine - callba VendingMachineMenu ; jump banks to vending machine routine + callba VendingMachineMenu ; jump banks to vending machine routine jr AfterDisplayingTextID .notVendingMachine cp a,$f7 ; slot machine @@ -1181,7 +1181,7 @@ CloseTextDisplay:: ; 29e8 (0:29e8) jr nz,.restoreSpriteFacingDirectionLoop ld a,BANK(InitMapSprites) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call InitMapSprites ; reload sprite tile pattern data (since it was partially overwritten by text tile patterns) ld hl,wFontLoaded res 0,[hl] @@ -1191,7 +1191,7 @@ CloseTextDisplay:: ; 29e8 (0:29e8) call LoadCurrentMapView pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a jp UpdateSprites DisplayPokemartDialogue:: ; 2a2e (0:2a2e) @@ -1207,11 +1207,11 @@ DisplayPokemartDialogue:: ; 2a2e (0:2a2e) push af ld a,Bank(DisplayPokemartDialogue_) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call DisplayPokemartDialogue_ pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a jp AfterDisplayingTextID PokemartGreetingText:: ; 2a55 (0:2a55) @@ -1244,11 +1244,11 @@ DisplayPokemonCenterDialogue:: ; 2a72 (0:2a72) push af ld a,Bank(DisplayPokemonCenterDialogue_) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call DisplayPokemonCenterDialogue_ pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a jp AfterDisplayingTextID DisplaySafariGameOverText:: ; 2a90 (0:2a90) @@ -1329,8 +1329,8 @@ AddAmountSoldToMoney:: ; 2b9e (0:2b9e) ld [wTextBoxID],a call DisplayTextBoxID ; redraw money text box ld a, (SFX_02_5a - SFX_Headers_02) / 3 - call PlaySoundWaitForCurrent ; play sound - jp WaitForSoundToFinish ; wait until sound is done playing + call PlaySoundWaitForCurrent + jp WaitForSoundToFinish ; function to remove an item (in varying quantities) from the player's bag or PC box ; INPUT: @@ -1342,11 +1342,11 @@ RemoveItemFromInventory:: ; 2bbb (0:2bbb) push af ld a,BANK(RemoveItemFromInventory_) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call RemoveItemFromInventory_ pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; function to add an item (in varying quantities) to the player's bag or PC box @@ -1361,12 +1361,12 @@ AddItemToInventory:: ; 2bcf (0:2bcf) push af ld a,BANK(AddItemToInventory_) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call AddItemToInventory_ pop bc ld a,b ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a pop bc ret @@ -1408,7 +1408,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6) ld a,[wListMenuID] and a ; is it a PC pokemon list? jr nz,.skipMovingSprites - call UpdateSprites ; move sprites + call UpdateSprites .skipMovingSprites ld a,1 ; max menu item ID is 1 if the list has less than 2 entries ld [wcc37],a @@ -1900,7 +1900,7 @@ GetMonName:: ; 2f9e (0:2f9e) push af ld a,BANK(MonsterNames) ; 07 ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ld a,[wd11e] dec a ld hl,MonsterNames ; 421E @@ -1916,7 +1916,7 @@ GetMonName:: ; 2f9e (0:2f9e) pop de pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a pop hl ret @@ -2051,7 +2051,7 @@ ReloadMapData:: ; 3071 (0:3071) call EnableLCD pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; reloads tileset tile patterns @@ -2065,7 +2065,7 @@ ReloadTilesetTilePatterns:: ; 3090 (0:3090) call EnableLCD pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; shows the town map and lets the player choose a destination to fly to @@ -2109,12 +2109,12 @@ TossItem:: ; 30c4 (0:30c4) push af ld a,BANK(TossItem_) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call TossItem_ pop de ld a,d ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; checks if an item is a key item @@ -2142,12 +2142,12 @@ DisplayTextBoxID:: ; 30e8 (0:30e8) push af ld a,BANK(DisplayTextBoxID_) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call DisplayTextBoxID_ pop bc ld a,b ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; not zero if an NPC movement script is running, the player character is @@ -2184,12 +2184,12 @@ RunNPCMovementScript:: ; 310e (0:310e) push af ld a, [wNPCMovementScriptBank] ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ld a, [wNPCMovementScriptFunctionNum] call CallFunctionInTable pop af ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ret .NPCMovementScriptPointerTables dw ProfOakMovementScriptPointerTable @@ -2312,7 +2312,7 @@ TalkToTrainer:: ; 31cc (0:31cc) ld a, $6 call ReadTrainerHeaderInfo ; print after battle text jp PrintText -.trainerNotYetFought ; 0x31ed +.trainerNotYetFought ld a, $4 call ReadTrainerHeaderInfo ; print before battle text call PrintText @@ -2392,7 +2392,7 @@ EndTrainerBattle:: ; 3275 (0:3275) res 7, [hl] ld hl, wFlags_0xcd60 res 0, [hl] ; player is no longer engaged by any trainer - ld a, [W_ISINBATTLE] ; W_ISINBATTLE + ld a, [W_ISINBATTLE] cp $ff jp z, ResetButtonPressedAndMapScript ld a, $2 @@ -2436,32 +2436,32 @@ TrainerWalkUpToPlayer_Bank0:: ; 32cf (0:32cf) ; sets opponent type and mon set/lvl based on the engaging trainer data InitBattleEnemyParameters:: ; 32d7 (0:32d7) ld a, [wEngagedTrainerClass] - ld [W_CUROPPONENT], a ; wd059 + ld [W_CUROPPONENT], a ld [W_ENEMYMONORTRAINERCLASS], a cp $c8 - ld a, [wEngagedTrainerSet] ; wcd2e + ld a, [wEngagedTrainerSet] jr c, .noTrainer - ld [W_TRAINERNO], a ; wd05d + ld [W_TRAINERNO], a ret .noTrainer - ld [W_CURENEMYLVL], a ; W_CURENEMYLVL + ld [W_CURENEMYLVL], a ret GetSpritePosition1:: ; 32ef (0:32ef) ld hl, _GetSpritePosition1 - jr asm_3301 + jr SpritePositionBankswitch GetSpritePosition2:: ; 32f4 (0:32f4) ld hl, _GetSpritePosition2 - jr asm_3301 ; 0x32f7 $8 + jr SpritePositionBankswitch SetSpritePosition1:: ; 32f9 (0:32f9) ld hl, _SetSpritePosition1 - jr asm_3301 + jr SpritePositionBankswitch SetSpritePosition2:: ; 32fe (0:32fe) ld hl, _SetSpritePosition2 -asm_3301:: ; 3301 (0:3301) +SpritePositionBankswitch:: ; 3301 (0:3301) ld b, BANK(_GetSpritePosition1) ; BANK(_GetSpritePosition2), BANK(_SetSpritePosition1), BANK(_SetSpritePosition2) jp Bankswitch ; indirect jump to one of the four functions @@ -2497,11 +2497,11 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) ld [wTrainerEngageDistance], a ld a, [wSpriteIndex] swap a - ld [wTrainerSpriteOffset], a ; wWhichTrade + ld [wTrainerSpriteOffset], a predef TrainerEngage pop de pop hl - ld a, [wTrainerSpriteOffset] ; wWhichTrade + ld a, [wTrainerSpriteOffset] and a ret nz ; break if the trainer is engaging .trainerAlreadyFought @@ -2539,7 +2539,7 @@ EngageMapTrainer:: ; 336a (0:336a) ld a, [hli] ; load trainer class ld [wEngagedTrainerClass], a ld a, [hl] ; load trainer mon set - ld [wEnemyMonAttackMod], a ; wcd2e + ld [wEnemyMonAttackMod], a jp PlayTrainerMusic PrintEndBattleText:: ; 3381 (0:3381) @@ -2589,8 +2589,10 @@ TrainerEndBattleText:: ; 33cf (0:33cf) call TextCommandProcessor jp TextScriptEnd +; only engage withe trainer if the player is not already +; engaged with another trainer ; XXX unused? -Func_33dd:: ; 33dd (0:33dd) +CheckIfAlreadyEngaged:: ; 33dd (0:33dd) ld a, [wFlags_0xcd60] bit 0, a ret nz @@ -2606,13 +2608,13 @@ PlayTrainerMusic:: ; 33e8 (0:33e8) ret z cp $c8 + SONY3 ret z - ld a, [W_GYMLEADERNO] ; W_GYMLEADERNO + ld a, [W_GYMLEADERNO] and a ret nz xor a ld [wMusicHeaderPointer], a ld a, $ff - call PlaySound ; stop music + call PlaySound ld a, BANK(Music_MeetEvilTrainer) ld [wc0ef], a ld [wc0f0], a @@ -2719,13 +2721,13 @@ IsItemInBag:: ; 3493 (0:3493) DisplayPokedex:: ; 349b (0:349b) ld [wd11e], a - ld b, BANK(Func_7c18) - ld hl, Func_7c18 + ld b, BANK(_DisplayPokedex) + ld hl, _DisplayPokedex jp Bankswitch SetSpriteFacingDirectionAndDelay:: ; 34a6 (0:34a6) call SetSpriteFacingDirection - ld c, $6 + ld c, 6 jp DelayFrames SetSpriteFacingDirection:: ; 34ae (0:34ae) @@ -2842,7 +2844,7 @@ DecodeRLEList:: ; 350c (0:350c) ld a, [wRLEByteCount] add c ld [wRLEByteCount], a ; update total number of written bytes - ld a, [H_DOWNARROWBLINKCNT1] ; $ff8b + ld a, [H_DOWNARROWBLINKCNT1] call FillMemory ; write a c-times to output inc de jr .listLoop @@ -2903,7 +2905,7 @@ GetTrainerInformation:: ; 3566 (0:3566) jr nz, .linkBattle ld a, Bank(TrainerPicAndMoneyPointers) call BankswitchHome - ld a, [W_TRAINERCLASS] ; wd031 + ld a, [W_TRAINERCLASS] dec a ld hl, TrainerPicAndMoneyPointers ld bc, $5 @@ -2960,14 +2962,14 @@ BankswitchHome:: ; 35bc (0:35bc) ld [wcf08],a ld a,[wcf09] ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret BankswitchBack:: ; 35cd (0:35cd) ; returns from BankswitchHome ld a,[wcf08] ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret Bankswitch:: ; 35d6 (0:35d6) @@ -2977,7 +2979,7 @@ Bankswitch:: ; 35d6 (0:35d6) push af ld a,b ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ld bc,.Return push bc jp [hl] @@ -2985,7 +2987,7 @@ Bankswitch:: ; 35d6 (0:35d6) pop bc ld a,b ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; displays yes/no choice @@ -3178,13 +3180,13 @@ SaveScreenTilesToBuffer2:: ; 36f4 (0:36f4) LoadScreenTilesFromBuffer2:: ; 3701 (0:3701) call LoadScreenTilesFromBuffer2DisableBGTransfer ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ret ; loads screen tiles stored in wTileMapBackup2 but leaves H_AUTOBGTRANSFERENABLED disabled LoadScreenTilesFromBuffer2DisableBGTransfer:: ; 3709 (0:3709) xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup2 ld de, wTileMap ld bc, $168 @@ -3199,13 +3201,13 @@ SaveScreenTilesToBuffer1:: ; 3719 (0:3719) LoadScreenTilesFromBuffer1:: ; 3725 (0:3725) xor a - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup ld de, wTileMap ld bc, $168 call CopyData ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a ret DelayFrames:: ; 3739 (0:3739) @@ -3279,11 +3281,11 @@ GetName:: ; 376b (0:376b) ld e,l ld d,h jr .gotPtr -.otherEntries ; $378d +.otherEntries ;2-7 = OTHER ENTRIES ld a,[wPredefBank] ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ld a,[wNameListType] ;VariousNames' entryID dec a add a @@ -3291,7 +3293,7 @@ GetName:: ; 376b (0:376b) ld e,a jr nc,.skip inc d -.skip ; $37a0 +.skip ld hl,NamePointers add hl,de ld a,[hli] @@ -3321,7 +3323,7 @@ GetName:: ; 376b (0:376b) ld de,wcd6d ld bc,$0014 call CopyData -.gotPtr ; $37cd +.gotPtr ld a,e ld [wcf8d],a ld a,d @@ -3331,7 +3333,7 @@ GetName:: ; 376b (0:376b) pop hl pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret GetItemPrice:: ; 37df (0:37df) @@ -3346,7 +3348,7 @@ GetItemPrice:: ; 37df (0:37df) ld a, $f ; hardcoded Bank .asm_37ed ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ld hl, wItemPrices ld a, [hli] ld h, [hl] @@ -3370,13 +3372,13 @@ GetItemPrice:: ; 37df (0:37df) .getTMPrice ld a, Bank(GetMachinePrice) ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a call GetMachinePrice .asm_381c ld de, hItemPrice pop af ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ret ; copies a string from [de] to [wcf4b] @@ -3486,7 +3488,7 @@ ManualTextScroll:: ; 3898 (0:3898) ld a, (SFX_02_40 - SFX_Headers_02) / 3 jp PlaySound .inLinkBattle - ld c, $41 + ld c, 65 jp DelayFrames ; function to do multiplication @@ -3521,11 +3523,11 @@ Divide:: ; 38b9 (0:38b9) push af ld a,Bank(_Divide) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a call _Divide pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a pop bc pop de pop hl @@ -3753,7 +3755,7 @@ CalcStat:: ; 394a (0:394a) ld [H_MULTIPLICAND+1], a xor a ld [H_MULTIPLICAND], a - ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL + ld a, [W_CURENEMYLVL] ld [H_MULTIPLIER], a call Multiply ; ((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level ld a, [H_MULTIPLICAND] @@ -3771,7 +3773,7 @@ CalcStat:: ; 394a (0:394a) cp $1 ld a, $5 jr nz, .notHPStat - ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL + ld a, [W_CURENEMYLVL] ld b, a ld a, [H_MULTIPLICAND+2] add b @@ -3816,25 +3818,25 @@ AddEnemyMonToPlayerParty:: ; 3a53 (0:3a53) push af ld a, BANK(_AddEnemyMonToPlayerParty) ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a call _AddEnemyMonToPlayerParty pop bc ld a, b ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ret Func_3a68:: ; 3a68 (0:3a68) ld a, [H_LOADEDROMBANK] push af - ld a, BANK(Func_f51e) + ld a, BANK(MoveMon) ld [H_LOADEDROMBANK], a - ld [$2000], a - call Func_f51e + ld [MBC1RomBank], a + call MoveMon pop bc ld a, b ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ret ; skips a text entries, each of size $b (like trainer name, OT name, rival name, ...) @@ -4010,7 +4012,7 @@ HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2) pop hl jr nz,.skipPlayingSound ld a,(SFX_02_40 - SFX_Headers_02) / 3 - call PlaySound ; play sound + call PlaySound .skipPlayingSound pop af ld [H_DOWNARROWBLINKCNT2],a @@ -4648,7 +4650,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ; 3eb5 (0:3eb5) ret PrintPredefTextID:: ; 3ef5 (0:3ef5) - ld [H_DOWNARROWBLINKCNT2], a ; $ff8c + ld [H_DOWNARROWBLINKCNT2], a ld hl, TextPredefs call SetMapTextPointer ld hl, wcf11 diff --git a/home/audio.asm b/home/audio.asm index 9210924c..1301550c 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -4,19 +4,19 @@ PlayDefaultMusic:: ; 2307 (0:2307) ld c, a ld d, a ld [wcfca], a - jr asm_2324 + jr Func_2324 Func_2312:: ; 2312 (0:2312) ld c, $a ld d, $0 ld a, [wd72e] bit 5, a - jr z, asm_2324 + jr z, Func_2324 xor a ld [wcfca], a ld c, $8 ld d, c -asm_2324:: ; 2324 (0:2324) +Func_2324:: ; 2324 (0:2324) ld a, [wWalkBikeSurfState] and a jr z, .asm_2343 @@ -146,27 +146,27 @@ PlaySound:: ; 23b1 (0:23b1) ld [$ffb9], a ld a, [wc0ef] ld [H_LOADEDROMBANK], a - ld [$2000], a - cp BANK(Func_9876) + ld [MBC1RomBank], a + cp BANK(Music2_9876) jr nz, .checkForBank08 .bank02 ld a, b - call Func_9876 + call Music2_9876 jr .asm_240b .checkForBank08 - cp BANK(Func_22035) + cp BANK(Music8_22035) jr nz, .bank1F .bank08 ld a, b - call Func_22035 + call Music8_22035 jr .asm_240b .bank1F ld a, b - call Func_7d8ea + call Music1f_7d8ea .asm_240b ld a, [$ffb9] ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a jr .asm_2425 .asm_2414 ld a, b diff --git a/home/init.asm b/home/init.asm index cc89ad34..4ac2a4eb 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,7 +1,7 @@ SoftReset:: call StopAllSounds call GBPalWhiteOut - ld c, $20 + ld c, 32 call DelayFrames ; fallthrough diff --git a/home/overworld.asm b/home/overworld.asm index c5c180c7..4aea2102 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -257,7 +257,7 @@ OverworldLoopLessDelay:: jr z,.noSpinning callba LoadSpinnerArrowTiles ; spin while moving .noSpinning - call UpdateSprites ; move sprites + call UpdateSprites .moveAhead2 ld hl,wFlags_0xcd60 res 2,[hl] @@ -335,7 +335,7 @@ OverworldLoopLessDelay:: and a jr z,.allPokemonFainted .noFaintCheck - ld c,$0a + ld c,10 call DelayFrames jp EnterMap .allPokemonFainted @@ -778,7 +778,7 @@ HandleFlyWarpOrDungeonWarp:: call LeaveMapAnim ld a, Bank(SpecialWarpIn) ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a call SpecialWarpIn jp SpecialEnterMap @@ -1358,7 +1358,7 @@ LoadCurrentMapView:: ; 0caa (0:0caa) push af ld a,[W_TILESETBANK] ; tile data ROM bank ld [H_LOADEDROMBANK],a - ld [$2000],a ; switch to ROM bank that contains tile data + ld [MBC1RomBank],a ; switch to ROM bank that contains tile data ld a,[wCurrentTileBlockMapViewPointer] ; address of upper left corner of current map view ld e,a ld a,[wCurrentTileBlockMapViewPointer + 1] @@ -1440,7 +1440,7 @@ LoadCurrentMapView:: ; 0caa (0:0caa) jr nz,.rowLoop2 pop af ld [H_LOADEDROMBANK],a - ld [$2000],a ; restore previous ROM bank + ld [MBC1RomBank],a ; restore previous ROM bank ret AdvancePlayerSprite:: ; 0d27 (0:0d27) @@ -1981,7 +1981,7 @@ RunMapScript:: ; 101b (0:101b) ret LoadWalkingPlayerSpriteGraphics:: ; 104d (0:104d) - ld de,RedSprite ; $4180 + ld de,RedSprite ld hl,vNPCSprites jr LoadPlayerSpriteGraphicsCommon @@ -2276,7 +2276,7 @@ LoadMapHeader:: ; 107c (0:107c) push af ld a, BANK(MapSongBanks) ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ld hl, MapSongBanks add hl,bc add hl,bc @@ -2286,7 +2286,7 @@ LoadMapHeader:: ; 107c (0:107c) ld [wd35c],a ; music 2 pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; function to copy map connection data from ROM to WRAM @@ -2359,7 +2359,7 @@ LoadMapData:: ; 1241 (0:1241) .restoreRomBank pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a ret ; function to switch to the ROM bank that a map is stored in @@ -2378,7 +2378,7 @@ SwitchToMapRomBank:: ; 12bc (0:12bc) call BankswitchBack ld a,[$ffe8] ld [H_LOADEDROMBANK],a - ld [$2000],a ; switch to map ROM bank + ld [MBC1RomBank],a ; switch to map ROM bank pop bc pop hl ret diff --git a/home/pic.asm b/home/pic.asm index 6aa2e5c0..68e5c0ad 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -6,7 +6,7 @@ UncompressSpriteData:: ; 24fd (0:24fd) push af ld a, b ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ld a, $a ld [$0], a xor a @@ -14,7 +14,7 @@ UncompressSpriteData:: ; 24fd (0:24fd) call _UncompressSpriteData pop af ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ret ; initializes necessary data to load a sprite and runs UncompressSpriteDataLoop @@ -31,7 +31,7 @@ _UncompressSpriteData:: ; 251a (0:251a) xor a ld [W_SPRITECURPOSX], a ld [W_SPRITECURPOSY], a - ld [W_SPRITELOADFLAGS], a ; wd0a8 + ld [W_SPRITELOADFLAGS], a call ReadNextInputByte ; first byte of input determines sprite width (high nybble) and height (low nybble) in tiles (8x8 pixels) ld b, a and $f @@ -57,13 +57,13 @@ _UncompressSpriteData:: ; 251a (0:251a) ; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack UncompressSpriteDataLoop:: ; 2556 (0:2556) ld hl, S_SPRITEBUFFER1 - ld a, [W_SPRITELOADFLAGS] ; wd0a8 + ld a, [W_SPRITELOADFLAGS] bit 0, a jr z, .useSpriteBuffer1 ; check which buffer to use ld hl, S_SPRITEBUFFER2 .useSpriteBuffer1 call StoreSpriteOutputPointer - ld a, [W_SPRITELOADFLAGS] ; wd0a8 + ld a, [W_SPRITELOADFLAGS] bit 1, a jr z, .startDecompression ; check if last iteration call ReadNextInputBit ; if last chunk, read 1-2 bit unpacking mode @@ -195,12 +195,12 @@ MoveToNextBufferPosition:: ; 25d8 (0:25d8) pop hl xor a ld [W_SPRITECURPOSX], a - ld a, [W_SPRITELOADFLAGS] ; wd0a8 + ld a, [W_SPRITELOADFLAGS] bit 1, a jr nz, .done ; test if there is one more sprite to go xor $1 set 1, a - ld [W_SPRITELOADFLAGS], a ; wd0a8 + ld [W_SPRITELOADFLAGS], a jp UncompressSpriteDataLoop .done jp UnpackSprite @@ -539,7 +539,7 @@ ReverseNybble:: ; 2837 (0:2837) ; resets sprite buffer pointers to buffer 1 and 2, depending on W_SPRITELOADFLAGS ResetSpriteBufferPointers:: ; 2841 (0:2841) - ld a, [W_SPRITELOADFLAGS] ; wd0a8 + ld a, [W_SPRITELOADFLAGS] bit 0, a jr nz, .buffer2Selected ld de, S_SPRITEBUFFER1 diff --git a/home/predef.asm b/home/predef.asm index 8efe3000..2fac9aca 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -14,13 +14,13 @@ Predef:: push af ld a, BANK(GetPredefPointer) ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a call GetPredefPointer ld a, [wPredefBank] ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ld de, .done push de @@ -29,7 +29,7 @@ Predef:: pop af ld [H_LOADEDROMBANK], a - ld [$2000], a + ld [MBC1RomBank], a ret GetPredefRegisters:: diff --git a/home/text.asm b/home/text.asm index 276b652e..fabcd843 100644 --- a/home/text.asm +++ b/home/text.asm @@ -293,7 +293,7 @@ Char51:: ; 1ab4 (0:1ab4) hlCoord 1, 13 ld bc,$0412 call ClearScreenArea - ld c,$14 + ld c,20 call DelayFrames pop de hlCoord 1, 14 @@ -308,7 +308,7 @@ Char49:: ; 1ad5 (0:1ad5) hlCoord 1, 10 ld bc,$0712 call ClearScreenArea - ld c,$14 + ld c,20 call DelayFrames pop de pop hl @@ -690,7 +690,7 @@ TextCommand17:: ; 1ca3 (0:1ca3) ld d,a ld a,[hli] ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a push hl ld l,e ld h,d @@ -698,7 +698,7 @@ TextCommand17:: ; 1ca3 (0:1ca3) pop hl pop af ld [H_LOADEDROMBANK],a - ld [$2000],a + ld [MBC1RomBank],a jp NextTextCommand TextCommandJumpTable:: ; 1cc1 (0:1cc1) diff --git a/main.asm b/main.asm index a3088c40..bc1c5f15 100755 --- a/main.asm +++ b/main.asm @@ -588,7 +588,7 @@ INCLUDE "engine/overworld/movement.asm" INCLUDE "engine/cable_club.asm" LoadTrainerInfoTextBoxTiles: ; 5ae6 (1:5ae6) - ld de, TrainerInfoTextBoxTileGraphics ; $7b98 + ld de, TrainerInfoTextBoxTileGraphics ld hl, vChars2 + $760 ld bc, (BANK(TrainerInfoTextBoxTileGraphics) << 8) +$09 jp CopyVideoData @@ -1028,7 +1028,7 @@ DisplayTextIDInit: ; 7096 (1:7096) bit 4,[hl] res 4,[hl] jr nz,.skipMovingSprites - call UpdateSprites ; move sprites + call UpdateSprites .skipMovingSprites ; loop to copy C1X9 (direction the sprite is facing) to C2X9 for each sprite ; this is done because when you talk to an NPC, they turn to look your way @@ -1210,7 +1210,7 @@ DisplayTextBoxID_: ; 72ea (1:72ea) call PlaceString pop af ld [wd730],a - call UpdateSprites ; move sprites + call UpdateSprites ret ; function to search a table terminated with $ff for a byte matching c in increments of de @@ -1912,16 +1912,16 @@ INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" INCLUDE "engine/menu/players_pc.asm" _RemovePokemon: ; 7b68 (1:7b68) - ld hl, wPartyCount ; wPartyCount + ld hl, wPartyCount ld a, [wcf95] and a jr z, .asm_7b74 - ld hl, W_NUMINBOX ; wda80 + ld hl, W_NUMINBOX .asm_7b74 ld a, [hl] dec a ld [hli], a - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] ld c, a ld b, $0 add hl, bc @@ -1934,7 +1934,7 @@ _RemovePokemon: ; 7b68 (1:7b68) ld [hli], a inc a jr nz, .asm_7b81 - ld hl, wPartyMonOT ; wd273 + ld hl, wPartyMonOT ld d, $5 ld a, [wcf95] and a @@ -1942,9 +1942,9 @@ _RemovePokemon: ; 7b68 (1:7b68) ld hl, wBoxMonOT ld d, $13 .asm_7b97 - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] call SkipFixedLengthTextEntries - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] cp d jr nz, .asm_7ba6 ld [hl], $ff @@ -1954,7 +1954,7 @@ _RemovePokemon: ; 7b68 (1:7b68) ld e, l ld bc, $b add hl, bc - ld bc, wPartyMonNicks ; wPartyMonNicks + ld bc, wPartyMonNicks ld a, [wcf95] and a jr z, .asm_7bb8 @@ -1969,7 +1969,7 @@ _RemovePokemon: ; 7b68 (1:7b68) ld hl, wBoxMons ld bc, wBoxMon2 - wBoxMon1 .asm_7bcd - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] call AddNTimes ld d, h ld e, l @@ -1983,23 +1983,23 @@ _RemovePokemon: ; 7b68 (1:7b68) .asm_7be4 ld bc, wPartyMon2 - wPartyMon1 add hl, bc - ld bc, wPartyMonOT ; wd273 + ld bc, wPartyMonOT .asm_7beb call CopyDataUntil - ld hl, wPartyMonNicks ; wPartyMonNicks + ld hl, wPartyMonNicks ld a, [wcf95] and a jr z, .asm_7bfa ld hl, wBoxMonNicks .asm_7bfa ld bc, $b - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] call AddNTimes ld d, h ld e, l ld bc, $b add hl, bc - ld bc, wPokedexOwned ; wPokedexOwned + ld bc, wPokedexOwned ld a, [wcf95] and a jr z, .asm_7c15 @@ -2007,14 +2007,14 @@ _RemovePokemon: ; 7b68 (1:7b68) .asm_7c15 jp CopyDataUntil -Func_7c18: ; 7c18 (1:7c18) +_DisplayPokedex: ; 7c18 (1:7c18) ld hl, wd730 set 6, [hl] predef ShowPokedexData ld hl, wd730 res 6, [hl] call ReloadMapData - ld c, $a + ld c, 10 call DelayFrames predef IndexToPokedex ld a, [wd11e] @@ -2043,7 +2043,7 @@ ClearVariablesAfterLoadingMapData: ; c335 (3:4335) xor a ld [H_AUTOBGTRANSFERENABLED], a ld [wStepCounter], a - ld [W_LONEATTACKNO], a ; W_GYMLEADERNO + ld [W_LONEATTACKNO], a ld [hJoyPressed], a ld [hJoyReleased], a ld [hJoyHeld], a @@ -2293,7 +2293,7 @@ IsPlayerStandingOnDoorTileOrWarpTile: ; c49d (3:449d) INCLUDE "data/warp_tile_ids.asm" PrintSafariZoneSteps: ; c52f (3:452f) - ld a, [W_CURMAP] ; W_CURMAP + ld a, [W_CURMAP] cp SAFARI_ZONE_EAST ret c cp UNKNOWN_DUNGEON_2 @@ -2303,16 +2303,16 @@ PrintSafariZoneSteps: ; c52f (3:452f) ld c, $7 call TextBoxBorder hlCoord 1, 1 - ld de, wSafariSteps ; wd70d + ld de, wSafariSteps ld bc, $203 call PrintNumber hlCoord 4, 1 - ld de, SafariSteps ; $4579 + ld de, SafariSteps call PlaceString hlCoord 1, 3 ld de, SafariBallText call PlaceString - ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS + ld a, [W_NUMSAFARIBALLS] cp $a jr nc, .asm_c56d hlCoord 5, 3 @@ -2320,7 +2320,7 @@ PrintSafariZoneSteps: ; c52f (3:452f) ld [hl], a .asm_c56d hlCoord 6, 3 - ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS + ld de, W_NUMSAFARIBALLS ld bc, $102 jp PrintNumber @@ -2742,14 +2742,14 @@ CheckForForcedBikeSurf: ; cdc0 (3:4dc0) ld a, [wd732] bit 5, a jr nz, .asm_cdec - ld a, [W_CURMAP] ; W_CURMAP + ld a, [W_CURMAP] cp SEAFOAM_ISLANDS_5 ret nz ld a, [wd881] and $3 cp $3 ret z - ld hl, CoordsData_cdf7 ; $4df7 + ld hl, CoordsData_cdf7 call ArePlayerCoordsInArray ret nc ld hl, wd728 @@ -3132,7 +3132,7 @@ ReplaceTileBlock: ; ee9e (3:6e9e) ret c ; return if the replaced tile block is above the map view in memory RedrawMapView: ; eedc (3:6edc) - ld a, [W_ISINBATTLE] ; W_ISINBATTLE + ld a, [W_ISINBATTLE] inc a ret z ld a, [H_AUTOBGTRANSFERENABLED] @@ -3255,7 +3255,7 @@ LoadMissableObjects: ; f132 (3:7132) ld [H_DIVISOR], a ld b, $2 call Divide ; divide difference by 3, resulting in the global offset (number of missable items before ours) - ld a, [W_CURMAP] ; W_CURMAP + ld a, [W_CURMAP] ld b, a ld a, [H_DIVIDEND+3] ld c, a ; store global offset in c @@ -3535,11 +3535,11 @@ ResetBoulderPushFlags: ; f2dd (3:72dd) ret _AddPartyMon: ; f2e5 (3:72e5) - ld de, wPartyCount ; wPartyCount + ld de, wPartyCount ld a, [wcc49] and $f jr z, .asm_f2f2 - ld de, wEnemyPartyCount ; wEnemyPartyCount + ld de, wEnemyPartyCount .asm_f2f2 ld a, [de] inc a @@ -3558,7 +3558,7 @@ _AddPartyMon: ; f2e5 (3:72e5) inc de ld a, $ff ld [de], a - ld hl, wPartyMonOT ; wd273 + ld hl, wPartyMonOT ld a, [wcc49] and $f jr z, .asm_f315 @@ -3569,13 +3569,13 @@ _AddPartyMon: ; f2e5 (3:72e5) call SkipFixedLengthTextEntries ld d, h ld e, l - ld hl, wPlayerName ; wd158 + ld hl, wPlayerName ld bc, $b call CopyData ld a, [wcc49] and a jr nz, .asm_f33f - ld hl, wPartyMonNicks ; wPartyMonNicks + ld hl, wPartyMonNicks ld a, [$ffe4] dec a call SkipFixedLengthTextEntries @@ -3619,7 +3619,7 @@ _AddPartyMon: ; f2e5 (3:72e5) dec a ld c, a ld b, $2 - ld hl, wPokedexOwned ; wPokedexOwned + ld hl, wPokedexOwned call FlagAction ld a, c ld [wd153], a @@ -3630,11 +3630,11 @@ _AddPartyMon: ; f2e5 (3:72e5) push bc call FlagAction pop bc - ld hl, wPokedexSeen ; wd30a + ld hl, wPokedexSeen call FlagAction pop hl push hl - ld a, [W_ISINBATTLE] ; W_ISINBATTLE + ld a, [W_ISINBATTLE] and a jr nz, .copyEnemyMonData call Random ; generate random IVs @@ -3749,13 +3749,13 @@ _AddPartyMon: ; f2e5 (3:72e5) pop hl call AddPartyMon_WriteMovePP inc de - ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL + ld a, [W_CURENEMYLVL] ld [de], a inc de - ld a, [W_ISINBATTLE] ; W_ISINBATTLE + ld a, [W_ISINBATTLE] dec a jr nz, .calcFreshStats - ld hl, wEnemyMonMaxHP ; wEnemyMonMaxHP + ld hl, wEnemyMonMaxHP ld bc, $a call CopyData ; copy stats of cur enemy mon pop hl @@ -3863,7 +3863,7 @@ _AddEnemyMonToPlayerParty: ; f49d (3:749d) and a ret ; return success -Func_f51e: ; f51e (3:751e) +MoveMon: ; f51e (3:751e) ld a, [wcf95] and a jr z, .checkPartyMonSlots @@ -3872,13 +3872,13 @@ Func_f51e: ; f51e (3:751e) cp $3 ld hl, wDayCareMon jr z, .asm_f575 - ld hl, W_NUMINBOX ; wda80 + ld hl, W_NUMINBOX ld a, [hl] cp MONS_PER_BOX jr nz, .partyOrBoxNotFull jr .boxFull .checkPartyMonSlots - ld hl, wPartyCount ; wPartyCount + ld hl, wPartyCount ld a, [hl] cp PARTY_LENGTH jr nz, .partyOrBoxNotFull @@ -3903,11 +3903,11 @@ Func_f51e: ; f51e (3:751e) dec a ld hl, wPartyMons ld bc, wPartyMon2 - wPartyMon1 ; $2c - ld a, [wPartyCount] ; wPartyCount + ld a, [wPartyCount] jr nz, .skipToNewMonEntry ld hl, wBoxMons ld bc, wBoxMon2 - wBoxMon1 ; $21 - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] .skipToNewMonEntry dec a call AddNTimes @@ -3926,7 +3926,7 @@ Func_f51e: ; f51e (3:751e) ld hl, wPartyMons ld bc, wPartyMon2 - wPartyMon1 ; $2c .asm_f591 - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] call AddNTimes .asm_f597 push hl @@ -3953,11 +3953,11 @@ Func_f51e: ; f51e (3:751e) ld de, W_DAYCAREMONOT jr z, .asm_f5d3 dec a - ld hl, wPartyMonOT ; wd273 - ld a, [wPartyCount] ; wPartyCount + ld hl, wPartyMonOT + ld a, [wPartyCount] jr nz, .asm_f5cd ld hl, wBoxMonOT - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] .asm_f5cd dec a call SkipFixedLengthTextEntries @@ -3971,9 +3971,9 @@ Func_f51e: ; f51e (3:751e) ld hl, W_DAYCAREMONOT cp $2 jr z, .asm_f5ec - ld hl, wPartyMonOT ; wd273 + ld hl, wPartyMonOT .asm_f5e6 - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] call SkipFixedLengthTextEntries .asm_f5ec ld bc, $b @@ -3983,11 +3983,11 @@ Func_f51e: ; f51e (3:751e) ld de, W_DAYCAREMONNAME jr z, .asm_f611 dec a - ld hl, wPartyMonNicks ; wPartyMonNicks - ld a, [wPartyCount] ; wPartyCount + ld hl, wPartyMonNicks + ld a, [wPartyCount] jr nz, .asm_f60b ld hl, wBoxMonNicks - ld a, [W_NUMINBOX] ; wda80 + ld a, [W_NUMINBOX] .asm_f60b dec a call SkipFixedLengthTextEntries @@ -4001,9 +4001,9 @@ Func_f51e: ; f51e (3:751e) ld hl, W_DAYCAREMONNAME cp $2 jr z, .asm_f62a - ld hl, wPartyMonNicks ; wPartyMonNicks + ld hl, wPartyMonNicks .asm_f624 - ld a, [wWhichPokemon] ; wWhichPokemon + ld a, [wWhichPokemon] call SkipFixedLengthTextEntries .asm_f62a ld bc, $b @@ -4021,7 +4021,7 @@ Func_f51e: ; f51e (3:751e) call LoadMonData callba CalcLevelFromExperience ld a, d - ld [W_CURENEMYLVL], a ; W_CURENEMYLVL + ld [W_CURENEMYLVL], a pop hl ld bc, wBoxMon2 - wBoxMon1 add hl, bc @@ -4256,7 +4256,7 @@ DivideBCD:: .asm_f75b push de push de - call Func_f800 + call DivideBCD_f800 pop de ld a, b swap a @@ -4265,8 +4265,8 @@ DivideBCD:: dec d jr z, .asm_f7bc push de - call Func_f7d7 - call Func_f800 + call DivideBCD_f7d7 + call DivideBCD_f800 pop de ld a, [$ffa5] or b @@ -4274,8 +4274,8 @@ DivideBCD:: dec d jr z, .asm_f7bc push de - call Func_f7d7 - call Func_f800 + call DivideBCD_f7d7 + call DivideBCD_f800 pop de ld a, b swap a @@ -4284,8 +4284,8 @@ DivideBCD:: dec d jr z, .asm_f7bc push de - call Func_f7d7 - call Func_f800 + call DivideBCD_f7d7 + call DivideBCD_f800 pop de ld a, [$ffa6] or b @@ -4293,8 +4293,8 @@ DivideBCD:: dec d jr z, .asm_f7bc push de - call Func_f7d7 - call Func_f800 + call DivideBCD_f7d7 + call DivideBCD_f800 pop de ld a, b swap a @@ -4303,8 +4303,8 @@ DivideBCD:: dec d jr z, .asm_f7bc push de - call Func_f7d7 - call Func_f800 + call DivideBCD_f7d7 + call DivideBCD_f800 pop de ld a, [$ffa7] or b @@ -4323,13 +4323,13 @@ DivideBCD:: ret z .asm_f7ce push af - call Func_f7d7 + call DivideBCD_f7d7 pop af dec a jr nz, .asm_f7ce ret -Func_f7d7: ; f7d7 (3:77d7) +DivideBCD_f7d7: ; f7d7 (3:77d7) ld a, [$ffa4] swap a and $f @@ -4354,7 +4354,7 @@ Func_f7d7: ; f7d7 (3:77d7) ld [$ffa2], a ret -Func_f800: ; f800 (3:7800) +DivideBCD_f800: ; f800 (3:7800) ld bc, $3 .asm_f803 ld de, $ff9f @@ -4486,7 +4486,7 @@ InitializeEmptyList: IsItemInBag_: ; f8a5 (3:78a5) call GetPredefRegisters - ld hl, wNumBagItems ; wNumBagItems + ld hl, wNumBagItems .asm_f8ab inc hl ld a, [hli] @@ -4697,7 +4697,7 @@ NPCMovementDirectionsToJoypadMasksTable: ; f9d2 (3:79d2) db NPC_MOVEMENT_RIGHT, D_RIGHT db $ff -Func_f9db: ; f9db (3:79db) +; unreferenced ret INCLUDE "engine/hp_bar.asm" diff --git a/text.asm b/text.asm index 7dfe797a..17067e57 100644 --- a/text.asm +++ b/text.asm @@ -1122,7 +1122,7 @@ _MoneyForWinningText:: ; 896dd (22:56dd) _TrainerDefeatedText:: ; 896f9 (22:56f9) text $52, " defeated" line "@" - TX_RAM W_TRAINERNAME ; 0x89706 + TX_RAM W_TRAINERNAME text "!" prompt @@ -1152,7 +1152,7 @@ _PlayerBlackedOutText2:: ; 89748 (22:5748) _LinkBattleLostText:: ; 89772 (22:5772) text $52, " lost to" line "@" - TX_RAM W_TRAINERNAME ; 0x8977e + TX_RAM W_TRAINERNAME text "!" prompt diff --git a/wram.asm b/wram.asm index fb93b687..5f425d4f 100755 --- a/wram.asm +++ b/wram.asm @@ -953,7 +953,7 @@ W_TRAINERCLASS:: ; d031 ds 1 -wTrainerPicPointer:: ; wd033 +wTrainerPicPointer:: ; d033 ds 2 ds 1 wd036:: ds 16 ; used as a temporary buffer to print "XXX learned YYY" @@ -1071,7 +1071,7 @@ wPlayerNumAttacksLeft:: ; when the player is attacking multiple times, the number of attacks left ds 1 -W_PLAYERCONFUSEDCOUNTER:: ; wd06b +W_PLAYERCONFUSEDCOUNTER:: ; d06b ds 1 W_PLAYERTOXICCOUNTER:: ; d06c @@ -1087,7 +1087,7 @@ wEnemyNumAttacksLeft:: ; d06f ; when the enemy is attacking multiple times, the number of attacks left ds 1 -W_ENEMYCONFUSEDCOUNTER:: ; wd070 +W_ENEMYCONFUSEDCOUNTER:: ; d070 ds 1 W_ENEMYTOXICCOUNTER:: ; d071 @@ -1332,10 +1332,10 @@ W_DAMAGE:: ; d0d7 ds 2 -wRepelRemainingSteps:: ; wd0db +wRepelRemainingSteps:: ; d0db ds 1 -wMoves:: ; wd0dc +wMoves:: ; d0dc ; list of moves for FormatMovesString ds 4 -- cgit v1.3.1-sl0p From 95b1660e59283b6f76dca638985c76a7d81d026f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 13 Jul 2015 00:32:03 -0700 Subject: menu wram variable names --- engine/battle/core.asm | 2 +- engine/cable_club.asm | 8 ++++---- engine/menu/pokedex.asm | 6 +++--- engine/save.asm | 2 +- engine/slot_machine.asm | 2 +- home.asm | 22 +++++++++++----------- main.asm | 10 +++++----- wram.asm | 11 +++++++++-- 8 files changed, 35 insertions(+), 28 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 95242f5d..f37da950 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2305,7 +2305,7 @@ DisplayBagMenu: ld a, [wCurrentMenuItem] ld [wcc2c], a ld a, $0 - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a ld [wMenuItemToSwap], a jp c, DisplayBattleMenu ; go back to battle menu if an item was not selected diff --git a/engine/cable_club.asm b/engine/cable_club.asm index c115ed4a..13a95ed5 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -317,7 +317,7 @@ TradeCenter_SelectMon: ld [hli], a ld [hli], a ld [hl], a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld [wMenuJoypadPollCount], a @@ -326,7 +326,7 @@ TradeCenter_SelectMon: jp .playerMonMenu .enemyMonMenu xor a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a inc a ld [wWhichTradeMonSelectionMenu], a ld a, D_DOWN | D_LEFT | A_BUTTON @@ -390,7 +390,7 @@ TradeCenter_SelectMon: .playerMonMenu xor a ; player mon menu ld [wWhichTradeMonSelectionMenu], a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a ld a, D_DOWN | D_RIGHT | A_BUTTON ld [wMenuWatchedKeys], a ld a, [wPartyCount] @@ -682,7 +682,7 @@ TradeCenter_Trade: xor a ld [wSerialExchangeNybbleSendData + 1], a ; unnecessary ld [wSerialExchangeNybbleReceiveData], a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a ld [wMenuJoypadPollCount], a hlCoord 0, 12 ld b, 4 diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index e2e53d45..b8686a07 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -22,7 +22,7 @@ ShowPokedexMenu: ; 40000 (10:4000) xor a ld [hli],a ; top menu item X inc a - ld [wcc37],a + ld [wMenuWatchMovingOutOfBounds],a inc hl inc hl ld a,6 @@ -32,7 +32,7 @@ ShowPokedexMenu: ; 40000 (10:4000) jr c,.goToSideMenu ; if the player chose a pokemon from the list .exitPokedex xor a - ld [wcc37],a + ld [wMenuWatchMovingOutOfBounds],a ld [wCurrentMenuItem],a ld [wLastMenuItem],a ld [hJoy7],a @@ -91,7 +91,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ld [hli],a ; menu watched keys (A button and B button) xor a ld [hli],a ; old menu item ID - ld [wcc37],a + ld [wMenuWatchMovingOutOfBounds],a .handleMenuInput call HandleMenuInput bit 1,a ; was the B button pressed? diff --git a/engine/save.asm b/engine/save.asm index cc5e6c4a..2ef59263 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -421,7 +421,7 @@ Func_7393f: ; 7393f (1c:793f) ld a, $c ld [wTopMenuItemX], a xor a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a ld a, [wd5a0] and $7f ld [wCurrentMenuItem], a diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 0b9f8bc9..6dae7293 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -78,7 +78,7 @@ MainSlotMachineLoop: ; 37395 (d:7395) xor a ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a ld hl, wTileMap + $ea ld b, $5 ld c, $4 diff --git a/home.asm b/home.asm index 51e10118..f6a1c914 100644 --- a/home.asm +++ b/home.asm @@ -378,7 +378,7 @@ PartyMenuInit:: ; 1420 (0:1420) set 6, [hl] ; turn off letter printing delay xor a ld [wcc49], a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a ld hl, wTopMenuItemY inc a ld [hli], a ; top menu item Y @@ -1391,13 +1391,13 @@ DisplayListMenuID:: ; 2be6 (0:2be6) set 6,[hl] ; turn off letter printing delay xor a ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped - ld [wd12a],a + ld [wListCount],a ld a,[wList] ld l,a ld a,[wList + 1] ld h,a ; hl = address of the list - ld a,[hl] - ld [wd12a],a ; [wd12a] = number of list entries + ld a,[hl] ; the first byte is the number of entries in the list + ld [wListCount],a ld a,LIST_MENU_BOX ld [wTextBoxID],a call DisplayTextBoxID ; draw the menu text box @@ -1411,8 +1411,8 @@ DisplayListMenuID:: ; 2be6 (0:2be6) call UpdateSprites .skipMovingSprites ld a,1 ; max menu item ID is 1 if the list has less than 2 entries - ld [wcc37],a - ld a,[wd12a] + ld [wMenuWatchMovingOutOfBounds],a + ld a,[wListCount] cp a,2 ; does the list have less than 2 entries? jr c,.setMenuVariables ld a,2 ; max menu item ID is 2 if the list has at least 2 entries @@ -1468,13 +1468,13 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) ld [wChosenMenuItem],a xor a - ld [wcc37],a + ld [wMenuWatchMovingOutOfBounds],a ld a,[wCurrentMenuItem] ld c,a ld a,[wListScrollOffset] add c ld c,a - ld a,[wd12a] ; number of list entries + ld a,[wListCount] and a ; is the list empty? jp z,ExitListMenu ; if so, exit the menu dec a @@ -1552,7 +1552,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) ld a,[hl] add a,3 ld b,a - ld a,[wd12a] ; number of list entries + ld a,[wListCount] cp b ; will going down scroll past the Cancel button? jp c,DisplayListMenuIDLoop inc [hl] ; if not, go down @@ -1694,7 +1694,7 @@ ExitListMenu:: ; 2e3b (0:2e3b) ld [wChosenMenuItem],a ld a,CANCELLED_MENU ld [wMenuExitMethod],a - ld [wcc37],a + ld [wMenuWatchMovingOutOfBounds],a xor a ld [hJoy7],a ld hl,wd730 @@ -4026,7 +4026,7 @@ HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2) ld a,[hJoy5] ret .noWrappingAround - ld a,[wcc37] + ld a,[wMenuWatchMovingOutOfBounds] and a ; should we return if the user tried to go past the top or bottom? jr z,.checkOtherKeys jr .checkIfAButtonOrBButtonPressed diff --git a/main.asm b/main.asm index 54440e60..3a1e0621 100755 --- a/main.asm +++ b/main.asm @@ -922,7 +922,7 @@ HandleItemListSwapping: ; 6b44 (1:6b44) ld l,a dec [hl] ; decrease the number of items ld a,[hl] - ld [wd12a],a ; update number of items variable + ld [wListCount],a ; update number of items variable cp a,1 jr nz,.skipSettingMaxMenuItemID ld [wMaxMenuItem],a ; if the number of items is only one now, update the max menu item ID @@ -1094,7 +1094,7 @@ DrawStartMenu: ; 710b (1:710b) ld [wCurrentMenuItem],a ld [wLastMenuItem],a xor a - ld [wcc37],a + ld [wMenuWatchMovingOutOfBounds],a ld hl,wd730 set 6,[hl] ; no pauses between printing each letter hlCoord 12, 2 @@ -1472,7 +1472,7 @@ DoBuySellQuitMenu: ; 74ea (1:74ea) xor a ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a ld a, [wd730] res 6, a ; turn on the printing delay ld [wd730], a @@ -1528,7 +1528,7 @@ DisplayTwoOptionMenu: ; 7559 (1:7559) ld [wTopMenuItemX], a xor a ld [wLastMenuItem], a - ld [wcc37], a + ld [wMenuWatchMovingOutOfBounds], a push hl ld hl, wTwoOptionMenuID bit 7, [hl] ; select second menu item by default? @@ -2917,7 +2917,7 @@ RemoveItemFromInventory_: ; ce74 (3:4e74) ld a,[hl] ; a = number of items in inventory dec a ; decrement the number of items ld [hl],a ; store new number of items - ld [wd12a],a + ld [wListCount],a cp a,2 jr c,.done ld [wMaxMenuItem],a diff --git a/wram.asm b/wram.asm index c5f06e53..a1b9f1d3 100755 --- a/wram.asm +++ b/wram.asm @@ -266,7 +266,12 @@ wListScrollOffset:: ; cc36 ; keeps track of what section of the list is on screen ds 1 -wcc37:: ds 1 ; menu related thing, used in pokedex and dialog boxes +wMenuWatchMovingOutOfBounds:: ; cc37 +; If non-zero, then when wrapping is disabled and the player tries to go past +; the top or bottom of the menu, return from HandleMenuInput. This is useful for +; menus that have too many items to display at once on the screen because it +; allows the caller to scroll the entire menu up or down when this happens. + ds 1 wTradeCenterPointerTableIndex:: ; cc38 ds 1 @@ -1409,7 +1414,9 @@ wItemListPointer:: ; d128 ; pointer to list of items terminated by $FF ds 2 -wd12a:: ds 1 ; Number of list entries for displaying a list +wListCount:: +; number of entries in a list + ds 1 wLinkState:: ; d12b ds 1 -- cgit v1.3.1-sl0p From b1cb3788938fa981e65619f022a41f1c1d91ae3b Mon Sep 17 00:00:00 2001 From: dannye Date: Tue, 14 Jul 2015 03:46:23 -0500 Subject: Comment naming screen also use more joypad constants --- engine/battle/end_of_battle.asm | 2 +- engine/cable_club.asm | 2 +- engine/evolution.asm | 32 +++--- engine/evolve_trade.asm | 2 +- engine/evos_moves.asm | 2 +- engine/items/items.asm | 4 +- engine/menu/main_menu.asm | 13 ++- engine/menu/naming_screen.asm | 240 ++++++++++++++++++++-------------------- engine/menu/pokedex.asm | 2 +- home/text.asm | 4 +- main.asm | 2 +- wram.asm | 3 +- 12 files changed, 158 insertions(+), 150 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index d1452770..0ca4b886 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -41,7 +41,7 @@ EndOfBattle: ; 137aa (4:77aa) call PrintText .evolution xor a - ld [wccd4], a + ld [wForceEvolution], a predef EvolutionAfterBattle .resetVariables xor a diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 13a95ed5..75509312 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -816,7 +816,7 @@ TradeCenter_Trade: dec a ld [wWhichPokemon], a ld a, $1 - ld [wccd4], a + ld [wForceEvolution], a ld a, [wTradingWhichEnemyMon] ld hl, wEnemyPartyMons ld b, 0 diff --git a/engine/evolution.asm b/engine/evolution.asm index 76537530..4776b3b6 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -27,7 +27,7 @@ EvolveMon: ; 7bde9 (1e:7de9) ld a, [wHPBarMaxHP + 1] ld [wcf91], a ld [wd0b5], a - call Func_7beb9 + call Evolution_LoadPic ld de, vFrontPic ld hl, vBackPic ld bc, 7 * 7 @@ -35,7 +35,7 @@ EvolveMon: ; 7bde9 (1e:7de9) ld a, [wHPBarMaxHP] ld [wcf91], a ld [wd0b5], a - call Func_7beb9 + call Evolution_LoadPic ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ld a, [wHPBarMaxHP] @@ -51,8 +51,8 @@ EvolveMon: ; 7bde9 (1e:7de9) ld bc, $110 .asm_7be63 push bc - call Func_7befa - jr c, .asm_7bea9 + call Evolution_CheckForCancel + jr c, .evolutionCancelled call Func_7bec2 pop bc inc b @@ -65,7 +65,7 @@ EvolveMon: ; 7bde9 (1e:7de9) ld [wHPBarOldHP], a call Func_7bed6 ld a, [wHPBarMaxHP + 1] -.asm_7be81 +.afterCancellation ld [wcf1d], a ld a, $ff ld [wc0ee], a @@ -86,18 +86,18 @@ EvolveMon: ; 7bde9 (1e:7de9) ret z scf ret -.asm_7bea9 +.evolutionCancelled pop bc ld a, $1 ld [wHPBarOldHP + 1], a ld a, [wHPBarMaxHP] - jr .asm_7be81 + jr .afterCancellation EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) ld b, $b jp GoPAL_SET -Func_7beb9: ; 7beb9 (1e:7eb9) +Evolution_LoadPic: ; 7beb9 (1e:7eb9) call GetMonHeader hlCoord 7, 2 jp LoadFlippedFrontSpriteByMonIndex @@ -138,22 +138,22 @@ Func_7bed6: ; 7bed6 (1e:7ed6) pop bc ret -Func_7befa: ; 7befa (1e:7efa) +Evolution_CheckForCancel: ; 7befa (1e:7efa) call DelayFrame push bc call JoypadLowSensitivity ld a, [hJoy5] pop bc - and $2 - jr nz, .asm_7bf0d -.asm_7bf08 + and B_BUTTON + jr nz, .pressedB +.notAllowedToCancel dec c - jr nz, Func_7befa + jr nz, Evolution_CheckForCancel and a ret -.asm_7bf0d - ld a, [wccd4] +.pressedB + ld a, [wForceEvolution] and a - jr nz, .asm_7bf08 + jr nz, .notAllowedToCancel scf ret diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm index c7297527..81e41166 100755 --- a/engine/evolve_trade.asm +++ b/engine/evolve_trade.asm @@ -35,7 +35,7 @@ EvolveTradeMon: ; 17d7d (5:7d7d) dec a ld [wWhichPokemon], a ld a, $1 - ld [wccd4], a + ld [wForceEvolution], a ld a, LINK_STATE_TRADING ld [wLinkState], a callab TryEvolvingMon diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index c4af3951..b43fdcae 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -76,7 +76,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, b cp EV_ITEM jr z, .checkItemEvo - ld a, [wccd4] + ld a, [wForceEvolution] and a jr nz, Evolution_PartyMonLoop ld a, b diff --git a/engine/items/items.asm b/engine/items/items.asm index fae2a871..8d6037eb 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -643,7 +643,7 @@ ItemUseEvoStone: ; da5b (3:5a5b) ld a,b ld [wcf91],a ld a,$01 - ld [wccd4],a + ld [wForceEvolution],a ld a,(SFX_02_3e - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent call WaitForSoundToFinish @@ -1275,7 +1275,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [wcc49],a predef LearnMoveFromLevelUp ; learn level up move, if any xor a - ld [wccd4],a + ld [wForceEvolution],a callab TryEvolvingMon ; evolve pokemon, if appropriate ld a,$01 ld [wUpdateSpritesEnabled],a diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index f6d3e127..0856352c 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -90,7 +90,7 @@ MainMenu: ; 5af2 (1:5af2) call ContinueGame ld hl,wd126 set 5,[hl] -.next6 +.inputLoop xor a ld [hJoyPressed],a ld [hJoyReleased],a @@ -98,11 +98,11 @@ MainMenu: ; 5af2 (1:5af2) call Joypad ld a,[hJoyHeld] bit 0,a - jr nz,.next5 + jr nz,.pressedA bit 1,a - jp nz,.next0 - jr .next6 -.next5 + jp nz,.next0 ; pressedB + jr .inputLoop +.pressedA call GBPalWhiteOutWithDelay3 call ClearScreen ld a,4 @@ -121,6 +121,7 @@ MainMenu: ; 5af2 (1:5af2) set 2,[hl] ; fly warp or dungeon warp call SpecialWarpIn jp SpecialEnterMap + Func_5bff: ; 5bff (1:5bff) ld a,1 ld [wd358],a @@ -468,7 +469,7 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) call JoypadLowSensitivity ld a,[hJoy5] ld b,a - and a,%11111011 ; any key besides select pressed? + and a,A_BUTTON | B_BUTTON | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ; any key besides select pressed? jr z,.getJoypadStateLoop bit 1,b ; B button pressed? jr nz,.exitMenu diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index b235f7c3..2416f0da 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -21,7 +21,7 @@ AskName: ; 64eb (1:64eb) pop hl ld a, [wCurrentMenuItem] and a - jr nz, .asm_654c + jr nz, .declinedNickname ld a, [wUpdateSpritesEnabled] push af xor a @@ -32,9 +32,9 @@ AskName: ; 64eb (1:64eb) call DisplayNamingScreen ld a, [W_ISINBATTLE] and a - jr nz, .asm_653e + jr nz, .inBattle call ReloadMapSpriteTilePatterns -.asm_653e +.inBattle call LoadScreenTilesFromBuffer1 pop hl pop af @@ -42,11 +42,11 @@ AskName: ; 64eb (1:64eb) ld a, [wcf4b] cp $50 ret nz -.asm_654c +.declinedNickname ld d, h ld e, l ld hl, wcd6d - ld bc, $000b + ld bc, 11 jp CopyData DoYouWantToNicknameText: ; 0x6557 @@ -65,7 +65,7 @@ DisplayNameRaterScreen: ; 655c (1:655c) call LoadGBPal ld a, [wcf4b] cp $50 - jr z, .asm_6594 + jr z, .playerCancelled ld hl, wPartyMonNicks ld bc, $b ld a, [wWhichPokemon] @@ -73,11 +73,11 @@ DisplayNameRaterScreen: ; 655c (1:655c) ld e, l ld d, h ld hl, wHPBarMaxHP - ld bc, $b + ld bc, 11 call CopyData and a ret -.asm_6594 +.playerCancelled scf ret @@ -115,17 +115,17 @@ DisplayNamingScreen: ; 6596 (1:6596) ld [hli], a ld [hli], a ld [wAnimCounter], a -.asm_65ed +.selectReturnPoint call PrintAlphabet call GBPalNormal -.asm_65f3 +.ABStartReturnPoint ld a, [wHPBarMaxHP + 1] and a - jr nz, .asm_662d - call Func_680e -.asm_65fc + jr nz, .submitNickname + call PrintNicknameAndUnderscores +.dPadReturnPoint call PlaceMenuCursor -.asm_65ff +.inputLoop ld a, [wCurrentMenuItem] push af callba AnimatePartyMon_ForceSpeed1 @@ -134,17 +134,17 @@ DisplayNamingScreen: ; 6596 (1:6596) call JoypadLowSensitivity ld a, [hJoyPressed] and a - jr z, .asm_65ff - ld hl, .unknownPointerTable_665e -.asm_661a + jr z, .inputLoop + ld hl, .namingScreenButtonFunctions +.checkForPressedButton sla a - jr c, .asm_6624 + jr c, .foundPressedButton inc hl inc hl inc hl inc hl - jr .asm_661a -.asm_6624 + jr .checkForPressedButton +.foundPressedButton ld a, [hli] ld e, a ld a, [hli] @@ -154,10 +154,11 @@ DisplayNamingScreen: ; 6596 (1:6596) ld l, a push de jp [hl] -.asm_662d + +.submitNickname pop de ld hl, wcf4b - ld bc, $b + ld bc, 11 call CopyData call GBPalWhiteOutWithDelay3 call ClearScreen @@ -175,52 +176,54 @@ DisplayNamingScreen: ; 6596 (1:6596) ld b, BANK(LoadHudTilePatterns) jp Bankswitch -.unknownPointerTable_665e: ; 665e (1:665e) - dw .asm_65fc - dw .asm_673e - dw .asm_65fc - dw .asm_672c - dw .asm_65fc - dw .asm_6718 - dw .asm_65fc - dw .asm_6702 - dw .asm_65f3 - dw .asm_668c - dw .asm_65ed - dw .asm_6683 - dw .asm_65f3 - dw .deleteLetter - dw .asm_65f3 - dw .asm_6692 +.namingScreenButtonFunctions + dw .dPadReturnPoint + dw .pressedDown + dw .dPadReturnPoint + dw .pressedUp + dw .dPadReturnPoint + dw .pressedLeft + dw .dPadReturnPoint + dw .pressedRight + dw .ABStartReturnPoint + dw .pressedStart + dw .selectReturnPoint + dw .pressedSelect + dw .ABStartReturnPoint + dw .pressedB + dw .ABStartReturnPoint + dw .pressedA -.asm_667e +.pressedA_changedCase pop de - ld de, .asm_65ed + ld de, .selectReturnPoint push de -.asm_6683 +.pressedSelect ld a, [wHPBarOldHP] xor $1 ld [wHPBarOldHP], a ret -.asm_668c + +.pressedStart ld a, $1 ld [wHPBarMaxHP + 1], a ret -.asm_6692 + +.pressedA ld a, [wCurrentMenuItem] - cp $5 - jr nz, .asm_66a0 + cp $5 ; "ED" row + jr nz, .didNotPressED ld a, [wTopMenuItemX] - cp $11 - jr z, .asm_668c -.asm_66a0 + cp $11 ; "ED" column + jr z, .pressedStart +.didNotPressED ld a, [wCurrentMenuItem] - cp $6 - jr nz, .asm_66ae + cp $6 ; case swtich row + jr nz, .didNotPressCaseSwtich ld a, [wTopMenuItemX] - cp $1 - jr z, .asm_667e -.asm_66ae + cp $1 ; case switch column + jr z, .pressedA_changedCase +.didNotPressCaseSwtich ld hl, wMenuCursorLocation ld a, [hli] ld h, [hl] @@ -232,10 +235,10 @@ DisplayNamingScreen: ; 6596 (1:6596) ld a, [wHPBarNewHP] cp $e5 ld de, Dakutens - jr z, .asm_66e3 + jr z, .dakutensAndHandakutens cp $e4 ld de, Handakutens - jr z, .asm_66e3 + jr z, .dakutensAndHandakutens ld a, [wNamingScreenType] cp NAME_MON_SCREEN jr nc, .checkMonNameLength @@ -248,9 +251,10 @@ DisplayNamingScreen: ; 6596 (1:6596) .checkNameLength jr c, .addLetter ret -.asm_66e3 + +.dakutensAndHandakutens push hl - call Func_6871 + call DakutensAndHandakutens pop hl ret nc dec hl @@ -261,7 +265,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld a, (SFX_02_40 - SFX_Headers_02) / 3 call PlaySound ret -.deleteLetter +.pressedB ld a, [wHPBarMaxHP] and a ret z @@ -269,55 +273,55 @@ DisplayNamingScreen: ; 6596 (1:6596) dec hl ld [hl], $50 ret -.asm_6702 +.pressedRight ld a, [wCurrentMenuItem] cp $6 - ret z + ret z ; can't scroll right on bottom row ld a, [wTopMenuItemX] - cp $11 - jp z, .asm_6714 + cp $11 ; max + jp z, .wrapToFirstColumn inc a inc a - jr .asm_6755 -.asm_6714 + jr .done +.wrapToFirstColumn ld a, $1 - jr .asm_6755 -.asm_6718 + jr .done +.pressedLeft ld a, [wCurrentMenuItem] cp $6 - ret z + ret z ; can't scroll right on bottom row ld a, [wTopMenuItemX] dec a - jp z, .asm_6728 + jp z, .wrapToLastColumn dec a - jr .asm_6755 -.asm_6728 - ld a, $11 - jr .asm_6755 -.asm_672c + jr .done +.wrapToLastColumn + ld a, $11 ; max + jr .done +.pressedUp ld a, [wCurrentMenuItem] dec a ld [wCurrentMenuItem], a and a ret nz - ld a, $6 + ld a, $6 ; wrap to bottom row ld [wCurrentMenuItem], a - ld a, $1 - jr .asm_6755 -.asm_673e + ld a, $1 ; force left column + jr .done +.pressedDown ld a, [wCurrentMenuItem] inc a ld [wCurrentMenuItem], a cp $7 - jr nz, .asm_6750 + jr nz, .wrapToTopRow ld a, $1 ld [wCurrentMenuItem], a - jr .asm_6755 -.asm_6750 + jr .done +.wrapToTopRow cp $6 ret nz ld a, $1 -.asm_6755 +.done ld [wTopMenuItemX], a jp EraseMenuCursor @@ -336,25 +340,25 @@ PrintAlphabet: ; 676f (1:676f) ld a, [wHPBarOldHP] and a ld de, LowerCaseAlphabet - jr nz, .asm_677e + jr nz, .lowercase ld de, UpperCaseAlphabet -.asm_677e +.lowercase hlCoord 2, 5 - ld bc, $509 -.asm_6784 + ld bc, $509 ; 5 rows, 9 columns +.outerLoop push bc -.asm_6785 +.innerLoop ld a, [de] ld [hli], a inc hl inc de dec c - jr nz, .asm_6785 - ld bc, $16 + jr nz, .innerLoop + ld bc, SCREEN_WIDTH + 2 add hl, bc pop bc dec b - jr nz, .asm_6784 + jr nz, .outerLoop call PlaceString ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -366,7 +370,7 @@ LowerCaseAlphabet: ; 679e (1:679e) UpperCaseAlphabet: ; 67d6 (1:67d6) db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥lower case@" -Func_680e: ; 680e (1:680e) +PrintNicknameAndUnderscores: ; 680e (1:680e) call CalcStringLength ld a, c ld [wHPBarMaxHP], a @@ -379,46 +383,48 @@ Func_680e: ; 680e (1:680e) hlCoord 10, 3 ld a, [wNamingScreenType] cp NAME_MON_SCREEN - jr nc, .asm_6835 - ld b, $7 - jr .asm_6837 -.asm_6835 - ld b, $a -.asm_6837 - ld a, $76 -.asm_6839 + jr nc, .pokemon1 + ld b, 7 ; player or rival max name length + jr .playerOrRival1 +.pokemon1 + ld b, 10 ; pokemon max name length +.playerOrRival1 + ld a, $76 ; underscore tile id +.placeUnderscoreLoop ld [hli], a dec b - jr nz, .asm_6839 + jr nz, .placeUnderscoreLoop ld a, [wNamingScreenType] cp NAME_MON_SCREEN ld a, [wHPBarMaxHP] - jr nc, .asm_684b - cp $7 - jr .asm_684d -.asm_684b - cp $a -.asm_684d - jr nz, .asm_6867 + jr nc, .pokemon2 + cp 7 ; player or rival max name length + jr .playerOrRival2 +.pokemon2 + cp 10 ; pokemon max name length +.playerOrRival2 + jr nz, .emptySpacesRemaining + ; when all spaces are filled, force the cursor onto the ED tile call EraseMenuCursor - ld a, $11 + ld a, $11 ; "ED" x coord ld [wTopMenuItemX], a - ld a, $5 + ld a, $5 ; "ED" y corrd ld [wCurrentMenuItem], a ld a, [wNamingScreenType] cp NAME_MON_SCREEN - ld a, $9 - jr nc, .asm_6867 - ld a, $6 -.asm_6867 + ld a, 9 ; keep the last underscore raised + jr nc, .pokemon3 + ld a, 6 ; keep the last underscore raised +.pokemon3 +.emptySpacesRemaining ld c, a ld b, $0 hlCoord 10, 3 add hl, bc - ld [hl], $77 + ld [hl], $77 ; raised underscore tile id ret -Func_6871: ; 6871 (1:6871) +DakutensAndHandakutens: ; 6871 (1:6871) push de call CalcStringLength dec hl @@ -452,13 +458,13 @@ Handakutens: ; 68d6 (1:68d6) CalcStringLength: ; 68eb (1:68eb) ld hl, wcf4b ld c, $0 -.asm_68f0 +.loop ld a, [hl] cp $50 ret z inc hl inc c - jr .asm_68f0 + jr .loop PrintNamingText: ; 68f8 (1:68f8) hlCoord 0, 1 diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index b8686a07..56543c91 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -554,7 +554,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) .waitForButtonPress call JoypadLowSensitivity ld a,[hJoy5] - and a,%00000011 ; A button and B button + and a,A_BUTTON | B_BUTTON jr z,.waitForButtonPress pop af ld [hTilesetType],a diff --git a/home/text.asm b/home/text.asm index 11303659..b77e1930 100644 --- a/home/text.asm +++ b/home/text.asm @@ -576,7 +576,7 @@ TextCommand0A:: ; 1c1d (0:1c1d) push bc call Joypad ld a,[hJoyHeld] - and a,%00000011 ; A and B buttons + and a,A_BUTTON | B_BUTTON jr nz,.skipDelay ld c,30 call DelayFrames @@ -654,7 +654,7 @@ TextCommand0C:: ; 1c78 (0:1c78) call Joypad pop de ld a,[hJoyHeld] ; joypad state - and a,%00000011 ; is A or B button pressed? + and a,A_BUTTON | B_BUTTON jr nz,.skipDelay ; if so, skip the delay ld c,10 call DelayFrames diff --git a/main.asm b/main.asm index ac45994b..84c47557 100755 --- a/main.asm +++ b/main.asm @@ -3461,7 +3461,7 @@ TryPushingBoulder: ; f225 (3:7225) set 6, [hl] ; indicate that the player has tried pushing ret z ; the player must try pushing twice before the boulder will move ld a, [hJoyHeld] - and $f0 + and D_RIGHT | D_LEFT | D_UP | D_DOWN ret z predef CheckForCollisionWhenPushingBoulder ld a, [wTileInFrontOfBoulderAndBoulderCollisionResult] diff --git a/wram.asm b/wram.asm index 18d9487c..a5fed0f2 100755 --- a/wram.asm +++ b/wram.asm @@ -399,7 +399,8 @@ wSimulatedJoypadStatesEnd:: ; ccd3 ; overloaded with below labels wccd3:: ds 1 ; used in battle, pokemon, PC and game corner stuff -wccd4:: ds 1 ; used in evolving pokemon and has a direct reference for simulated joypad stuff in vermillion and seafoam +wForceEvolution:: +wccd4:: ds 1 ; has a direct reference for simulated joypad stuff in vermillion and seafoam ; if [ccd5] != 1, the second AI layer is not applied wAILayer2Encouragement:: ; ccd5 -- cgit v1.3.1-sl0p From fc9af362ae65d24c66b39ea7759637cc9c1f9b0a Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 18 Jul 2015 08:17:29 -0700 Subject: fix variable naming --- engine/battle/animations.asm | 2 +- engine/battle/core.asm | 28 +++---- engine/battle/wild_encounters.asm | 2 +- engine/items/items.asm | 4 +- engine/items/tm_prices.asm | 9 +-- engine/menu/pokedex.asm | 22 +++--- engine/menu/prize_menu.asm | 4 +- engine/menu/start_sub_menus.asm | 2 +- engine/oak_speech.asm | 47 ++++++------ engine/oak_speech2.asm | 140 ++++++++++++++++++---------------- engine/overworld/item.asm | 6 +- engine/overworld/map_sprites.asm | 16 ++-- engine/predefs.asm | 4 +- home.asm | 36 ++++----- home/copy2.asm | 22 +++--- home/overworld.asm | 154 +++++++++++++++++++------------------- hram.asm | 55 ++++++++++++-- macros.asm | 6 +- main.asm | 16 ++-- scripts/agatha.asm | 4 +- scripts/billshouse.asm | 6 +- scripts/bruno.asm | 4 +- scripts/celadongamecorner.asm | 6 +- scripts/celadongym.asm | 6 +- scripts/ceruleancity.asm | 24 +++--- scripts/ceruleangym.asm | 6 +- scripts/cinnabargym.asm | 14 ++-- scripts/cinnabarisland.asm | 2 +- scripts/fightingdojo.asm | 14 ++-- scripts/fuchsiagym.asm | 6 +- scripts/fuchsiahouse2.asm | 2 +- scripts/gary.asm | 42 +++++------ scripts/halloffameroom.asm | 8 +- scripts/lance.asm | 4 +- scripts/lorelei.asm | 4 +- scripts/mansion1.asm | 6 +- scripts/mansion2.asm | 4 +- scripts/mansion3.asm | 6 +- scripts/mansion4.asm | 12 +-- scripts/mtmoon1.asm | 12 +-- scripts/mtmoon3.asm | 12 +-- scripts/museum1f.asm | 14 ++-- scripts/oakslab.asm | 68 ++++++++--------- scripts/pallettown.asm | 2 +- scripts/pewtercity.asm | 20 ++--- scripts/pewtergym.asm | 6 +- scripts/pokemontower2.asm | 12 +-- scripts/pokemontower3.asm | 2 +- scripts/pokemontower4.asm | 6 +- scripts/pokemontower5.asm | 4 +- scripts/pokemontower6.asm | 8 +- scripts/pokemontower7.asm | 6 +- scripts/powerplant.asm | 10 +-- scripts/rockethideout1.asm | 4 +- scripts/rockethideout2.asm | 8 +- scripts/rockethideout3.asm | 4 +- scripts/rockethideout4.asm | 12 +-- scripts/route12.asm | 8 +- scripts/route15.asm | 2 +- scripts/route16.asm | 4 +- scripts/route16gate.asm | 8 +- scripts/route18gate.asm | 10 +-- scripts/route2.asm | 4 +- scripts/route22.asm | 50 ++++++------- scripts/route22gate.asm | 2 +- scripts/route23.asm | 20 ++--- scripts/route24.asm | 8 +- scripts/route25.asm | 2 +- scripts/route4.asm | 2 +- scripts/route5gate.asm | 4 +- scripts/route6gate.asm | 4 +- scripts/route7gate.asm | 4 +- scripts/route8gate.asm | 4 +- scripts/route9.asm | 2 +- scripts/safarizonecenter.asm | 2 +- scripts/safarizoneeast.asm | 8 +- scripts/safarizoneentrance.asm | 8 +- scripts/safarizonenorth.asm | 4 +- scripts/safarizonewest.asm | 8 +- scripts/saffrongym.asm | 6 +- scripts/silphco10.asm | 6 +- scripts/silphco11.asm | 24 +++--- scripts/silphco3.asm | 2 +- scripts/silphco4.asm | 6 +- scripts/silphco5.asm | 6 +- scripts/silphco6.asm | 4 +- scripts/silphco7.asm | 24 +++--- scripts/ssanne10.asm | 6 +- scripts/ssanne2.asm | 18 ++--- scripts/ssanne8.asm | 2 +- scripts/ssanne9.asm | 4 +- scripts/tradecenter.asm | 12 +-- scripts/unknowndungeon1.asm | 6 +- scripts/unknowndungeon2.asm | 6 +- scripts/unknowndungeon3.asm | 4 +- scripts/vermilioncity.asm | 2 +- scripts/vermiliongym.asm | 6 +- scripts/victoryroad1.asm | 4 +- scripts/victoryroad2.asm | 8 +- scripts/victoryroad3.asm | 4 +- scripts/viridiancity.asm | 6 +- scripts/viridianforest.asm | 6 +- scripts/viridiangym.asm | 8 +- scripts/viridianmart.asm | 4 +- text.asm | 2 +- wram.asm | 125 +++++++++++++++++++++---------- 106 files changed, 773 insertions(+), 671 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 63ea170d..7764603d 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -163,7 +163,7 @@ DrawFrameBlock: ; 78000 (1e:4000) PlayAnimation: ; 780f1 (1e:40f1) xor a - ld [$FF8B],a + ld [$FF8B],a ; it looks like nothing reads this ld [W_SUBANIMTRANSFORM],a ld a,[W_ANIMATIONID] ; get animation number dec a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index bdb20bb0..2f407290 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1310,7 +1310,7 @@ SevenSpacesText: ; 3c8d7 (f:48d7) ; if a is 8, the slide is to the right, else it is to the left ; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing SlideTrainerPicOffScreen: ; 3c8df (f:48df) - ld [$FF8B], a + ld [hSlideAmount], a ld c, a .slideStepLoop ; each iteration, the trainer pic is slid one tile left/right push bc @@ -1318,10 +1318,10 @@ SlideTrainerPicOffScreen: ; 3c8df (f:48df) ld b, 7 ; number of rows .rowLoop push hl - ld a, [$FF8B] + ld a, [hSlideAmount] ld c, a .columnLoop - ld a, [$FF8B] + ld a, [hSlideAmount] cp 8 jr z, .slideRight .slideLeft ; slide player sprite off screen @@ -1590,14 +1590,14 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) ld a, [hl] ld [H_MULTIPLICAND + 2], a ld a, [de] - ld [$ff8d], a + ld [hEnemySpeed], a inc de ld a, [de] - ld [$ff8e], a + ld [hEnemySpeed + 1], a call LoadScreenTilesFromBuffer1 ld de, H_MULTIPLICAND + 1 - ld hl, $ff8d - ld c, $2 + ld hl, hEnemySpeed + ld c, 2 call StringCmp jr nc, .canEscape ; jump if player speed greater than enemy speed xor a @@ -1609,9 +1609,9 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) ld [H_DIVIDEND], a ld a, [H_PRODUCT + 3] ld [H_DIVIDEND + 1], a - ld a, [$ff8d] + ld a, [hEnemySpeed] ld b, a - ld a, [$ff8e] + ld a, [hEnemySpeed + 1] ; divide enemy speed by 4 srl b rr a @@ -6411,7 +6411,7 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) predef ScaleSpriteByTwo ld hl, wOAMBuffer xor a - ld [$FF8B], a ; initial tile number + ld [hOAMTile], a ; initial tile number ld b, $7 ; 7 columns ld e, $a0 ; X for the left-most column .loop ; each loop iteration writes 3 OAM entries in a vertical column @@ -6425,16 +6425,16 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) add d ; increase Y by height of tile ld d, a inc hl - ld a, [$FF8B] + ld a, [hOAMTile] ld [hli], a ; OAM tile number inc a ; increment tile number - ld [$FF8B], a + ld [hOAMTile], a inc hl dec c jr nz, .innerLoop - ld a, [$FF8B] + ld a, [hOAMTile] add $4 ; increase tile number by 4 - ld [$FF8B], a + ld [hOAMTile], a ld a, $8 ; width of tile add e ; increase X by width of tile ld e, a diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 87512583..03dc6fb6 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -89,7 +89,7 @@ TryDoWildEncounter: ; 13870 (4:7870) jr .willEncounter .lastRepelStep ld [wRepelRemainingSteps], a - ld a, $d2 + ld a, 210 ld [H_DOWNARROWBLINKCNT2], a call EnableAutoTextBoxDrawing call DisplayTextID diff --git a/engine/items/items.asm b/engine/items/items.asm index b65e8f1e..7617ba6c 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -556,11 +556,11 @@ ItemUseSurfboard: ; d9b4 (3:59b4) jp PrintText .tryToStopSurfing xor a - ld [$ff8c],a + ld [hSpriteIndexOrTextID],a ld d,16 ; talking range in pixels (normal range) call IsSpriteInFrontOfPlayer2 res 7,[hl] - ld a,[$ff8c] + ld a,[hSpriteIndexOrTextID] and a ; is there a sprite in the way? jr nz,.cannotStopSurfing ld hl,TilePairCollisionsWater diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm index 4decc82d..6bb7f711 100755 --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm @@ -1,7 +1,6 @@ GetMachinePrice: ; 7bf86 (1e:7f86) ; Input: [wcf91] = Item Id of a TM -; Output: Stores the 2-byte TM price in [H_DOWNARROWBLINKCNT1] and [H_DOWNARROWBLINKCNT2] -; as a BCD +; Output: Stores the TM price at hItemPrice ld a, [wcf91] ; a contains TM item id sub TM_01 ret c @@ -17,10 +16,10 @@ GetMachinePrice: ; 7bf86 (1e:7f86) swap a .highNybbleIsPrice and $f0 - ld [H_DOWNARROWBLINKCNT2], a + ld [hItemPrice + 1], a xor a - ld [H_DOWNARROWBLINKCNT1], a - ld [$ff8d], a + ld [hItemPrice], a + ld [hItemPrice + 2], a ret INCLUDE "data/tm_prices.asm" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 56543c91..80eedecd 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -512,25 +512,25 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) inc de inc de ; de = address of upper byte of weight push de -; put weight in big-endian order at $ff8b - ld hl,$ff8b - ld a,[hl] ; save existing value of [$ff8b] +; put weight in big-endian order at hDexWeight + ld hl,hDexWeight + ld a,[hl] ; save existing value of [hDexWeight] push af ld a,[de] ; a = upper byte of weight - ld [hli],a ; store upper byte of weight in [$ff8b] - ld a,[hl] ; save existing value of [$ff8c] + ld [hli],a ; store upper byte of weight in [hDexWeight] + ld a,[hl] ; save existing value of [hDexWeight + 1] push af dec de ld a,[de] ; a = lower byte of weight - ld [hl],a ; store lower byte of weight in [$ff8c] - ld de,$ff8b + ld [hl],a ; store lower byte of weight in [hDexWeight + 1] + ld de,hDexWeight hlCoord 11, 8 ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits call PrintNumber ; print weight hlCoord 14, 8 - ld a,[$ff8c] + ld a,[hDexWeight + 1] sub a,10 - ld a,[$ff8b] + ld a,[hDexWeight] sbc a,0 jr nc,.next ld [hl],"0" ; if the weight is less than 10, put a 0 before the decimal point @@ -540,9 +540,9 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld [hld],a ; make space for the decimal point by moving the last digit forward one tile ld [hl],$f2 ; decimal point tile pop af - ld [$ff8c],a ; restore original value of [$ff8c] + ld [hDexWeight + 1],a ; restore original value of [hDexWeight + 1] pop af - ld [$ff8b],a ; restore original value of [$ff8b] + ld [hDexWeight],a ; restore original value of [hDexWeight] pop hl inc hl ; hl = address of pokedex description text bcCoord 1, 11 diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index fff8e4c4..f7206a7f 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -58,13 +58,13 @@ WhichPrizeTextPtr: ; 52789 (14:6789) GetPrizeMenuId: ; 5278e (14:678e) ; determine which one among the three ; prize-texts has been selected -; using the text ID (stored in [$FF8C]) +; using the text ID (stored in [hSpriteIndexOrTextID]) ; load the three prizes at wd13d-wd13f ; load the three prices at wd141-wd146 ; display the three prizes' names ; (distinguishing between Pokemon names ; and Items (specifically TMs) names) - ld a,[$FF8C] + ld a,[hSpriteIndexOrTextID] sub a,$03 ; prize-texts' id are 3, 4 and 5 ld [wd12f],a ; prize-texts' id (relative, i.e. 0, 1 or 2) add a diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 11b7fa90..2804ef7b 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -524,7 +524,7 @@ StartMenu_TrainerInfo: ; 13460 (4:7460) DrawTrainerInfo: ; 1349a (4:749a) ld de,RedPicFront ld bc,(BANK(RedPicFront) << 8) | $01 - predef Predef3B + predef DisplayPicCenteredOrUpperRight call DisableLCD hlCoord 0, 2 ld a," " diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index df092d4c..bd7f672e 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -34,9 +34,9 @@ SetDefaultNames: ; 60ca (1:60ca) OakSpeech: ; 6115 (1:6115) ld a,$FF call PlaySound ; stop music - ld a, BANK(Music_Routes2) ; bank of song + ld a, BANK(Music_Routes2) ld c,a - ld a, MUSIC_ROUTES2 ; song # + ld a, MUSIC_ROUTES2 call PlayMusic call ClearScreen call LoadTextBoxTilePatterns @@ -54,50 +54,49 @@ OakSpeech: ; 6115 (1:6115) xor a ld [hTilesetType],a ld a,[wd732] - bit 1,a ; XXX when is bit 1 set? - jp nz,Func_61bc ; easter egg: skip the intro + bit 1,a ; possibly a debug mode bit + jp nz,.skipChoosingNames ld de,ProfOakPic ld bc, (Bank(ProfOakPic) << 8) | $00 - call IntroPredef3B ; displays Oak pic? + call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl,OakSpeechText1 - call PrintText ; prints text box + call PrintText call GBFadeOutToWhite call ClearScreen ld a,NIDORINO - ld [wd0b5],a ; pic displayed is stored at this location + ld [wd0b5],a ld [wcf91],a - call GetMonHeader ; this is also related to the pic - hlCoord 6, 4 ; position on tilemap the pic is displayed - call LoadFlippedFrontSpriteByMonIndex ; displays pic? + call GetMonHeader + hlCoord 6, 4 + call LoadFlippedFrontSpriteByMonIndex call MovePicLeft ld hl,OakSpeechText2 - call PrintText ; Prints text box + call PrintText call GBFadeOutToWhite call ClearScreen ld de,RedPicFront ld bc,(Bank(RedPicFront) << 8) | $00 - call IntroPredef3B ; displays player pic? + call IntroDisplayPicCenteredOrUpperRight call MovePicLeft ld hl,IntroducePlayerText call PrintText - call LoadDefaultNamesPlayer ; brings up NewName/Red/etc menu + call ChoosePlayerName call GBFadeOutToWhite call ClearScreen ld de,Rival1Pic ld bc,(Bank(Rival1Pic) << 8) | $00 - call IntroPredef3B ; displays rival pic + call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl,IntroduceRivalText call PrintText - call LoadDefaultNamesRival - -Func_61bc: ; 61bc (1:61bc) + call ChooseRivalName +.skipChoosingNames call GBFadeOutToWhite call ClearScreen ld de,RedPicFront ld bc,(Bank(RedPicFront) << 8) | $00 - call IntroPredef3B + call IntroDisplayPicCenteredOrUpperRight call GBFadeInFromWhite ld a,[wd72d] and a @@ -120,12 +119,12 @@ Func_61bc: ; 61bc (1:61bc) call CopyVideoData ld de,ShrinkPic1 ld bc,(BANK(ShrinkPic1) << 8) | $00 - call IntroPredef3B + call IntroDisplayPicCenteredOrUpperRight ld c,4 call DelayFrames ld de,ShrinkPic2 ld bc,(BANK(ShrinkPic2) << 8) | $00 - call IntroPredef3B + call IntroDisplayPicCenteredOrUpperRight call ResetPlayerSpriteData ld a,[H_LOADEDROMBANK] push af @@ -207,10 +206,12 @@ MovePicLeft: ; 6288 (1:6288) ld [rWX],a jr .next -Predef3B: ; 62a1 (1:62a1) +DisplayPicCenteredOrUpperRight: ; 62a1 (1:62a1) call GetPredefRegisters -IntroPredef3B: ; 62a4 (1:62a4) -; bank of sprite given in b +IntroDisplayPicCenteredOrUpperRight: ; 62a4 (1:62a4) +; b = bank +; de = address of compressed pic +; c: 0 = centred, non-zero = upper-right push bc ld a,b call UncompressSpriteFromDE diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index b27a6987..f881b43b 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -1,29 +1,29 @@ -LoadDefaultNamesPlayer: ; 695d (1:695d) - call Func_6a12 +ChoosePlayerName: ; 695d (1:695d) + call OakSpeechSlidePicRight ld de, DefaultNamesPlayer call DisplayIntroNameTextBox ld a, [wCurrentMenuItem] and a - jr z, .asm_697a + jr z, .customName ld hl, DefaultNamesPlayerList - call Func_6ad6 + call GetDefaultName ld de, wPlayerName - call Func_69ec - jr .asm_6999 -.asm_697a + call OakSpeechSlidePicLeft + jr .done +.customName ld hl, wPlayerName xor a ; NAME_PLAYER_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen ld a, [wcf4b] - cp $50 - jr z, .asm_697a + cp "@" + jr z, .customName call ClearScreen call Delay3 ld de, RedPicFront ld b, BANK(RedPicFront) - call IntroPredef3B -.asm_6999 + call IntroDisplayPicCenteredOrUpperRight +.done ld hl, YourNameIsText jp PrintText @@ -31,32 +31,32 @@ YourNameIsText: ; 699f (1:699f) TX_FAR _YourNameIsText db "@" -LoadDefaultNamesRival: ; 69a4 (1:69a4) - call Func_6a12 +ChooseRivalName: ; 69a4 (1:69a4) + call OakSpeechSlidePicRight ld de, DefaultNamesRival call DisplayIntroNameTextBox ld a, [wCurrentMenuItem] and a - jr z, .asm_69c1 + jr z, .customName ld hl, DefaultNamesRivalList - call Func_6ad6 + call GetDefaultName ld de, W_RIVALNAME - call Func_69ec - jr .asm_69e1 -.asm_69c1 + call OakSpeechSlidePicLeft + jr .done +.customName ld hl, W_RIVALNAME ld a, NAME_RIVAL_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen ld a, [wcf4b] - cp $50 - jr z, .asm_69c1 + cp "@" + jr z, .customName call ClearScreen call Delay3 ld de, Rival1Pic ld b, $13 - call IntroPredef3B -.asm_69e1 + call IntroDisplayPicCenteredOrUpperRight +.done ld hl, HisNameIsText jp PrintText @@ -64,11 +64,11 @@ HisNameIsText: ; 69e7 (1:69e7) TX_FAR _HisNameIsText db "@" -Func_69ec: ; 69ec (1:69ec) +OakSpeechSlidePicLeft: ; 69ec (1:69ec) push de hlCoord 0, 0 - ld bc, $c0b - call ClearScreenArea + lb bc, 12, 11 + call ClearScreenArea ; clear the name list text box ld c, 10 call DelayFrames pop de @@ -77,77 +77,83 @@ Func_69ec: ; 69ec (1:69ec) call CopyData call Delay3 hlCoord 12, 4 - ld de, $67d + lb de, 6, 6 * SCREEN_WIDTH + 5 ld a, $ff - jr asm_6a19 + jr OakSpeechSlidePicCommon -Func_6a12: ; 6a12 (1:6a12) +OakSpeechSlidePicRight: ; 6a12 (1:6a12) hlCoord 5, 4 - ld de, $67d + lb de, 6, 6 * SCREEN_WIDTH + 5 xor a -asm_6a19: ; 6a19 (1:6a19) + +OakSpeechSlidePicCommon: ; 6a19 (1:6a19) push hl push de push bc - ld [$ff8d], a + ld [hSlideDirection], a ld a, d - ld [H_DOWNARROWBLINKCNT1], a + ld [hSlideAmount], a ld a, e - ld [H_DOWNARROWBLINKCNT2], a + ld [hSlidingRegionSize], a ld c, a - ld a, [$ff8d] + ld a, [hSlideDirection] and a - jr nz, .asm_6a2d - ld d, $0 + jr nz, .next +; If sliding right, point hl to the end of the pic's tiles. + ld d, 0 add hl, de -.asm_6a2d +.next ld d, h ld e, l -.asm_6a2f +.loop xor a ld [H_AUTOBGTRANSFERENABLED], a - ld a, [$ff8d] + ld a, [hSlideDirection] and a - jr nz, .asm_6a3c + jr nz, .slideLeft +; sliding right ld a, [hli] ld [hld], a dec hl - jr .asm_6a3f -.asm_6a3c + jr .next2 +.slideLeft ld a, [hld] ld [hli], a inc hl -.asm_6a3f +.next2 dec c - jr nz, .asm_6a2f - ld a, [$ff8d] + jr nz, .loop + ld a, [hSlideDirection] and a - jr z, .asm_6a4a + jr z, .next3 +; If sliding left, we need to zero the last tile in the pic (there is no need +; to take a corresponding action when sliding right because hl initially points +; to a 0 tile in that case). xor a dec hl ld [hl], a -.asm_6a4a - ld a, $1 +.next3 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSlidingRegionSize] ld c, a ld h, d ld l, e - ld a, [$ff8d] + ld a, [hSlideDirection] and a - jr nz, .asm_6a5e + jr nz, .slideLeft2 inc hl - jr .asm_6a5f -.asm_6a5e + jr .next4 +.slideLeft2 dec hl -.asm_6a5f +.next4 ld d, h ld e, l - ld a, [H_DOWNARROWBLINKCNT1] + ld a, [hSlideAmount] dec a - ld [H_DOWNARROWBLINKCNT1], a - jr nz, .asm_6a2f + ld [hSlideAmount], a + jr nz, .loop pop bc pop de pop hl @@ -229,22 +235,24 @@ DefaultNamesRival: db "@" ENDC -Func_6ad6: ; 6ad6 (1:6ad6) +GetDefaultName: ; 6ad6 (1:6ad6) +; a = name index +; hl = name list ld b, a - ld c, $0 -.asm_6ad9 + ld c, 0 +.loop ld d, h ld e, l -.asm_6adb +.innerLoop ld a, [hli] - cp $50 - jr nz, .asm_6adb + cp "@" + jr nz, .innerLoop ld a, b cp c - jr z, .asm_6ae7 + jr z, .foundName inc c - jr .asm_6ad9 -.asm_6ae7 + jr .loop +.foundName ld h, d ld l, e ld de, wcd6d diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index b00405bf..eb6d743a 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -1,7 +1,7 @@ -PickupItem: +PickUpItem: call EnableAutoTextBoxDrawing - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSpriteIndexOrTextID] ld b, a ld hl, W_MISSABLEOBJECTLIST .missableObjectsListLoop @@ -18,7 +18,7 @@ PickupItem: ld [$ffdb], a ld hl, W_MAPSPRITEEXTRADATA - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSpriteIndexOrTextID] dec a add a ld d, 0 diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index df39d112..33411dfc 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -39,7 +39,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) ld b,$10 ; number of sprite slots ld hl,wSpriteStateData2 + $0d xor a - ld [$ff8e],a ; 4-tile sprite counter + ld [hFourTileSpriteCount],a .copyPictureIDLoop ; loop to copy picture ID from $C2XD to $C2XE ld a,[hli] ; $C2XD (sprite picture ID) ld [hld],a ; $C2XE @@ -98,14 +98,14 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) cp a,SPRITE_BALL ; is it a 4-tile sprite? jr c,.notFourTileSprite pop af - ld a,[$ff8e] ; 4-tile sprite counter + ld a,[hFourTileSpriteCount] add a,11 jr .storeVRAMSlot .notFourTileSprite pop af .storeVRAMSlot ld [hl],a ; store VRAM slot at $C2XE - ld [$ff8d],a ; used to determine if it's 4-tile sprite later + ld [hVRAMSlot],a ; used to determine if it's 4-tile sprite later ld a,b ; a = current sprite picture ID dec a add a @@ -128,7 +128,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) push bc ld hl,vNPCSprites ; VRAM base address ld bc,$c0 ; number of bytes per VRAM slot - ld a,[$ff8d] + ld a,[hVRAMSlot] cp a,11 ; is it a 4-tile sprite? jr nc,.fourTileSpriteVRAMAddr ld d,a @@ -142,13 +142,13 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) jr .loadStillTilePattern .fourTileSpriteVRAMAddr ld hl,vSprites + $7c0 ; address for second 4-tile sprite - ld a,[$ff8e] ; 4-tile sprite counter - and a ; is it the first 4-tile sprite? + ld a,[hFourTileSpriteCount] + and a jr nz,.loadStillTilePattern ; if it's the first 4-tile sprite ld hl,vSprites + $780 ; address for first 4-tile sprite inc a - ld [$ff8e],a ; 4-tile sprite counter + ld [hFourTileSpriteCount],a .loadStillTilePattern pop bc pop de @@ -168,7 +168,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) .skipFirstLoad pop de pop hl - ld a,[$ff8d] + ld a,[hVRAMSlot] cp a,11 ; is it a 4-tile sprite? jr nc,.skipSecondLoad ; if so, there is no second block push de diff --git a/engine/predefs.asm b/engine/predefs.asm index 1af240ce..17f94b73 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -111,7 +111,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef InternalClockTradeAnim add_predef TrainerEngage add_predef IndexToPokedex - add_predef Predef3B; 3B display pic? + add_predef DisplayPicCenteredOrUpperRight; 3B display pic? add_predef UsedCut add_predef ShowPokedexData add_predef WriteMonMoves @@ -144,7 +144,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef GetTileTwoStepsInFrontOfPlayer add_predef CheckForCollisionWhenPushingBoulder add_predef PrintStrengthTxt - add_predef PickupItem + add_predef PickUpItem add_predef PrintMoveType add_predef LoadMovePPs add_predef DrawHP ; 5F diff --git a/home.asm b/home.asm index 38a95742..f9004e7e 100644 --- a/home.asm +++ b/home.asm @@ -969,10 +969,10 @@ PokeCenterSignText:: ; 24ef (0:24ef) TX_FAR _PokeCenterSignText db "@" -Predef5CText:: ; 24f4 (0:24f4) +PickUpItemText:: ; 24f4 (0:24f4) ; XXX better label (what does predef $5C do?) TX_ASM - predef PickupItem + predef PickUpItem jp TextScriptEnd @@ -1050,7 +1050,7 @@ Func_28cb:: ; 28cb (0:28cb) jp PlaySound ; this function is used to display sign messages, sprite dialog, etc. -; INPUT: [$ff8c] = sprite ID or text ID +; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID DisplayTextID:: ; 2920 (0:2920) ld a,[H_LOADEDROMBANK] push af @@ -1069,7 +1069,7 @@ DisplayTextID:: ; 2920 (0:2920) ld h,[hl] ld l,a ; hl = map text pointer ld d,$00 - ld a,[$ff8c] ; text ID + ld a,[hSpriteIndexOrTextID] ; text ID ld [wSpriteIndex],a and a jp z,DisplayStartMenu @@ -1083,7 +1083,7 @@ DisplayTextID:: ; 2920 (0:2920) jp z,DisplayRepelWoreOffText ld a,[W_NUMSPRITES] ld e,a - ld a,[$ff8c] ; sprite ID + ld a,[hSpriteIndexOrTextID] ; sprite ID cp e jr z,.spriteHandling jr nc,.skipSpriteHandling @@ -1096,7 +1096,7 @@ DisplayTextID:: ; 2920 (0:2920) pop bc pop de ld hl,W_MAPSPRITEDATA ; NPC text entries - ld a,[$ff8c] + ld a,[hSpriteIndexOrTextID] dec a add a add l @@ -1235,10 +1235,12 @@ LoadItemList:: ; 2a5a (0:2a5a) ret DisplayPokemonCenterDialogue:: ; 2a72 (0:2a72) +; zeroing these doesn't appear to serve any purpose xor a ld [$ff8b],a ld [$ff8c],a ld [$ff8d],a + inc hl ld a,[H_LOADEDROMBANK] push af @@ -2487,8 +2489,8 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) ld c, a call TrainerFlagAction ; read trainer flag ld a, c - and a - jr nz, .trainerAlreadyFought + and a ; has the trainer already been defeated? + jr nz, .continue push hl push de push hl @@ -2507,7 +2509,7 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) ld a, [wTrainerSpriteOffset] and a ret nz ; break if the trainer is engaging -.trainerAlreadyFought +.continue ld hl, $c add hl, de ld d, h @@ -2737,7 +2739,7 @@ SetSpriteFacingDirection:: ; 34ae (0:34ae) ld a, $9 ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 - ld a, [$ff8d] + ld a, [hSpriteFacingDirection] ld [hl], a ret @@ -2858,18 +2860,18 @@ DecodeRLEList:: ; 350c (0:350c) inc a ; include sentinel in counting ret -; sets movement byte 1 for sprite [$FF8C] to $FE and byte 2 to [$FF8D] +; sets movement byte 1 for sprite [H_SPRITEINDEX] to $FE and byte 2 to [hSpriteMovementByte2] SetSpriteMovementBytesToFE:: ; 3533 (0:3533) push hl call GetSpriteMovementByte1Pointer ld [hl], $fe call GetSpriteMovementByte2Pointer - ld a, [$ff8d] + ld a, [hSpriteMovementByte2] ld [hl], a pop hl ret -; sets both movement bytes for sprite [$FF8C] to $FF +; sets both movement bytes for sprite [H_SPRITEINDEX] to $FF SetSpriteMovementBytesToFF:: ; 3541 (0:3541) push hl call GetSpriteMovementByte1Pointer @@ -2879,20 +2881,20 @@ SetSpriteMovementBytesToFF:: ; 3541 (0:3541) pop hl ret -; returns the sprite movement byte 1 pointer for sprite [$FF8C] in hl +; returns the sprite movement byte 1 pointer for sprite [H_SPRITEINDEX] in hl GetSpriteMovementByte1Pointer:: ; 354e (0:354e) ld h,$C2 - ld a,[H_SPRITEINDEX] ; the sprite to move + ld a,[H_SPRITEINDEX] swap a add a,6 ld l,a ret -; returns the sprite movement byte 2 pointer for sprite [$FF8C] in hl +; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl GetSpriteMovementByte2Pointer:: ; 3558 (0:3558) push de ld hl,W_MAPSPRITEDATA - ld a,[$FF8C] ; the sprite to move + ld a,[H_SPRITEINDEX] dec a add a ld d,0 diff --git a/home/copy2.asm b/home/copy2.asm index e5f28383..f872ebbc 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -1,10 +1,10 @@ FarCopyData2:: -; Identical to FarCopyData, but uses $ff8b +; Identical to FarCopyData, but uses hROMBankTemp ; as temp space instead of wBuffer. - ld [$ff8b],a + ld [hROMBankTemp],a ld a,[H_LOADEDROMBANK] push af - ld a,[$ff8b] + ld a,[hROMBankTemp] ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a call CopyData @@ -15,10 +15,10 @@ FarCopyData2:: FarCopyData3:: ; Copy bc bytes from a:de to hl. - ld [$ff8b],a + ld [hROMBankTemp],a ld a,[H_LOADEDROMBANK] push af - ld a,[$ff8b] + ld a,[hROMBankTemp] ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a push hl @@ -38,10 +38,10 @@ FarCopyData3:: FarCopyDataDouble:: ; Expand bc bytes of 1bpp image data ; from a:hl to 2bpp data at de. - ld [$ff8b],a + ld [hROMBankTemp],a ld a,[H_LOADEDROMBANK] push af - ld a,[$ff8b] + ld a,[hROMBankTemp] ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a .loop @@ -70,7 +70,7 @@ CopyVideoData:: ld [H_AUTOBGTRANSFERENABLED], a ld a, [H_LOADEDROMBANK] - ld [$ff8b], a + ld [hROMBankTemp], a ld a, b ld [H_LOADEDROMBANK], a @@ -94,7 +94,7 @@ CopyVideoData:: .done ld [H_VBCOPYSIZE], a call DelayFrame - ld a, [$ff8b] + ld a, [hROMBankTemp] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a pop af @@ -119,7 +119,7 @@ CopyVideoDataDouble:: xor a ; disable auto-transfer while copying ld [H_AUTOBGTRANSFERENABLED], a ld a, [H_LOADEDROMBANK] - ld [$ff8b], a + ld [hROMBankTemp], a ld a, b ld [H_LOADEDROMBANK], a @@ -143,7 +143,7 @@ CopyVideoDataDouble:: .done ld [H_VBCOPYDOUBLESIZE], a call DelayFrame - ld a, [$ff8b] + ld a, [hROMBankTemp] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a pop af diff --git a/home/overworld.asm b/home/overworld.asm index f4d6d695..da514763 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -444,7 +444,7 @@ CheckWarpsCollision:: ; 0706 (0:0706) ld a,[hli] ld [wDestinationWarpID],a ld a,[hl] - ld [$ff8b],a ; save target map + ld [hWarpDestinationMap],a jr WarpFound2 .retry1 inc hl @@ -466,7 +466,7 @@ WarpFound1:: ; 0735 (0:0735) ld a,[hli] ld [wDestinationWarpID],a ld a,[hli] - ld [$ff8b],a ; save target map + ld [hWarpDestinationMap],a WarpFound2:: ; 073c (0:073c) ld a,[wNumberOfWarps] @@ -481,8 +481,8 @@ WarpFound2:: ; 073c (0:073c) ld [wLastMap],a ld a,[W_CURMAPWIDTH] ld [wd366],a - ld a,[$ff8b] ; destination map number - ld [W_CURMAP],a ; change current map to destination map + ld a,[hWarpDestinationMap] + ld [W_CURMAP],a cp a,ROCK_TUNNEL_1 jr nz,.notRockTunnel ld a,$06 @@ -493,11 +493,11 @@ WarpFound2:: ; 073c (0:073c) jr .done ; for maps that can have the 0xFF destination map, which means to return to the outside map; not all these maps are necessarily indoors, though .indoorMaps - ld a,[$ff8b] ; destination map + ld a,[hWarpDestinationMap] ; destination map cp a,$ff jr z,.goBackOutside ; if not going back to the previous map - ld [W_CURMAP],a ; current map number + ld [W_CURMAP],a callba IsPlayerStandingOnWarpPadOrHole ld a,[wcd5b] dec a ; is the player on a warp pad? @@ -539,22 +539,22 @@ CheckMapConnections:: ; 07ba (0:07ba) jr nz,.checkEastMap ld a,[W_MAPCONN3PTR] ld [W_CURMAP],a - ld a,[wd38f] ; new X coordinate upon entering west map + ld a,[wWestConnectedMapXAlignment] ; new X coordinate upon entering west map ld [W_XCOORD],a ld a,[W_YCOORD] ld c,a - ld a,[wd38e] ; Y adjustment upon entering west map + ld a,[wWestConnectedMapYAlignment] ; Y adjustment upon entering west map add c ld c,a ld [W_YCOORD],a - ld a,[wd390] ; pointer to upper left corner of map without adjustment for Y position + ld a,[wWestConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position ld l,a - ld a,[wd391] + ld a,[wWestConnectedMapViewPointer + 1] ld h,a srl c jr z,.savePointer1 .pointerAdjustmentLoop1 - ld a,[wd38d] ; width of connected map + ld a,[wWestConnectedMapWidth] ; width of connected map add a,$06 ld e,a ld d,$00 @@ -575,22 +575,22 @@ CheckMapConnections:: ; 07ba (0:07ba) jr nz,.checkNorthMap ld a,[W_MAPCONN4PTR] ld [W_CURMAP],a - ld a,[wd39a] ; new X coordinate upon entering east map + ld a,[wEastConnectedMapXAlignment] ; new X coordinate upon entering east map ld [W_XCOORD],a ld a,[W_YCOORD] ld c,a - ld a,[wd399] ; Y adjustment upon entering east map + ld a,[wEastConnectedMapYAlignment] ; Y adjustment upon entering east map add c ld c,a ld [W_YCOORD],a - ld a,[wd39b] ; pointer to upper left corner of map without adjustment for Y position + ld a,[wEastConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position ld l,a - ld a,[wd39c] + ld a,[wEastConnectedMapViewPointer + 1] ld h,a srl c jr z,.savePointer2 .pointerAdjustmentLoop2 - ld a,[wd398] + ld a,[wEastConnectedMapWidth] add a,$06 ld e,a ld d,$00 @@ -610,19 +610,19 @@ CheckMapConnections:: ; 07ba (0:07ba) jr nz,.checkSouthMap ld a,[W_MAPCONN1PTR] ld [W_CURMAP],a - ld a,[wd378] ; new Y coordinate upon entering north map + ld a,[wNorthConnectedMapYAlignment] ; new Y coordinate upon entering north map ld [W_YCOORD],a ld a,[W_XCOORD] ld c,a - ld a,[wd379] ; X adjustment upon entering north map + ld a,[wNorthConnectedMapXAlignment] ; X adjustment upon entering north map add c ld c,a ld [W_XCOORD],a - ld a,[wd37a] ; pointer to upper left corner of map without adjustment for X position + ld a,[wNorthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position ld l,a - ld a,[wd37b] + ld a,[wNorthConnectedMapViewPointer + 1] ld h,a - ld b,$00 + ld b,0 srl c add hl,bc ld a,l @@ -637,19 +637,19 @@ CheckMapConnections:: ; 07ba (0:07ba) jr nz,.didNotEnterConnectedMap ld a,[W_MAPCONN2PTR] ld [W_CURMAP],a - ld a,[wd383] ; new Y coordinate upon entering south map + ld a,[wSouthConnectedMapYAlignment] ; new Y coordinate upon entering south map ld [W_YCOORD],a ld a,[W_XCOORD] ld c,a - ld a,[wd384] ; X adjustment upon entering south map + ld a,[wSouthConnectedMapXAlignment] ; X adjustment upon entering south map add c ld c,a ld [W_XCOORD],a - ld a,[wd385] ; pointer to upper left corner of map without adjustment for X position + ld a,[wSouthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position ld l,a - ld a,[wd386] + ld a,[wSouthConnectedMapViewPointer + 1] ld h,a - ld b,$00 + ld b,0 srl c add hl,bc ld a,l @@ -884,9 +884,9 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ; a 3-byte border at the edges of the map is kept so that there is space for map connections ld hl,wOverworldMap ld a,[W_CURMAPWIDTH] - ld [$ff8c],a + ld [hMapWidth],a add a,$06 ; border (east and west) - ld [$ff8b],a ; map width + border + ld [hMapStride],a ; map width + border ld b,$00 ld c,a ; make space for north border (next 3 lines) @@ -903,7 +903,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ld b,a .rowLoop ; copy one row each iteration push hl - ld a,[$ff8c] ; map width (without border) + ld a,[hMapWidth] ; map width (without border) ld c,a .rowInnerLoop ld a,[de] @@ -913,7 +913,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) jr nz,.rowInnerLoop ; add the map width plus the border to the base address of the current row to get the next row's address pop hl - ld a,[$ff8b] ; map width + border + ld a,[hMapStride] ; map width + border add l ld l,a jr nc,.noCarry @@ -926,72 +926,72 @@ LoadTileBlockMap:: ; 09fc (0:09fc) cp a,$ff jr z,.southConnection call SwitchToMapRomBank - ld a,[wd372] + ld a,[wNorthConnectionStripSrc] ld l,a - ld a,[wd373] + ld a,[wNorthConnectionStripSrc + 1] ld h,a - ld a,[wd374] + ld a,[wNorthConnectionStripDest] ld e,a - ld a,[wd375] + ld a,[wNorthConnectionStripDest + 1] ld d,a - ld a,[wd376] - ld [$ff8b],a - ld a,[wd377] - ld [$ff8c],a + ld a,[wNorthConnectionStripWidth] + ld [hNorthSouthConnectionStripWidth],a + ld a,[wNorthConnectedMapWidth] + ld [hNorthSouthConnectedMapWidth],a call LoadNorthSouthConnectionsTileMap .southConnection ld a,[W_MAPCONN2PTR] cp a,$ff jr z,.westConnection call SwitchToMapRomBank - ld a,[wd37d] + ld a,[wSouthConnectionStripSrc] ld l,a - ld a,[wd37e] + ld a,[wSouthConnectionStripSrc + 1] ld h,a - ld a,[wd37f] + ld a,[wSouthConnectionStripDest] ld e,a - ld a,[wd380] + ld a,[wSouthConnectionStripDest + 1] ld d,a - ld a,[wd381] - ld [$ff8b],a - ld a,[wd382] - ld [$ff8c],a + ld a,[wSouthConnectionStripWidth] + ld [hNorthSouthConnectionStripWidth],a + ld a,[wSouthConnectedMapWidth] + ld [hNorthSouthConnectedMapWidth],a call LoadNorthSouthConnectionsTileMap .westConnection ld a,[W_MAPCONN3PTR] cp a,$ff jr z,.eastConnection call SwitchToMapRomBank - ld a,[wd388] + ld a,[wWestConnectionStripSrc] ld l,a - ld a,[wd389] + ld a,[wWestConnectionStripSrc + 1] ld h,a - ld a,[wd38a] + ld a,[wWestConnectionStripDest] ld e,a - ld a,[wd38b] + ld a,[wWestConnectionStripDest + 1] ld d,a - ld a,[wd38c] + ld a,[wWestConnectionStripHeight] ld b,a - ld a,[wd38d] - ld [$ff8b],a + ld a,[wWestConnectedMapWidth] + ld [hEastWestConnectedMapWidth],a call LoadEastWestConnectionsTileMap .eastConnection ld a,[W_MAPCONN4PTR] cp a,$ff jr z,.done call SwitchToMapRomBank - ld a,[wd393] + ld a,[wEastConnectionStripSrc] ld l,a - ld a,[wd394] + ld a,[wEastConnectionStripSrc + 1] ld h,a - ld a,[wd395] + ld a,[wEastConnectionStripDest] ld e,a - ld a,[wd396] + ld a,[wEastConnectionStripDest + 1] ld d,a - ld a,[wd397] + ld a,[wEastConnectionStripHeight] ld b,a - ld a,[wd398] - ld [$ff8b],a + ld a,[wEastConnectedMapWidth] + ld [hEastWestConnectedMapWidth],a call LoadEastWestConnectionsTileMap .done ret @@ -1001,7 +1001,7 @@ LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade) .loop push de push hl - ld a,[$ff8b] ; width of connection + ld a,[hNorthSouthConnectionStripWidth] ld b,a .innerLoop ld a,[hli] @@ -1011,7 +1011,7 @@ LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade) jr nz,.innerLoop pop hl pop de - ld a,[$ff8c] ; width of connected map + ld a,[hNorthSouthConnectedMapWidth] add l ld l,a jr nc,.noCarry1 @@ -1040,7 +1040,7 @@ LoadEastWestConnectionsTileMap:: ; 0b02 (0:0b02) jr nz,.innerLoop pop de pop hl - ld a,[$ff8b] ; width of connected map + ld a,[hEastWestConnectedMapWidth] add l ld l,a jr nc,.noCarry1 @@ -2022,7 +2022,7 @@ LoadMapHeader:: ; 107c (0:107c) ld b,a res 7,a ld [W_CURMAPTILESET],a - ld [$ff8b],a + ld [hPreviousTileset],a bit 7,b ret nz ld hl,MapHeaderPointers @@ -2191,24 +2191,24 @@ LoadMapHeader:: ; 107c (0:107c) ld a,[hli] ld [de],a ; store movement byte 1 at C2X6 ld a,[hli] - ld [$ff8d],a ; save movement byte 2 + ld [hLoadSpriteTemp1],a ; save movement byte 2 ld a,[hli] - ld [$ff8e],a ; save text ID and flags byte + ld [hLoadSpriteTemp2],a ; save text ID and flags byte push bc push hl ld b,$00 ld hl,W_MAPSPRITEDATA add hl,bc - ld a,[$ff8d] + ld a,[hLoadSpriteTemp1] ld [hli],a ; store movement byte 2 in byte 0 of sprite entry - ld a,[$ff8e] + ld a,[hLoadSpriteTemp2] ld [hl],a ; this appears pointless, since the value is overwritten immediately after - ld a,[$ff8e] - ld [$ff8d],a + ld a,[hLoadSpriteTemp2] + ld [hLoadSpriteTemp1],a and a,$3f ld [hl],a ; store text ID in byte 1 of sprite entry pop hl - ld a,[$ff8d] + ld a,[hLoadSpriteTemp1] bit 6,a jr nz,.trainerSprite bit 7,a @@ -2216,25 +2216,25 @@ LoadMapHeader:: ; 107c (0:107c) jr .regularSprite .trainerSprite ld a,[hli] - ld [$ff8d],a ; save trainer class + ld [hLoadSpriteTemp1],a ; save trainer class ld a,[hli] - ld [$ff8e],a ; save trainer number (within class) + ld [hLoadSpriteTemp2],a ; save trainer number (within class) push hl ld hl,W_MAPSPRITEEXTRADATA add hl,bc - ld a,[$ff8d] + ld a,[hLoadSpriteTemp1] ld [hli],a ; store trainer class in byte 0 of the entry - ld a,[$ff8e] + ld a,[hLoadSpriteTemp2] ld [hl],a ; store trainer number in byte 1 of the entry pop hl jr .nextSprite .itemBallSprite ld a,[hli] - ld [$ff8d],a ; save item number + ld [hLoadSpriteTemp1],a ; save item number push hl ld hl,W_MAPSPRITEEXTRADATA add hl,bc - ld a,[$ff8d] + ld a,[hLoadSpriteTemp1] ld [hli],a ; store item number in byte 0 of the entry xor a ld [hl],a ; zero byte 1, since it is not used diff --git a/hram.asm b/hram.asm index b0d5a942..a05f3d18 100644 --- a/hram.asm +++ b/hram.asm @@ -1,9 +1,3 @@ - -H_SPRITEWIDTH EQU $FF8B ; in tiles -H_SPRITEINTERLACECOUNTER EQU $FF8B -H_SPRITEHEIGHT EQU $FF8C ; in tiles -H_SPRITEOFFSET EQU $FF8D - hSoftReset EQU $FF8A ; Initialized to 16. ; Decremented each input iteration if the player @@ -12,8 +6,28 @@ hSoftReset EQU $FF8A hBaseTileID EQU $FF8B +; 3-byte BCD number hItemPrice EQU $FF8B +hDexWeight EQU $FF8B + +hWarpDestinationMap EQU $FF8B + +hOAMTile EQU $FF8B + +hROMBankTemp EQU $FF8B + +hPreviousTileset EQU $FF8B + +hEastWestConnectedMapWidth EQU $FF8B + +hSlideAmount EQU $FF8B + +H_SPRITEWIDTH EQU $FF8B ; in tiles +H_SPRITEINTERLACECOUNTER EQU $FF8B +H_SPRITEHEIGHT EQU $FF8C ; in tiles +H_SPRITEOFFSET EQU $FF8D + ; counters for blinking down arrow H_DOWNARROWBLINKCNT1 EQU $FF8B H_DOWNARROWBLINKCNT2 EQU $FF8C @@ -21,11 +35,40 @@ H_DOWNARROWBLINKCNT2 EQU $FF8C H_SPRITEDATAOFFSET EQU $FF8B H_SPRITEINDEX EQU $FF8C +hMapStride EQU $FF8B +hMapWidth EQU $FF8C + +hNorthSouthConnectionStripWidth EQU $FF8B +hNorthSouthConnectedMapWidth EQU $FF8C + ; DisplayTextID's argument hSpriteIndexOrTextID EQU $FF8C hPartyMonIndex EQU $FF8C +; the total number of tiles being shifted each time the pic slides by one tile +hSlidingRegionSize EQU $FF8C + +; 2 bytes +hEnemySpeed EQU $FF8D + +hVRAMSlot EQU $FF8D + +hFourTileSpriteCount EQU $FF8E + +; -1 = left +; 0 = right +hSlideDirection EQU $FF8D + +hSpriteFacingDirection EQU $FF8D + +hSpriteMovementByte2 EQU $FF8D + +hSpriteImageIndex EQU $FF8D + +hLoadSpriteTemp1 EQU $FF8D +hLoadSpriteTemp2 EQU $FF8E + hHalveItemPrices EQU $FF8E hSpriteOffset2 EQU $FF8F diff --git a/macros.asm b/macros.asm index 6a693a0b..9899ec29 100644 --- a/macros.asm +++ b/macros.asm @@ -13,6 +13,10 @@ dex EQUS "db $5f, $50" ; End a Pokedex entry. percent EQUS "* $ff / 100" +lb: MACRO ; r, hi, lo + ld \1, (\2) << 8 + (\3) + ENDM + ; Constant enumeration is useful for monsters, items, moves, etc. const_def: MACRO @@ -530,7 +534,7 @@ ENDM SOUTH_MAP_CONNECTION: MACRO db \1 ; map id dw \6 + \4 ; "Conection Strip" location - dw wOverworldMap + 3 + (\8 + 3) * (\7 + 6) + \3 ; current map positoin + dw wOverworldMap + 3 + (\8 + 3) * (\7 + 6) + \3 ; current map position db \5 ; width of connection strip db \2 ; map width db 0 ; y alignment (y coordinate of player when entering map) diff --git a/main.asm b/main.asm index 3bc5989a..9ceb5f81 100755 --- a/main.asm +++ b/main.asm @@ -996,7 +996,7 @@ DisplayTextIDInit: ; 7096 (1:7096) ld a,[wAutoTextBoxDrawingControl] bit 0,a jr nz,.skipDrawingTextBoxBorder - ld a,[$ff8c] ; text ID (or sprite ID) + ld a,[hSpriteIndexOrTextID] ; text ID (or sprite ID) and a jr nz,.notStartMenu ; if text ID is 0 (i.e. the start menu) @@ -2094,7 +2094,7 @@ IsPlayerStandingOnWarp: ; c35f (3:435f) ld a, [hli] ; target warp ld [wDestinationWarpID], a ld a, [hl] ; target map - ld [$ff8b], a + ld [hWarpDestinationMap], a ld hl, wd736 set 2, [hl] ; standing on warp flag ret @@ -2593,7 +2593,7 @@ ApplyOutOfBattlePoisonDamage: ; c69c (3:469c) ld [wJoyIgnore], a call EnableAutoTextBoxDrawing ld a, $d0 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID pop de pop hl @@ -2640,7 +2640,7 @@ ApplyOutOfBattlePoisonDamage: ; c69c (3:469c) jr nz, .noBlackOut call EnableAutoTextBoxDrawing ld a, $d1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72e set 5, [hl] @@ -2692,7 +2692,7 @@ LoadTilesetHeader: ; c754 (3:4754) jr c, .asm_c797 ld a, [W_CURMAPTILESET] ld b, a - ld a, [$ff8b] + ld a, [hPreviousTileset] cp b jr z, .done .asm_c797 @@ -3454,15 +3454,15 @@ TryPushingBoulder: ; f225 (3:7225) bit 1, a ; has boulder dust animation from previous push played yet? ret nz xor a - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call IsSpriteInFrontOfPlayer - ld a, [$ff8c] + ld a, [hSpriteIndexOrTextID] ld [wBoulderSpriteIndex], a and a jp z, ResetBoulderPushFlags ld hl, wSpriteStateData1 + 1 ld d, $0 - ld a, [$ff8c] + ld a, [hSpriteIndexOrTextID] swap a ld e, a add hl, de diff --git a/scripts/agatha.asm b/scripts/agatha.asm index cc209553..e65b1fa2 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -76,7 +76,7 @@ AgathaScript0: ; 76490 (1d:6490) jr z, AgathaScript_76474 .asm_764b4 ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -112,7 +112,7 @@ AgathaScript2: ; 764ed (1d:64ed) cp $ff jp z, AgathaScript_76464 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [W_GARYCURSCRIPT], a diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 5de02d83..115b3b19 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -23,7 +23,7 @@ BillsHouseScript1: ; 1e783 (7:6783) ld de, MovementData_1e7a0 .notDown ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 ld [W_BILLSHOUSECURSCRIPT], a @@ -82,7 +82,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) ld c, 8 call DelayFrames ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld de, MovementData_1e807 call MoveSprite ld a, $4 @@ -113,7 +113,7 @@ BillsHouseScript4: ; 1e80d (7:680d) BillsHouseScript5: ; 1e827 (7:6827) ld a, $4 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $0 ld [W_BILLSHOUSECURSCRIPT], a diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 257a830b..bd28917c 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -76,7 +76,7 @@ BrunoScript0: ; 76339 (1d:6339) jr z, BrunoScript_7631d .asm_7635d ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -112,7 +112,7 @@ BrunoScript2: ; 76396 (1d:6396) cp $ff jp z, BrunoScript_7630d ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID BrunoTextPointers: ; 763a8 (1d:63a8) diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 3bcdf3a3..b9c006d1 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -58,10 +58,10 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld a, $f0 ld [wJoyIgnore], a ld a, $d - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $b - ld [H_SPRITEHEIGHT], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_48c5a ld a, [W_YCOORD] @@ -76,7 +76,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld de, MovementData_48c63 .asm_48c4d ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 ld [W_CELADONGAMECORNERCURSCRIPT], a diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 4793bf14..b978b272 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -44,7 +44,7 @@ CeladonGymScript3: ; 48956 (12:4956) CeladonGymText_48963: ; 48963 (12:4963) ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd77c set 1, [hl] @@ -52,14 +52,14 @@ CeladonGymText_48963: ; 48963 (12:4963) call GiveItem jr nc, .BagFull ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd77c set 0, [hl] jr .asm_4898c .BagFull ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_4898c ld hl, W_OBTAINEDBADGES diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 3565b809..20873a81 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -28,7 +28,7 @@ CeruleanCityScript4: ; 194a7 (6:54a7) ld hl, wd75b set 7, [hl] ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -55,7 +55,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [wSpriteStateData1 + $29], a call Delay3 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID .asm_194f7 ld a, [wd75a] @@ -82,9 +82,9 @@ CeruleanCityScript0: ; 194c8 (6:54c8) cp $14 jr z, .asm_19535 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, $5 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData2 ld [hl], $19 .asm_19535 @@ -93,7 +93,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) predef ShowObject ld de, CeruleanCityMovement1 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $1 ld [W_CERULEANCITYCURSCRIPT], a @@ -117,9 +117,9 @@ CeruleanCityMovement1: ; 19559 (6:5559) CeruleanCityScript_1955d: ; 1955d (6:555d) ld a,1 - ld [$ff8c],a + ld [H_SPRITEINDEX],a xor a ; SPRITE_FACING_DOWN - ld [$ff8d],a + ld [hSpriteFacingDirection],a jp SetSpriteFacingDirectionAndDelay ; face object CeruleanCityScript1: ; 19567 (6:5567) @@ -129,7 +129,7 @@ CeruleanCityScript1: ; 19567 (6:5567) xor a ld [wJoyIgnore], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -173,14 +173,14 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld hl, wd75a set 0, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, [W_XCOORD] cp $14 @@ -191,7 +191,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld de, CeruleanCityMovement3 .asm_195f3 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 ld [W_CERULEANCITYCURSCRIPT], a @@ -295,7 +295,7 @@ CeruleanCityText2: ; 1967c (6:567c) ld hl, CeruleanCityText_196ee ld de, CeruleanCityText_196ee call SaveEndBattleTextPointers - ld a, [$ff8c] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index a6cb4c64..2343af03 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -44,7 +44,7 @@ CeruleanGymScript3: ; 5c700 (17:4700) CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld a, $5 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd75e set 7, [hl] @@ -52,14 +52,14 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) call GiveItem jr nc, .BagFull ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd75e set 6, [hl] jr .asm_5c736 .BagFull ld a, $7 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c736 ld hl, W_OBTAINEDBADGES diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index b3d6def6..dbede0d3 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -37,7 +37,7 @@ CinnabarGymScript_75792: ; 75792 (1d:5792) ret CinnabarGymScript_757a0: ; 757a0 (1d:57a0) - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSpriteIndexOrTextID] ld [wTrainerHeaderFlagBit], a ret @@ -51,7 +51,7 @@ CinnabarGymScript0: ; 757ae (1d:57ae) ld a, [wda38] and a ret z - ld [$ff8c], a + ld [H_SPRITEINDEX], a cp $4 jr nz, .asm_757c3 ld a, $4 @@ -86,7 +86,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc) ld [wJoyIgnore], a ld a, [wda38] ld [wTrainerHeaderFlagBit], a - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID CinnabarGymScript_757f1: ; 757f1 (1d:57f1) @@ -139,7 +139,7 @@ CinnabarGymScript3: ; 7584a (1d:584a) ld [wJoyIgnore], a CinnabarGymScript3_75857: ; 75857 (1d:5857) ld a, $a - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd79a set 1, [hl] @@ -147,14 +147,14 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) call GiveItem jr nc, .BagFull ld a, $b - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd79a set 0, [hl] jr .asm_75880 .BagFull ld a, $c - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_75880 ld hl, W_OBTAINEDBADGES @@ -189,7 +189,7 @@ CinnabarGymTextPointers: ; 7589f (1d:589f) dw TM38NoRoomText CinnabarGymScript_758b7: ; 758b7 (1d:58b7) - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index 33a497c4..70ea25a5 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -27,7 +27,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld a, $8 ld [wd528], a ld a, $8 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index 1b118f55..8a4a0464 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -45,12 +45,12 @@ FightingDojoScript1: ; 5cd83 (17:4d83) ld a, $1 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ret @@ -64,9 +64,9 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6) ld a, $1 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay .asm_5cde4 @@ -76,7 +76,7 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6) or $3e ld [wd7b1], a ld a, $8 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -148,7 +148,7 @@ FightingDojoText1: ; 5ce44 (17:4e44) ld hl, FightingDojoText_5ce93 ld de, FightingDojoText_5ce93 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index f88f0055..843e7293 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -44,7 +44,7 @@ FuchsiaGymScript3: ; 7548a (1d:548a) ld [wJoyIgnore], a FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd792 set 1, [hl] @@ -52,14 +52,14 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) call GiveItem jr nc, .BagFull ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd792 set 0, [hl] jr .asm_754c0 .BagFull ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_754c0 ld hl, W_OBTAINEDBADGES diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index 12b49297..f758b49e 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -3,7 +3,7 @@ FuchsiaHouse2Script: ; 750b5 (1d:50b5) FuchsiaHouse2TextPointers: ; 750b8 (1d:50b8) dw FuchsiaHouse2Text1 - dw Predef5CText + dw PickUpItemText dw BoulderText dw FuchsiaHouse2Text4 dw FuchsiaHouse2Text5 diff --git a/scripts/gary.asm b/scripts/gary.asm index 59989b5f..476a59b0 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -55,7 +55,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ld hl, W_OPTIONS res 7, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d @@ -99,10 +99,10 @@ GaryScript3: ; 75fbb (1d:5fbb) ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 ld [W_GARYCURSCRIPT], a @@ -111,14 +111,14 @@ GaryScript3: ; 75fbb (1d:5fbb) GaryScript4: ; 75fe4 (1d:5fe4) callba Music_Cities1AlternateTempo ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_76014 ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, HS_CHAMPIONS_ROOM_OAK ld [wcc4d], a @@ -142,17 +142,17 @@ GaryScript5: ; 7601a (1d:601a) ld a, $2 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a - call SetSpriteFacingDirectionAndDelay ; face object + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 ld [W_GARYCURSCRIPT], a @@ -160,12 +160,12 @@ GaryScript5: ; 7601a (1d:601a) GaryScript6: ; 76047 (1d:6047) ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_RIGHT - ld [$ff8d], a - call SetSpriteFacingDirectionAndDelay ; face object + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay ld a, $4 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 ld [W_GARYCURSCRIPT], a @@ -173,16 +173,16 @@ GaryScript6: ; 76047 (1d:6047) GaryScript7: ; 7605f (1d:605f) ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a - call SetSpriteFacingDirectionAndDelay ; face object + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld de, MovementData_76080 ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 ld [W_GARYCURSCRIPT], a diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index cb2c1fad..680ebdd9 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -83,10 +83,10 @@ HallofFameRoomScript1: ; 5a52b (16:652b) ld a, $1 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld a, $8 + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 xor a @@ -94,7 +94,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b) inc a ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a diff --git a/scripts/lance.asm b/scripts/lance.asm index c11bec2f..e335914b 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -64,7 +64,7 @@ LanceScript0: ; 5a305 (16:6305) cp $3 jr nc, .asm_5a325 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID .asm_5a325 cp $5 @@ -93,7 +93,7 @@ LanceScript2: ; 5a349 (16:6349) cp $ff jp z, LanceScript_5a2f5 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID LanceScript_5a35b: ; 5a35b (16:635b) diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 7e800467..1f1fcde0 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -77,7 +77,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) jr z, LoreleiScript_761c6 .asm_76206 ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -112,7 +112,7 @@ LoreleiScript2: ; 7623f (1d:623f) cp $ff jp z, LoreleiScript_761b6 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID LoreleiTextPointers: ; 76251 (1d:6251) diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index d658b425..6673e03b 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -53,7 +53,7 @@ Mansion1Script_Switches: ; 44316 (11:4316) xor a ld [hJoyHeld], a ld a, $4 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion1ScriptPointers: ; 44326 (11:4326) @@ -63,8 +63,8 @@ Mansion1ScriptPointers: ; 44326 (11:4326) Mansion1TextPointers: ; 4432c (11:432c) dw Mansion1Text1 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Mansion1Text4 Mansion1TrainerHeaders: ; 44334 (11:4334) diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 40827be1..27ccbdfb 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -49,7 +49,7 @@ Mansion2Script_Switches: ; 52037 (14:6037) xor a ld [hJoyHeld], a ld a, $5 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion2ScriptPointers: ; 52047 (14:6047) @@ -59,7 +59,7 @@ Mansion2ScriptPointers: ; 52047 (14:6047) Mansion2TextPointers: ; 5204d (14:604d) dw Mansion2Text1 - dw Predef5CText + dw PickUpItemText dw Mansion2Text3 dw Mansion2Text4 dw Mansion2Text5 diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index dfecde99..fa31718f 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -80,14 +80,14 @@ Mansion3Script_Switches: ; 5227a (14:627a) xor a ld [hJoyHeld], a ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion3TextPointers: ; 5228a (14:628a) dw Mansion3Text1 dw Mansion3Text2 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Mansion3Text5 dw Mansion3Text6 diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index c23cb2d7..68e74fd5 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -51,7 +51,7 @@ Mansion4Script_Switches: ; 52420 (14:6420) xor a ld [hJoyHeld], a ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion4ScriptPointers: ; 52430 (14:6430) @@ -62,12 +62,12 @@ Mansion4ScriptPointers: ; 52430 (14:6430) Mansion4TextPointers: ; 52436 (14:6436) dw Mansion4Text1 dw Mansion4Text2 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw Mansion4Text7 - dw Predef5CText + dw PickUpItemText dw Mansion3Text6 Mansion4TrainerHeaders: ; 52448 (14:6448) diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index 6c9fcd88..868b70d1 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -20,12 +20,12 @@ MtMoon1TextPointers: ; 499e1 (12:59e1) dw MtMoon1Text5 dw MtMoon1Text6 dw MtMoon1Text7 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw MtMoon1Text14 MtMoon1TrainerHeaders: ; 499fd (12:59fd) diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 7c6e987e..ee163738 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -66,7 +66,7 @@ MtMoon3Script0: ; 49d6f (12:5d6f) xor a ld [hJoyHeld], a ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID MtMoon3Script_49d91: ; 49d91 (12:5d91) @@ -92,7 +92,7 @@ MtMoon3Script3: ; 49d9a (12:5d9a) MtMoon3Script4: ; 49dba (12:5dba) ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld hl, CoordsData_49dea call ArePlayerCoordsInArray @@ -106,7 +106,7 @@ MtMoon3Script4: ; 49dba (12:5dba) ld de, MovementData_49df8 .asm_49dda ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 ld [W_MTMOON3CURSCRIPT], a @@ -140,7 +140,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, [wd7f6] bit 6, a @@ -167,8 +167,8 @@ MtMoon3TextPointers: ; 49e34 (12:5e34) dw MtMoon3Text5 dw MtMoon3Text6 dw MtMoon3Text7 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw MtMoon3Text_49f99 MtMoon3TrainerHeaders: ; 49e48 (12:5e48) diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 26c7f02d..38c3f717 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -25,7 +25,7 @@ Museum1FScript0: ; 5c10d (17:410d) xor a ld [hJoyHeld], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Museum1FScript1: ; 5c12a (17:412a) @@ -69,7 +69,7 @@ Museum1FText1: ; 5c135 (17:4135) call PrintText jp Museum1FScriptEnd .asm_3ded4 - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID xor a @@ -96,15 +96,15 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, wd754 set 0, [hl] xor a - ld [wWhichTrade], a - ld [wTrainerEngageDistance], a + ld [wMuseumPriceTemp], a + ld [wMuseumPriceTemp + 1], a ld a, $50 - ld [wTrainerFacingDirection], a - ld hl, wTrainerFacingDirection + ld [wMuseumPriceTemp + 2], a + ld hl, wMuseumPriceTemp + 2 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID ld a, (SFX_02_5a - SFX_Headers_02) / 3 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 992b6887..5463b879 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -89,13 +89,13 @@ OaksLabScript3: ; 1cba2 (7:4ba2) call StartSimulatingJoypadStates ld a, $1 ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + xor a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $5 ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + xor a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $4 @@ -117,7 +117,7 @@ OaksLabScript4: ; 1cbd2 (7:4bd2) ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites ld hl, W_FLAGS_D733 @@ -132,19 +132,19 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld a, $fc ld [wJoyIgnore], a ld a, $11 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $12 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $13 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $14 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd74b set 1, [hl] @@ -162,16 +162,16 @@ OaksLabScript6: ; 1cc36 (7:4c36) ld a, $5 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 ld [H_SPRITEINDEX], a xor a - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites ld a, $c - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -261,7 +261,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) ld a, $1 ld [H_SPRITEINDEX], a ld a, $4 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 push hl ld [hl], $4c @@ -302,10 +302,10 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $d - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, [wTrainerEngageDistance] cp $2 @@ -331,10 +331,10 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $e - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd74b set 2, [hl] @@ -352,7 +352,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ld a, $1 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $8 ld [wd528], a @@ -360,7 +360,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $f - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [hNPCPlayerRelativePosPerspective], a @@ -432,7 +432,7 @@ OaksLabScript12: ; 1ce03 (7:4e03) ld a, $1 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay predef HealParty ld hl, wd74b @@ -446,7 +446,7 @@ OaksLabScript13: ; 1ce32 (7:4e32) ld c, 20 call DelayFrames ld a, $10 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID callba Music_RivalAlternateStart ld a, $1 @@ -522,7 +522,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) call PlaySound callba Music_RivalAlternateStart ld a, $15 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call OaksLabScript_1d02b ld a, HS_OAKS_LAB_RIVAL @@ -549,12 +549,12 @@ OaksLabScript_1cefd: ; 1cefd (7:4efd) ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $8 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay OaksLabScript16: ; 1cf12 (7:4f12) @@ -567,21 +567,21 @@ OaksLabScript16: ; 1cf12 (7:4f12) ld [wJoyIgnore], a call OaksLabScript_1cefd ld a, $16 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame call OaksLabScript_1cefd ld a, $17 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame call OaksLabScript_1cefd ld a, $18 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame ld a, $19 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, HS_POKEDEX_1 @@ -592,16 +592,16 @@ OaksLabScript16: ; 1cf12 (7:4f12) predef HideObject call OaksLabScript_1cefd ld a, $1a - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_RIGHT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 ld a, $1b - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd74b set 5, [hl] @@ -856,13 +856,13 @@ OaksLabScript_1d157: ; 1d157 (7:5157) ld a, $5 ld [H_SPRITEINDEX], a ld a, $9 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 ld [hl], $0 ld a, $1 ld [H_SPRITEINDEX], a ld a, $9 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 ld [hl], $c ld hl, wd730 @@ -962,7 +962,7 @@ OaksLabScript_1d22d: ; 1d22d (7:522d) ld a, $5 ld [H_SPRITEINDEX], a ld a, $9 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 ld [hl], $0 ld hl, OaksLabLastMonText diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 5b042066..327a32ff 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -67,7 +67,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ld a,1 ld [H_SPRITEINDEX],a ld a,SPRITE_FACING_UP - ld [$FF8D],a + ld [hSpriteFacingDirection],a call SetSpriteFacingDirectionAndDelay call Delay3 ld a,1 diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 460eab5c..94d23caa 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -31,7 +31,7 @@ PewterCityScript_1925e: ; 1925e (6:525e) ld a, $f0 ld [wJoyIgnore], a ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_19277: ; 19277 (6:5277) @@ -48,16 +48,16 @@ PewterCityScript1: ; 19280 (6:5280) ld a, $3 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, ($3 << 4) | SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteImageIndex], a call SetSpriteImageIndexAfterSettingFacingDirection call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] ld a, $d - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3c ld [$ffeb], a @@ -71,7 +71,7 @@ PewterCityScript1: ; 19280 (6:5280) ld [wSpriteIndex], a call SetSpritePosition1 ld a, $3 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld de, MovementData_PewterMuseumGuyExit call MoveSprite ld a, $2 @@ -114,18 +114,18 @@ PewterCityScript4: ; 19305 (6:5305) and a ret nz ld a, $5 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, ($1 << 4) | SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteImageIndex], a call SetSpriteImageIndexAfterSettingFacingDirection call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] ld a, $e - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3c ld [$ffeb], a @@ -139,7 +139,7 @@ PewterCityScript4: ; 19305 (6:5305) ld [wSpriteIndex], a call SetSpritePosition1 ld a, $5 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld de, MovementData_PewterGymGuyExit call MoveSprite ld a, $5 diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index f4b2ad28..9f1493d4 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -44,7 +44,7 @@ PewterGymScript3: ; 5c3d2 (17:43d2) PewterGymScript_5c3df: ; 5c3df (17:43df) ld a, $4 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd755 set 7, [hl] @@ -52,14 +52,14 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) call GiveItem jr nc, .BagFull ld a, $5 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd755 set 6, [hl] jr .asm_5c408 .BagFull ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c408 ld hl, W_OBTAINEDBADGES diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 286b8202..8520b10b 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -31,7 +31,7 @@ PokemonTower2Script0: ; 6050f (18:450f) call PlayMusic ld hl, wd764 res 6, [hl] - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 ld a, $8 ld b, SPRITE_FACING_DOWN @@ -43,12 +43,12 @@ PokemonTower2Script0: ; 6050f (18:450f) .asm_60544 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, b - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a @@ -69,7 +69,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld hl, wd764 set 7, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld de, MovementData_605b2 ld a, [wd764] @@ -78,7 +78,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld de, MovementData_605a9 .asm_60589 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff ld [wc0ee], a diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index 2cf58381..9d08aec4 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -16,7 +16,7 @@ PokemonTower3TextPointers: ; 606e5 (18:46e5) dw PokemonTower3Text1 dw PokemonTower3Text2 dw PokemonTower3Text3 - dw Predef5CText + dw PickUpItemText PokemonTower3TrainerHeaders: ; 606ed (18:46ed) PokemonTower3TrainerHeader0: ; 606ed (18:46ed) diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index 4f375657..c4732397 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -16,9 +16,9 @@ PokemonTower4TextPointers: ; 6080f (18:480f) dw PokemonTower4Text1 dw PokemonTower4Text2 dw PokemonTower4Text3 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText PokemonTower4TrainerHeaders: ; 6081b (18:481b) PokemonTower4TrainerHeader0: ; 6081b (18:481b) diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index 34dd3204..9ef5d419 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -38,7 +38,7 @@ PokemonTower5Script0: ; 6094b (18:494b) call Delay3 call GBFadeInFromWhite ld a, $7 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -57,7 +57,7 @@ PokemonTower5TextPointers: ; 6099b (18:499b) dw PokemonTower5Text3 dw PokemonTower5Text4 dw PokemonTower5Text5 - dw Predef5CText + dw PickUpItemText dw PokemonTower5Text7 PokemonTower5TrainerHeaders: ; 609a9 (18:49a9) diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index e0e75cb1..e9412fb0 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -31,7 +31,7 @@ PokemonTower6Script0: ; 60b17 (18:4b17) xor a ld [hJoyHeld], a ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, MAROWAK ld [W_CUROPPONENT], a @@ -63,7 +63,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld hl, wd768 set 7, [hl] ld a, $7 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -100,8 +100,8 @@ PokemonTower6TextPointers: ; 60bb1 (18:4bb1) dw PokemonTower6Text1 dw PokemonTower6Text2 dw PokemonTower6Text3 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw PokemonTower6Text6 dw PokemonTower6Text7 diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 0f9741ab..60635f20 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -31,7 +31,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23) ld a, $f0 ld [wJoyIgnore], a ld a, [wSpriteIndex] - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call PokemonTower7Script_60db6 ld a, $3 @@ -72,7 +72,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld a, SPRITE_FACING_UP ld [wSpriteStateData1 + 9], a ld a, LAVENDER_HOUSE_1 - ld [H_DOWNARROWBLINKCNT1], a + ld [hWarpDestinationMap], a ld a, $1 ld [wDestinationWarpID], a ld a, LAVENDER_TOWN @@ -107,7 +107,7 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6) ld d, [hl] ld e, a ld a, [wSpriteIndex] - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a jp MoveSprite .asm_60dde inc hl diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 25597654..0026d525 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -22,11 +22,11 @@ PowerPlantTextPointers: ; 1e2df (7:62df) dw PowerPlantText7 dw PowerPlantText8 dw PowerPlantText9 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText PowerPlantTrainerHeaders: ; 1e2fb (7:62fb) PowerPlantTrainerHeader0: ; 1e2fb (7:62fb) diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index fe5a47e6..967ab77b 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -43,8 +43,8 @@ RocketHideout1TextPointers: ; 44c14 (11:4c14) dw RocketHideout1Text3 dw RocketHideout1Text4 dw RocketHideout1Text5 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText RocketHideout1TrainerHeaders: ; 44c22 (11:4c22) RocketHideout1TrainerHeader0: ; 44c22 (11:4c22) diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index bb4dd3ec..c2184bdb 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -415,10 +415,10 @@ SpinnerArrowAnimTiles: ; 45087 (11:5087) RocketHideout2TextPointers: ; 450c7 (11:50c7) dw RocketHideout2Text1 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText RocketHideout2TrainerHeaders: ; 450d1 (11:50d1) RocketHideout2TrainerHeader0: ; 450d1 (11:50d1) diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index f2f7ed91..b025acd0 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -146,8 +146,8 @@ RocketHideout3Script3: ; 452e4 (11:452e4) RocketHideout3TextPointers: ; 452fa (11:52fa) dw RocketHideout3Text1 dw RocketHideout3Text2 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText RocketHideout3TrainerHeaders: ; 45302 (11:5302) RocketHideout3TrainerHeader0: ; 45302 (11:5302) diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 613e2476..635c6095 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -56,7 +56,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6) ld hl, wd81b set 7, [hl] ld a, $a - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI @@ -81,11 +81,11 @@ RocketHideout4TextPointers: ; 45501 (11:5501) dw RocketHideout4Text2 dw RocketHideout4Text3 dw RocketHideout4Text4 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw RocketHideout4Text10 RocketHideout4TrainerHeaders: ; 45515 (11:5515) diff --git a/scripts/route12.asm b/scripts/route12.asm index eed676b3..8fe9d8f7 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -28,7 +28,7 @@ Route12Script0: ; 59619 (16:5619) res 6, [hl] jp z, CheckFightingMapTrainers ld a, $d - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX ld [W_CUROPPONENT], a @@ -51,7 +51,7 @@ Route12Script3: ; 5964c (16:564c) cp $2 jr z, .asm_59664 ld a, $e - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_59664 ld hl, wd7d8 @@ -71,8 +71,8 @@ Route12TextPointers: ; 59675 (16:5675) dw Route12Text6 dw Route12Text7 dw Route12Text8 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Route12Text11 dw Route12Text12 dw Route12Text13 diff --git a/scripts/route15.asm b/scripts/route15.asm index 3aa23bbb..fe70d2b4 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -23,7 +23,7 @@ Route15TextPointers: ; 597c7 (16:57c7) dw Route15Text8 dw Route15Text9 dw Route15Text10 - dw Predef5CText + dw PickUpItemText dw Route15Text12 Route15TrainerHeaders: ; 597df (16:57df) diff --git a/scripts/route16.asm b/scripts/route16.asm index b6c49a96..cdf436a5 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -28,7 +28,7 @@ Route16Script0: ; 59959 (16:5959) res 0, [hl] jp z, CheckFightingMapTrainers ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX ld [W_CUROPPONENT], a @@ -52,7 +52,7 @@ Route16Script3: ; 5998f (16:598f) cp $2 jr z, .asm_599a8 ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_599a8 ld hl, wd7e0 diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 8e3d8e5b..801e577e 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -19,14 +19,14 @@ Route16GateScript0: ; 496d7 (12:56d7) call ArePlayerCoordsInArray ret nc ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr z, .asm_4970e - ld a, [wWhichTrade] + ld a, [wCoordIndex] dec a ld [wSimulatedJoypadStatesIndex], a ld b, $0 @@ -59,7 +59,7 @@ Route16GateScript1: ; 4971d (12:571d) Route16GateScript2: ; 49727 (12:5727) ld a, $1 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index 0301327b..060a6bbf 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -19,17 +19,17 @@ Route18GateScript0: ; 4988f (12:588f) call ArePlayerCoordsInArray ret nc ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr z, .asm_498c6 - ld a, [wWhichTrade] + ld a, [wCoordIndex] dec a ld [wSimulatedJoypadStatesIndex], a - ld b, $0 + ld b, 0 ld c, a ld a, D_UP ld hl, wSimulatedJoypadStatesEnd @@ -59,7 +59,7 @@ Route18GateScript1: ; 498d5 (12:58d5) Route18GateScript2: ; 498df (12:58df) ld a, $1 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/route2.asm b/scripts/route2.asm index fdc5eb6c..62ef3050 100755 --- a/scripts/route2.asm +++ b/scripts/route2.asm @@ -2,8 +2,8 @@ Route2Script: ; 554e3 (15:54e3) jp EnableAutoTextBoxDrawing Route2TextPointers: ; 554e6 (15:54e6) - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Route2Text3 dw Route2Text4 diff --git a/scripts/route22.asm b/scripts/route22.asm index 84fb5634..f125030e 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -43,8 +43,8 @@ Route22MoveRivalSprite: ; 50ee6 (14:4ee6) inc de .asm_50ef1 call MoveSprite - ld a, $c - ld [$ff8d], a + ld a, SPRITE_FACING_RIGHT + ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay Route22RivalMovementData: ; 50efb (14:4efb) @@ -61,7 +61,7 @@ Route22Script0: ; 50f00 (14:4f00) ld hl, .Route22RivalBattleCoords call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wcf0d], a xor a ld [hJoyHeld], a @@ -98,7 +98,7 @@ Route22Script0: ; 50f00 (14:4f00) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $1 ld [W_ROUTE22CURSCRIPT], a @@ -113,19 +113,19 @@ Route22Script1: ; 50f62 (14:4f62) jr nz, .asm_50f78 ld a, $4 ld [wd528], a - ld a, $4 + ld a, SPRITE_FACING_UP jr .asm_50f7a .asm_50f78 - ld a, $c + ld a, SPRITE_FACING_RIGHT .asm_50f7a - ld [$ff8d], a + ld [hSpriteFacingDirection], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteFacingDirectionAndDelay xor a ld [wJoyIgnore], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -159,16 +159,16 @@ Route22Script2: ; 50fb5 (14:4fb5) .notDown ld a, SPRITE_FACING_RIGHT .done - ld [$ff8d], a + ld [hSpriteFacingDirection], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteFacingDirectionAndDelay ld a, $f0 ld [wJoyIgnore], a ld hl, wd7eb set 5, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wc0ee], a @@ -194,7 +194,7 @@ Route22Script_5100d: ; 5100d (14:500d) ld de, Route22RivalExitMovementData2 Route22MoveRival1: ; 51010 (14:5010) ld a, $1 - ld [H_SPRITEHEIGHT], a + ld [H_SPRITEINDEX], a jp MoveSprite Route22RivalExitMovementData1: ; 51017 (14:5017) @@ -255,7 +255,7 @@ Route22Script_5104e: ; 5104e (14:504e) call PlaySound callba Music_RivalAlternateTempo ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $4 ld [W_ROUTE22CURSCRIPT], a @@ -266,25 +266,25 @@ Route22Script4: ; 51087 (14:5087) bit 0, a ret nz ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a ld a, [wcf0d] cp $1 jr nz, .asm_510a1 ld a, $4 ld [wd528], a - ld a, $4 + ld a, SPRITE_FACING_UP jr .asm_510a8 .asm_510a1 ld a, $2 ld [wd528], a - ld a, $c + ld a, SPRITE_FACING_RIGHT .asm_510a8 - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay xor a ld [wJoyIgnore], a ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -310,27 +310,27 @@ Route22Script5: ; 510df (14:50df) cp $ff jp z, Route22Script_50ece ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a ld a, [wcf0d] cp $1 jr nz, .asm_510fb ld a, $4 ld [wd528], a - ld a, $4 + ld a, SPRITE_FACING_UP jr .asm_51102 .asm_510fb ld a, $2 ld [wd528], a - ld a, $c + ld a, SPRITE_FACING_RIGHT .asm_51102 - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $f0 ld [wJoyIgnore], a ld hl, wd7eb set 6, [hl] ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wc0ee], a @@ -356,7 +356,7 @@ Route22Script_51142: ; 51142 (14:5142) ld de, MovementData_5114d Route22MoveRival2: ; 51145 (14:5145) ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a jp MoveSprite MovementData_5114c: ; 5114c (14:514c) diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 513a106b..8b24c820 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -24,7 +24,7 @@ Route22GateScript0: ; 1e6a4 (7:66a4) xor a ld [hJoyHeld], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Route22GateScriptCoords: ; 1e6b5 (7:66b5) diff --git a/scripts/route23.asm b/scripts/route23.asm index 5ed038c2..eeaf2a2b 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -49,9 +49,9 @@ Route23Script0: ; 51219 (14:5219) ret nc .asm_51237 ld a, e - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a ld a, c - ld [wWhichTrade], a + ld [wWhichBadge], a ld b, $2 ld hl, wd7ed predef FlagActionPredef @@ -69,21 +69,21 @@ YCoordsData_51255: ; 51255 (14:5255) Route23Script_5125d: ; 5125d (14:525d) ld hl, BadgeTextPointers - ld a, [wWhichTrade] + ld a, [wWhichBadge] ld c, a - ld b, $0 + ld b, 0 add hl, bc add hl, bc ld a, [hli] ld h, [hl] ld l, a ld de, wcd6d -.asm_5126e +.copyTextLoop ld a, [hli] ld [de], a inc de - cp $50 - jr nz, .asm_5126e + cp "@" + jr nz, .copyTextLoop ret BadgeTextPointers: ; 51276 (14:5276) @@ -188,9 +188,9 @@ Route23Text7: ; 5133d (14:533d) jp TextScriptEnd Route23Script_51346: ; 51346 (14:5346) - ld [wWhichTrade], a + ld [wWhichBadge], a call Route23Script_5125d - ld a, [wWhichTrade] + ld a, [wWhichBadge] inc a ld c, a ld b, $2 @@ -208,7 +208,7 @@ Route23Script_51346: ; 51346 (14:5346) .asm_5136e ld hl, VictoryRoadGuardText2 call PrintText - ld a, [wWhichTrade] + ld a, [wWhichBadge] ld c, a ld b, $1 ld hl, wd7ed diff --git a/scripts/route24.asm b/scripts/route24.asm index 7bb9f3cd..f6822a35 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -31,7 +31,7 @@ Route24Script0: ; 513d5 (14:53d5) xor a ld [hJoyHeld], a ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd7f0 bit 1, [hl] @@ -70,7 +70,7 @@ Route24Script3: ; 51422 (14:5422) ld hl, wd7ef set 1, [hl] ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -87,7 +87,7 @@ Route24TextPointers: ; 5144b (14:544b) dw Route24Text5 dw Route24Text6 dw Route24Text7 - dw Predef5CText + dw PickUpItemText Route24TrainerHeaders: ; 5145b (14:545b) Route24TrainerHeader0: ; 5145b (14:545b) @@ -170,7 +170,7 @@ Route24Text1: ; 514a4 (14:54a4) ld hl, Route24Text_5152b ld de, Route24Text_5152b call SaveEndBattleTextPointers - ld a, [$ff8c] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/route25.asm b/scripts/route25.asm index 383652c8..5f544365 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -51,7 +51,7 @@ Route25TextPointers: ; 51628 (14:5628) dw Route25Text7 dw Route25Text8 dw Route25Text9 - dw Predef5CText + dw PickUpItemText dw Route25Text11 Route25TrainerHeaders: ; 5163e (14:563e) diff --git a/scripts/route4.asm b/scripts/route4.asm index c4a1e956..10d3882d 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -15,7 +15,7 @@ Route4ScriptPointers: ; 5566b (15:566b) Route4TextPointers: ; 55671 (15:5671) dw Route4Text1 dw Route4Text2 - dw Predef5CText + dw PickUpItemText dw PokeCenterSignText dw Route4Text5 dw Route4Text6 diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 2c751fa8..1ccf27af 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -31,7 +31,7 @@ Route5GateScript0: ; 1df50 (7:5f50) and a jr nz, .asm_1df82 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route5GateScript_1df43 ld a, $1 @@ -39,7 +39,7 @@ Route5GateScript0: ; 1df50 (7:5f50) ret .asm_1df82 ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd728 set 6, [hl] diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index 82e2414a..d1aed2df 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -25,7 +25,7 @@ Route6GateScript0: ; 1e04e (7:604e) and a jr nz, .asm_1e080 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route6GateScript_1e0a1 ld a, $1 @@ -35,7 +35,7 @@ Route6GateScript0: ; 1e04e (7:604e) ld hl, wd728 set 6, [hl] ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_1e08c: ; 1e08c (7:608c) diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index 4a05acc3..d73dc566 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -37,7 +37,7 @@ Route7GateScript0: ; 1e128 (7:6128) and a jr nz, .asm_1e15a ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route7GateScript_1e111 ld a, $1 @@ -45,7 +45,7 @@ Route7GateScript0: ; 1e128 (7:6128) ret .asm_1e15a ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd728 set 6, [hl] diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index de0a856f..261a7a1e 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -36,7 +36,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) and a jr nz, .asm_1e220 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route8GateScript_1e1d7 ld a, $1 @@ -46,7 +46,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) ld hl, wd728 set 6, [hl] ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_1e22c: ; 1e22c (7:622c) diff --git a/scripts/route9.asm b/scripts/route9.asm index 539e1a3f..d6050970 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -22,7 +22,7 @@ Route9TextPointers: ; 556d5 (15:56d5) dw Route9Text7 dw Route9Text8 dw Route9Text9 - dw Predef5CText + dw PickUpItemText dw Route9Text11 Route9TrainerHeaders: ; 556eb (15:56eb) diff --git a/scripts/safarizonecenter.asm b/scripts/safarizonecenter.asm index 6ff60ec6..40042038 100755 --- a/scripts/safarizonecenter.asm +++ b/scripts/safarizonecenter.asm @@ -2,7 +2,7 @@ SafariZoneCenterScript: ; 45bb2 (11:5bb2) jp EnableAutoTextBoxDrawing SafariZoneCenterTextPointers: ; 45bb5 (11:5bb5) - dw Predef5CText + dw PickUpItemText dw SafariZoneCenterText2 dw SafariZoneCenterText3 diff --git a/scripts/safarizoneeast.asm b/scripts/safarizoneeast.asm index 3e6df139..55ea5aa6 100755 --- a/scripts/safarizoneeast.asm +++ b/scripts/safarizoneeast.asm @@ -2,10 +2,10 @@ SafariZoneEastScript: ; 4586b (11:586b) jp EnableAutoTextBoxDrawing SafariZoneEastTextPointers: ; 4586e (11:586e) - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw SafariZoneEastText5 dw SafariZoneEastText6 dw SafariZoneEastText7 diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 2edbe61b..e89630fc 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -18,7 +18,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) call ArePlayerCoordsInArray ret nc ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a @@ -56,7 +56,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld [wJoyIgnore], a call UpdateSprites ld a, $4 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a @@ -83,7 +83,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld a, $f0 ld [wJoyIgnore], a ld a, $6 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [W_NUMSAFARIBALLS], a @@ -95,7 +95,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) jr .asm_75286 .asm_7527f ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_75286 ret diff --git a/scripts/safarizonenorth.asm b/scripts/safarizonenorth.asm index 74790e76..6ea5f902 100755 --- a/scripts/safarizonenorth.asm +++ b/scripts/safarizonenorth.asm @@ -2,8 +2,8 @@ SafariZoneNorthScript: ; 459ab (11:59ab) jp EnableAutoTextBoxDrawing SafariZoneNorthTextPointers: ; 459ae (11:59ae) - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw SafariZoneNorthText3 dw SafariZoneNorthText4 dw SafariZoneNorthText5 diff --git a/scripts/safarizonewest.asm b/scripts/safarizonewest.asm index 1465af56..db2c6427 100755 --- a/scripts/safarizonewest.asm +++ b/scripts/safarizonewest.asm @@ -2,10 +2,10 @@ SafariZoneWestScript: ; 4a1b5 (12:61b5) jp EnableAutoTextBoxDrawing SafariZoneWestTextPointers: ; 4a1b8 (12:61b8) - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw SafariZoneWestText5 dw SafariZoneWestText6 dw SafariZoneWestText7 diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 7e4f4447..349eda5e 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -44,7 +44,7 @@ SaffronGymScript3: ; 5d05b (17:505b) SaffronGymText_5d068: ; 5d068 (17:5068) ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd7b3 set 1, [hl] @@ -52,14 +52,14 @@ SaffronGymText_5d068: ; 5d068 (17:5068) call GiveItem jr nc, .BagFull ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd7b3 set 0, [hl] jr .asm_5d091 .BagFull ld a, $c - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5d091 ld hl, W_OBTAINEDBADGES diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index 46630014..47700664 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -44,9 +44,9 @@ SilphCo10TextPointers: ; 5a186 (16:6186) dw SilphCo10Text1 dw SilphCo10Text2 dw SilphCo10Text3 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText SilphCo10TrainerHeaders: ; 5a192 (16:6192) SilphCo10TrainerHeader0: ; 5a192 (16:6192) diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 473c9d11..b4f94b13 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -170,17 +170,17 @@ SilphCo11Script0: ; 621db (18:61db) ld hl, CoordsData_62211 call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wcf0d], a xor a ld [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a ld a, $3 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_62216 call MoveSprite @@ -201,9 +201,9 @@ MovementData_62216: ; 62216 (18:6216) SilphCo11Script_6221a: ; 6221a (18:621a) ld [wd528], a ld a, $3 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a ld a, b - ld [$ff8d], a + ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay SilphCo11Script5: ; 62227 (18:6227) @@ -214,17 +214,17 @@ SilphCo11Script5: ; 62227 (18:6227) cp $1 jr z, .asm_6223c ld a, $2 - ld b, $c + ld b, SPRITE_FACING_RIGHT jr .asm_62240 .asm_6223c ld a, $8 - ld b, $0 + ld b, SPRITE_FACING_DOWN .asm_62240 call SilphCo11Script_6221a ld a, $f0 ld [wJoyIgnore], a ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack call SilphCo11Script_6216d @@ -242,17 +242,17 @@ SilphCo11Script3: ; 6226a (18:626a) bit 0, a ret nz ld a, $3 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, [wcf0d] cp $1 jr z, .asm_62284 ld a, $2 - ld b, $c + ld b, SPRITE_FACING_RIGHT jr .asm_62288 .asm_62284 ld a, $8 - ld b, $0 + ld b, SPRITE_FACING_DOWN .asm_62288 call SilphCo11Script_6221a call Delay3 @@ -266,7 +266,7 @@ SilphCo11Script4: ; 62293 (18:6293) ld hl, SilphCo10Text_62330 ld de, SilphCo10Text_62330 call SaveEndBattleTextPointers - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [H_SPRITEINDEX] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index bc36ed39..4bd1edd1 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -58,7 +58,7 @@ SilphCo3TextPointers: ; 59fc4 (16:5fc4) dw SilphCo3Text1 dw SilphCo3Text2 dw SilphCo3Text3 - dw Predef5CText + dw PickUpItemText SilphCo3TrainerHeaders: ; 59fcc (16:5fcc) SilphCo3TrainerHeader0: ; 59fcc (16:5fcc) diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 866afd54..a3953e27 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -95,9 +95,9 @@ SilphCo4TextPointers: ; 19da0 (6:5da0) dw SilphCo4Text2 dw SilphCo4Text3 dw SilphCo4Text4 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText SilphCo4TrainerHeaders: ; 19dae (6:5dae) SilphCo4TrainerHeader0: ; 19dae (6:5dae) diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 750072ab..1ed6006f 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -74,9 +74,9 @@ SilphCo5TextPointers: ; 19fbc (6:5fbc) dw SilphCo5Text3 dw SilphCo5Text4 dw SilphCo5Text5 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw SilphCo5Text9 dw SilphCo5Text10 dw SilphCo5Text11 diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index 0ff5ee50..fe1e6224 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -50,8 +50,8 @@ SilphCo6TextPointers: ; 1a1f6 (6:61f6) dw SilphCo6Text6 dw SilphCo6Text7 dw SilphCo6Text8 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText SilphCo6TrainerHeaders: ; 1a20a (6:620a) SilphCo6TrainerHeader0: ; 1a20a (6:620a) diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 483429c0..8538d37f 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -136,10 +136,10 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_51c7d ld a, [wWhichTrade] @@ -149,7 +149,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) inc de .asm_51c6c ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 jp SilphCo7Text_51c10 @@ -173,7 +173,7 @@ SilphCo7Script3: ; 51c82 (14:5c82) xor a ld [wJoyIgnore], a ld a, $d - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d @@ -212,12 +212,12 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld a, $4 ld [wd528], a ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a - ld a, $4 - ld [$ff8d], a + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $f - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wc0ee], a @@ -230,7 +230,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld de, MovementData_51d1a .asm_51d0e ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 jp SilphCo7Text_51c10 @@ -272,9 +272,9 @@ SilphCo7TextPointers: ; 51d3f (14:5d3f) dw SilphCo7Text7 dw SilphCo7Text8 dw SilphCo7Text9 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw SilphCo7Text13 dw SilphCo7Text14 dw SilphCo7Text15 diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index 4dee3bb7..031315c3 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -21,9 +21,9 @@ SSAnne10TextPointers: ; 61d6e (18:5d6e) dw SSAnne10Text6 dw SSAnne10Text7 dw SSAnne10Text8 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText SSAnne10TrainerHeaders: ; 61d84 (18:5d84) SSAnne10TrainerHeader0: ; 61d84 (18:5d84) diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 16d560b5..d4651a22 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -30,14 +30,14 @@ SSAnne2Script0: ; 613be (18:53be) ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [$ffdb], a ld a, HS_SS_ANNE_2_RIVAL ld [wcc4d], a predef ShowObject call Delay3 ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF xor a ld [hJoyHeld], a @@ -79,11 +79,11 @@ SSAnne2Script_61416: ; 61416 (18:5416) ld a, SPRITE_FACING_RIGHT jr .asm_61427 .asm_61426 - xor a + xor a ; SPRITE_FACING_DOWN .asm_61427 - ld [$ff8d], a + ld [hSpriteFacingDirection], a ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a jp SetSpriteFacingDirectionAndDelay SSAnne2Script1: ; 61430 (18:5430) @@ -94,7 +94,7 @@ SSAnne2Script1: ; 61430 (18:5430) xor a ld [wJoyIgnore], a ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, SONY2 + $c8 @@ -129,10 +129,10 @@ SSAnne2Script2: ; 6146d (18:546d) ld a, $f0 ld [wJoyIgnore], a ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, [W_XCOORD] cp $25 @@ -143,7 +143,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld de, MovementData_614b7 .asm_6149a ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff ld [wc0ee], a diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index 27c76a2f..7885135b 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -22,7 +22,7 @@ SSAnne8TextPointers: ; 6198f (18:598f) dw SSAnne8Text7 dw SSAnne8Text8 dw SSAnne8Text9 - dw Predef5CText + dw PickUpItemText dw SSAnne8Text11 SSAnne8TrainerHeaders: ; 619a5 (18:59a5) diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index 6e8b86c6..0cee1e08 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -21,10 +21,10 @@ SSAnne9TextPointers: ; 61b6a (18:5b6a) dw SSAnne9Text3 dw SSAnne9Text4 dw SSAnne9Text5 - dw Predef5CText + dw PickUpItemText dw SSAnne9Text7 dw SSAnne9Text8 - dw Predef5CText + dw PickUpItemText dw SSAnne9Text10 dw SSAnne9Text11 dw SSAnne9Text12 diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm index 0a5cc100..22a61095 100755 --- a/scripts/tradecenter.asm +++ b/scripts/tradecenter.asm @@ -2,13 +2,13 @@ TradeCenterScript: ; 4fd10 (13:7d10) call EnableAutoTextBoxDrawing ld a, [$ffaa] cp $2 - ld a, $8 - jr z, .asm_4fd1d - ld a, $c -.asm_4fd1d - ld [$ff8d], a + ld a, SPRITE_FACING_LEFT + jr z, .next + ld a, SPRITE_FACING_RIGHT +.next + ld [hSpriteFacingDirection], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteFacingDirection ld hl, wd72d bit 0, [hl] diff --git a/scripts/unknowndungeon1.asm b/scripts/unknowndungeon1.asm index 008a7bd7..696ddafa 100755 --- a/scripts/unknowndungeon1.asm +++ b/scripts/unknowndungeon1.asm @@ -2,6 +2,6 @@ UnknownDungeon1Script: ; 74d0c (1d:4d0c) jp EnableAutoTextBoxDrawing UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f) - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText diff --git a/scripts/unknowndungeon2.asm b/scripts/unknowndungeon2.asm index c8249b27..f3cbb6a5 100755 --- a/scripts/unknowndungeon2.asm +++ b/scripts/unknowndungeon2.asm @@ -2,6 +2,6 @@ UnknownDungeon2Script: ; 45e0b (11:5e0b) jp EnableAutoTextBoxDrawing UnknownDungeon2TextPointers: ; 45e0e (11:5e0e) - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index 055c9d0f..1c87aa39 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -14,8 +14,8 @@ UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03) UnknownDungeon3TextPointers: ; 45f09 (11:5f09) dw UnknownDungeon3Text1 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f) UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f) diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 83fe2a8c..6b9f94f7 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -49,7 +49,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) ld [hJoyHeld], a ld [wcf0d], a ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, [wd803] bit 2, a diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 3515c29c..193b3a06 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -64,7 +64,7 @@ VermilionGymScript3: ; 5ca9d (17:4a9d) VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd773 set 7, [hl] @@ -72,14 +72,14 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) call GiveItem jr nc, .BagFull ld a, $7 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd773 set 6, [hl] jr .asm_5cad3 .BagFull ld a, $8 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5cad3 ld hl, W_OBTAINEDBADGES diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 68a3502f..4f1df52f 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -43,8 +43,8 @@ CoordsData_5da5c: ; 5da5c (17:5a5c) VictoryRoad1TextPointers: ; 5da5f (17:5a5f) dw VictoryRoad1Text1 dw VictoryRoad1Text2 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 1fc2af7e..51346032 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -77,10 +77,10 @@ VictoryRoad2TextPointers: ; 5181b (14:581b) dw VictoryRoad2Text4 dw VictoryRoad2Text5 dw VictoryRoad2Text6 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 20b3df85..9aeb1d18 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -83,8 +83,8 @@ VictoryRoad3TextPointers: ; 44a24 (11:4a24) dw VictoryRoad3Text2 dw VictoryRoad3Text3 dw VictoryRoad3Text4 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 05f5f495..c358e961 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -32,7 +32,7 @@ ViridianCityScript_1900b: ; 1900b (6:500b) cp $20 ret nz ld a, $e - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a @@ -52,7 +52,7 @@ ViridianCityScript_1903d: ; 1903d (6:503d) cp $13 ret nz ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a @@ -98,7 +98,7 @@ ViridianCityScript2: ; 1908f (6:508f) xor a ld [wJoyIgnore], a ld a, $f - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [W_BATTLETYPE], a diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 124d3184..554c2125 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -17,9 +17,9 @@ ViridianForestTextPointers: ; 61126 (18:5126) dw ViridianForestText2 dw ViridianForestText3 dw ViridianForestText4 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw ViridianForestText8 dw ViridianForestText9 dw ViridianForestText10 diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 9e5e0e5f..9a0ce855 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -140,7 +140,7 @@ ViridianGymScript3: ; 74988 (1d:4988) ld [wJoyIgnore], a ViridianGymScript3_74995: ; 74995 (1d:4995) ld a, $c - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd751 set 1, [hl] @@ -148,14 +148,14 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) call GiveItem jr nc, .BagFull ld a, $d - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd751 set 0, [hl] jr .asm_749be .BagFull ld a, $e - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_749be ld hl, W_OBTAINEDBADGES @@ -190,7 +190,7 @@ ViridianGymTextPointers: ; 749ec (1d:49ec) dw ViridianGymText8 dw ViridianGymText9 dw ViridianGymText10 - dw Predef5CText + dw PickUpItemText dw ViridianGymText12 dw ViridianGymText13 dw ViridianGymText14 diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 9725e275..b6621684 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -28,7 +28,7 @@ ViridianMartScriptPointers: ; 1d495 (7:5495) ViridianMartScript0: ; 1d49b (7:549b) call UpdateSprites ld a, $4 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wSimulatedJoypadStatesEnd ld de, RLEMovement1d4bb @@ -51,7 +51,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) ret nz call Delay3 ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld bc, (OAKS_PARCEL << 8) + 1 call GiveItem diff --git a/text.asm b/text.asm index ecc3beea..db3e57c5 100644 --- a/text.asm +++ b/text.asm @@ -2087,7 +2087,7 @@ _ColosseumVersionText:: ENDC _Char00Text:: ; 8a696 (22:6696) - TX_NUM $FF8C,1,2 + TX_NUM hSpriteIndexOrTextID,1,2 text " ERROR." done diff --git a/wram.asm b/wram.asm index 6eef4ea8..8633e732 100755 --- a/wram.asm +++ b/wram.asm @@ -634,6 +634,11 @@ wOverrideSimulatedJoypadStatesMask:: ; cd3b ds 1 +wWhichBadge:: ; cd3d + +wMuseumPriceTemp:: ; cd3d +; 3-byte BCD number + wTitleMonSpecies:: ; cd3d wPlayerCharacterOAMTile:: ; cd3d @@ -1891,58 +1896,98 @@ W_MAPCONNECTIONS:: ; d370 W_MAPCONN1PTR:: ; d371 ds 1 -wd372:: ds 1 ; some connection stuff, too bothered to label it -wd373:: ds 1 -wd374:: ds 1 -wd375:: ds 1 -wd376:: ds 1 -wd377:: ds 1 -wd378:: ds 1 -wd379:: ds 1 -wd37a:: ds 1 -wd37b:: ds 1 +wNorthConnectionStripSrc:: ; d372 + ds 2 + +wNorthConnectionStripDest:: ; d374 + ds 2 + +wNorthConnectionStripWidth:: ; d376 + ds 1 + +wNorthConnectedMapWidth:: ; d377 + ds 1 + +wNorthConnectedMapYAlignment:: ; d378 + ds 1 + +wNorthConnectedMapXAlignment:: ; d379 + ds 1 + +wNorthConnectedMapViewPointer:: ; d37a + ds 2 W_MAPCONN2PTR:: ; d37c ds 1 -wd37d:: ds 1 -wd37e:: ds 1 -wd37f:: ds 1 -wd380:: ds 1 -wd381:: ds 1 -wd382:: ds 1 -wd383:: ds 1 -wd384:: ds 1 -wd385:: ds 1 -wd386:: ds 1 +wSouthConnectionStripSrc:: ; d37d + ds 2 + +wSouthConnectionStripDest:: ; d37f: + ds 2 + +wSouthConnectionStripWidth:: ; d381 + ds 1 + +wSouthConnectedMapWidth:: ; d382 + ds 1 + +wSouthConnectedMapYAlignment:: ; d383 + ds 1 + +wSouthConnectedMapXAlignment:: ; d384 + ds 1 + +wSouthConnectedMapViewPointer:: ; d385 + ds 2 W_MAPCONN3PTR:: ; d387 ds 1 -wd388:: ds 1 -wd389:: ds 1 -wd38a:: ds 1 -wd38b:: ds 1 -wd38c:: ds 1 -wd38d:: ds 1 -wd38e:: ds 1 -wd38f:: ds 1 -wd390:: ds 1 -wd391:: ds 1 +wWestConnectionStripSrc:: ; d388 + ds 2 + +wWestConnectionStripDest:: ; d38a + ds 2 + +wWestConnectionStripHeight:: ; d38c + ds 1 + +wWestConnectedMapWidth:: ; d38d + ds 1 + +wWestConnectedMapYAlignment:: ; d38e + ds 1 + +wWestConnectedMapXAlignment:: ; d38f + ds 1 + +wWestConnectedMapViewPointer:: ; d390 + ds 2 W_MAPCONN4PTR:: ; d392 ds 1 -wd393:: ds 1 -wd394:: ds 1 -wd395:: ds 1 -wd396:: ds 1 -wd397:: ds 1 -wd398:: ds 1 -wd399:: ds 1 -wd39a:: ds 1 -wd39b:: ds 1 -wd39c:: ds 1 +wEastConnectionStripSrc:: ; d393 + ds 2 + +wEastConnectionStripDest:: ; d395 + ds 2 + +wEastConnectionStripHeight:: ; d397 + ds 1 + +wEastConnectedMapWidth:: ; d398 + ds 1 + +wEastConnectedMapYAlignment:: ; d399 + ds 1 + +wEastConnectedMapXAlignment:: ; d39a + ds 1 + +wEastConnectedMapViewPointer:: ; d39b + ds 2 W_SPRITESET:: ; d39d ; sprite set for the current map (11 sprite picture ID's) -- cgit v1.3.1-sl0p From 148d3f3cf28f9c270e3d5043af0692d95bc731c5 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 15:52:03 -0500 Subject: Consolidate coord macros --- engine/HoF_room_pc.asm | 14 +-- engine/battle/animations.asm | 46 +++++----- engine/battle/battle_transitions.asm | 44 ++++----- engine/battle/core.asm | 126 +++++++++++++------------- engine/battle/draw_hud_pokeball_gfx.asm | 4 +- engine/battle/end_of_battle.asm | 2 +- engine/battle/ghost_marowak_anim.asm | 2 +- engine/battle/link_battle_versus_text.asm | 8 +- engine/battle/moveEffects/drain_hp_effect.asm | 4 +- engine/battle/moveEffects/heal_effect.asm | 4 +- engine/battle/moveEffects/recoil_effect.asm | 4 +- engine/battle/scroll_draw_trainer_pic.asm | 2 +- engine/battle/trainer_ai.asm | 2 +- engine/battle/wild_encounters.asm | 2 +- engine/cable_club.asm | 48 +++++----- engine/clear_save.asm | 2 +- engine/evolution.asm | 4 +- engine/evos_moves.asm | 2 +- engine/hall_of_fame.asm | 32 +++---- engine/hidden_object_functions17.asm | 12 +-- engine/hidden_object_functions7.asm | 4 +- engine/intro.asm | 8 +- engine/items/items.asm | 6 +- engine/learn_move.asm | 8 +- engine/menu/bills_pc.asm | 38 ++++---- engine/menu/diploma.asm | 4 +- engine/menu/league_pc.asm | 8 +- engine/menu/main_menu.asm | 58 ++++++------ engine/menu/naming_screen.asm | 22 ++--- engine/menu/party_menu.asm | 2 +- engine/menu/players_pc.asm | 4 +- engine/menu/pokedex.asm | 58 ++++++------ engine/menu/prize_menu.asm | 30 +++--- engine/menu/start_sub_menus.asm | 26 +++--- engine/menu/status_screen.asm | 62 ++++++------- engine/menu/vending_machine.asm | 6 +- engine/oak_speech.asm | 8 +- engine/oak_speech2.asm | 12 +-- engine/overworld/cinnabar_lab.asm | 4 +- engine/overworld/movement.asm | 2 +- engine/overworld/pokemart.asm | 4 +- engine/save.asm | 18 ++-- engine/slot_machine.asm | 26 +++--- engine/titlescreen.asm | 12 +-- engine/town_map.asm | 32 +++---- engine/trade.asm | 32 +++---- engine/trade2.asm | 20 ++-- home.asm | 44 ++++----- home/copy2.asm | 8 +- home/overworld.asm | 12 +-- home/text.asm | 22 ++--- home/vcopy.asm | 6 +- macros.asm | 21 +---- main.asm | 48 +++++----- scripts/bikeshop.asm | 6 +- scripts/celadongamecorner.asm | 16 ++-- scripts/celadonmartroof.asm | 4 +- scripts/vermiliondock.asm | 2 +- 58 files changed, 528 insertions(+), 539 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 77a07ea3..dc05814a 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -14,9 +14,9 @@ HallOfFamePC: ; 7405c (1d:405c) ld bc, $10 ld a, $ff call FillMemory - hlCoord 0, 0 + coord hl, 0, 0 call FillFourRowsWithBlack - hlCoord 0, 14 + coord hl, 0, 14 call FillFourRowsWithBlack ld a, $c0 ld [rBGP], a @@ -61,7 +61,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) ld a,[hl] ld [wcf91],a ld [wd0b5],a - hlCoord 8, 6 + coord hl, 8, 6 call GetMonHeader call LoadFrontSpriteByMonIndex ld hl,vBGMap0 + $c @@ -162,7 +162,7 @@ FillFourRowsWithBlack: ; 7417b (1d:417b) jp FillMemory FillMiddleOfScreenWithWhite: ; 74183 (1d:4183) - hlCoord 0, 4 + coord hl, 0, 4 ld bc, SCREEN_WIDTH * 10 ld a, $7f ; blank white tile jp FillMemory @@ -172,7 +172,7 @@ Credits: ; 7418e (1d:418e) push de .nextCreditsScreen pop de - hlCoord 9, 6 + coord hl, 9, 6 push hl call FillMiddleOfScreenWithWhite pop hl @@ -248,10 +248,10 @@ Credits: ; 7418e (1d:418e) ld hl, vChars2 + $600 ld bc, (BANK(TheEndGfx) << 8) + $0a call CopyVideoData - hlCoord 4, 8 + coord hl, 4, 8 ld de, TheEndTextString call PlaceString - hlCoord 4, 9 + coord hl, 4, 9 inc de call PlaceString jp FadeInCreditsText diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 7764603d..6803c38b 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -759,7 +759,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) cp a,1 ret nz .moveGhostMarowakLeft - hlCoord 17, 0 + coord hl, 17, 0 ld de,20 ld bc,$0707 ; 7 rows and 7 columns .loop @@ -858,7 +858,7 @@ DoExplodeSpecialEffects: ; 79009 (1e:5009) cp a,1 ; is it the end of the subanimation? jr nz,FlashScreenEveryFourFrameBlocks ; if it's the end of the subanimation, make the attacking pokemon disappear - hlCoord 1, 5 + coord hl, 1, 5 jp AnimationHideMonPic ; make pokemon disappear ; flashes the screen when subanimation counter is 1 modulo 4 @@ -1292,12 +1292,12 @@ AnimationSlideMonUp: ; 7927a (1e:527a) ld c, $7 ld a, [H_WHOSETURN] and a - hlCoord 1, 6 - deCoord 1, 5 + coord hl, 1, 6 + coord de, 1, 5 ld a, $30 jr z, .asm_79291 - hlCoord 12, 1 - deCoord 12, 0 + coord hl, 12, 1 + coord de, 12, 0 ld a, $ff .asm_79291 ld [wd09f], a @@ -1352,9 +1352,9 @@ _AnimationSlideMonUp: ; 792bf (1e:52bf) jr nz, .asm_792c4 ld a, [H_WHOSETURN] and a - hlCoord 1, 11 + coord hl, 1, 11 jr z, .asm_792e2 - hlCoord 12, 6 + coord hl, 12, 6 .asm_792e2 ld a, [wd09f] inc a @@ -1513,11 +1513,11 @@ AnimationShakeBackAndForth: ; 793b1 (1e:53b1) ; The mon's sprite disappears after this animation. ld a, [H_WHOSETURN] and a - hlCoord 0, 5 - deCoord 2, 5 + coord hl, 0, 5 + coord de, 2, 5 jr z, .asm_793c2 - hlCoord 11, 0 - deCoord 13, 0 + coord hl, 11, 0 + coord de, 13, 0 .asm_793c2 xor a @@ -1561,9 +1561,9 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9) call AnimationHideMonPic ld a, [H_WHOSETURN] and a - hlCoord 2, 5 + coord hl, 2, 5 jr z, .asm_79407 - hlCoord 11, 0 + coord hl, 11, 0 .asm_79407 xor a push hl @@ -1674,12 +1674,12 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1) ld a, [H_WHOSETURN] and a jr z, .asm_794b1 - hlCoord 16, 0 - deCoord 14, 0 + coord hl, 16, 0 + coord de, 14, 0 jr .asm_794b7 .asm_794b1 - hlCoord 5, 5 - deCoord 3, 5 + coord hl, 5, 5 + coord de, 3, 5 .asm_794b7 push de xor a @@ -1883,10 +1883,10 @@ AnimationSlideMonLeft: ; 795f8 (1e:55f8) ld a, [H_WHOSETURN] and a jr z, .asm_79602 - hlCoord 12, 0 + coord hl, 12, 0 jr .asm_79605 .asm_79602 - hlCoord 0, 5 + coord hl, 0, 5 .asm_79605 ld d, $8 .asm_79607 @@ -2121,7 +2121,7 @@ Func_79793: ; 79793 (1e:5793) xor a ld [W_SPRITEFLIPPED], a call GetMonHeader - hlCoord 12, 0 + coord hl, 12, 0 call LoadFrontSpriteByMonIndex jr .asm_797d3 .asm_797b0 @@ -2185,7 +2185,7 @@ Func_7980c: ; 7980c (1e:580c) push bc ld e, a ld d, $0 - hlCoord 0, 0 + coord hl, 0, 0 add hl, de ld bc, $707 call ClearScreenArea @@ -2207,7 +2207,7 @@ GetMonSpriteTileMapPointerFromRowCount: ; 79820 (1e:5820) .enemyTurn ld a, 12 .next - hlCoord 0, 0 + coord hl, 0, 0 ld e, a ld d, 0 add hl, de diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 997f23ef..4f605b52 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -202,7 +202,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72) call BattleTransition_InwardSpiral jr .done .outwardSpiral - hlCoord 10, 10 + coord hl, 10, 10 ld a, $3 ld [wd09f], a ld a, l @@ -231,7 +231,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72) BattleTransition_InwardSpiral: ; 70aaa (1c:4aaa) ld a, $7 ld [wWhichTrade], a - hlCoord 0, 0 + coord hl, 0, 0 ld c, $11 ld de, SCREEN_WIDTH call BattleTransition_InwardSpiral_ @@ -371,20 +371,20 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f) push bc xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 0, 7 - deCoord 0, 8 + coord hl, 0, 7 + coord de, 0, 8 ld bc, -SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - hlCoord 0, 10 - deCoord 0, 9 + coord hl, 0, 10 + coord de, 0, 9 ld bc, SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - hlCoord 8, 0 - deCoord 9, 0 + coord hl, 8, 0 + coord de, 9, 0 ld bc, -2 call BattleTransition_CopyTiles2 - hlCoord 11, 0 - deCoord 10, 0 + coord hl, 11, 0 + coord de, 10, 0 ld bc, $2 call BattleTransition_CopyTiles2 ld a, $1 @@ -405,20 +405,20 @@ BattleTransition_Split: ; 70bca (1c:4bca) ld [H_AUTOBGTRANSFERENABLED], a .loop push bc - hlCoord 0, 16 - deCoord 0, 17 + coord hl, 0, 16 + coord de, 0, 17 ld bc, -SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - hlCoord 0, 1 - deCoord 0, 0 + coord hl, 0, 1 + coord de, 0, 0 ld bc, SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - hlCoord 18, 0 - deCoord 19, 0 + coord hl, 18, 0 + coord de, 19, 0 ld bc, -2 call BattleTransition_CopyTiles2 - hlCoord 1, 0 - deCoord 0, 0 + coord hl, 1, 0 + coord de, 0, 0 ld bc, $2 call BattleTransition_CopyTiles2 call BattleTransition_TransferDelay3 @@ -514,8 +514,8 @@ BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f) ; used for high level wild dungeon battles BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e) ld c, SCREEN_HEIGHT - hlCoord 0, 0 - deCoord 1, 17 + coord hl, 0, 0 + coord de, 1, 17 xor a ld [H_AUTOBGTRANSFERENABLED], a .loop @@ -553,8 +553,8 @@ BattleTransition_VerticalStripes_: ; 70caa (1c:4caa) ; used for low level wild dungeon battles BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4) ld c, SCREEN_WIDTH - hlCoord 0, 0 - deCoord 19, 1 + coord hl, 0, 0 + coord de, 19, 1 xor a ld [H_AUTOBGTRANSFERENABLED], a .loop diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 2f407290..5deeb4dc 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -101,7 +101,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld a, MESSAGE_BOX ; the usual text box at the bottom of the screen ld [wTextBoxID], a call DisplayTextBoxID - hlCoord 1, 5 + coord hl, 1, 5 ld bc, $307 call ClearScreenArea call DisableLCD @@ -117,7 +117,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) or c jr nz, .clearBackgroundLoop ; copy the work RAM tile map to VRAM - hlCoord 0, 0 + coord hl, 0, 0 ld de, vBGMap0 ld b, 18 ; number of rows .copyRowLoop @@ -176,7 +176,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld [H_AUTOBGTRANSFERENABLED], a ld a, $31 ld [$ffe1], a - hlCoord 1, 5 + coord hl, 1, 5 predef CopyUncompressedPicToTilemap xor a ld [hWY], a @@ -324,7 +324,7 @@ StartBattle: ; 3c11e (f:411e) ld [wcf91], a ld [wBattleMonSpecies2], a call LoadScreenTilesFromBuffer1 - hlCoord 1, 5 + coord hl, 1, 5 ld a, $9 call SlideTrainerPicOffScreen call SaveScreenTilesToBuffer1 @@ -760,12 +760,12 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3) ret UpdateCurMonHPBar: ; 3c4f6 (f:44f6) - hlCoord 10, 9 ; tile pointer to player HP bar + coord hl, 10, 9 ; tile pointer to player HP bar ld a, [H_WHOSETURN] and a ld a, $1 jr z, .playersTurn - hlCoord 2, 2 ; tile pointer to enemy HP bar + coord hl, 2, 2 ; tile pointer to enemy HP bar xor a .playersTurn push bc @@ -852,10 +852,10 @@ FaintEnemyPokemon: ; 0x3c567 ld hl, wPlayerUsedMove ld [hli], a ld [hl], a - hlCoord 12, 5 - deCoord 12, 6 + coord hl, 12, 5 + coord de, 12, 6 call SlideDownFaintedMonPic - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $40b call ClearScreenArea ld a, [W_ISINBATTLE] @@ -1105,11 +1105,11 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741) ld [hl], a ld [wBattleMonStatus], a call ReadPlayerMonCurHPAndStatus - hlCoord 9, 7 + coord hl, 9, 7 ld bc, $50b call ClearScreenArea - hlCoord 1, 10 - deCoord 1, 11 + coord hl, 1, 10 + coord de, 1, 11 call SlideDownFaintedMonPic ld a, $1 ld [wBattleResult], a @@ -1137,7 +1137,7 @@ DoUseNextMonDialogue: ; 3c79b (f:479b) ld hl, UseNextMonText call PrintText .displayYesNoBox - hlCoord 13, 9 + coord hl, 13, 9 ld bc, $a0e ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -1214,7 +1214,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) ld a, [W_CUROPPONENT] cp $c8 + SONY1 jr nz, .notSony1Battle - hlCoord 0, 0 ; sony 1 battle + coord hl, 0, 0 ; sony 1 battle ld bc, $815 call ClearScreenArea call ScrollTrainerPicAfterBattle @@ -1384,7 +1384,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) ld [wAICount],a ld hl,W_PLAYERBATTSTATUS1 res 5,[hl] - hlCoord 18, 0 + coord hl, 18, 0 ld a,8 call SlideTrainerPicOffScreen call PrintEmptyString @@ -1454,7 +1454,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) jr nz,.next4 ld hl, TrainerAboutToUseText call PrintText - hlCoord 0, 7 + coord hl, 0, 7 ld bc,$0801 ld a,TWO_OPTION_MENU ld [wTextBoxID],a @@ -1489,7 +1489,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) call LoadScreenTilesFromBuffer1 .next4 call ClearSprites - hlCoord 0, 0 + coord hl, 0, 0 ld bc,$040B call ClearScreenArea ld b,1 @@ -1505,7 +1505,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) call LoadMonFrontSprite ld a,$CF ld [$FFE1],a - hlCoord 15, 6 + coord hl, 15, 6 predef AnimateSendingOutMon ld a,[wEnemyMonSpecies2] call PlayCry @@ -1835,7 +1835,7 @@ SendOutMon: ; 3cc91 (f:4c91) ld [H_WHOSETURN], a ld a, POOF_ANIM call PlayMoveAnimation - hlCoord 4, 11 + coord hl, 4, 11 predef AnimateSendingOutMon ld a, [wcf91] call PlayCry @@ -1844,10 +1844,10 @@ SendOutMon: ; 3cc91 (f:4c91) ; show 2 stages of the player mon getting smaller before disappearing AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) - hlCoord 1, 5 + coord hl, 1, 5 ld bc, $707 call ClearScreenArea - hlCoord 3, 7 + coord hl, 3, 7 ld bc, $505 xor a ld [wDownscaledMonSize], a @@ -1856,7 +1856,7 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) ld c, 4 call DelayFrames call .clearScreenArea - hlCoord 4, 9 + coord hl, 4, 9 ld bc, $303 ld a, $1 ld [wDownscaledMonSize], a @@ -1868,7 +1868,7 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) ld a, $4c Coorda 5, 11 .clearScreenArea - hlCoord 1, 5 + coord hl, 1, 5 ld bc, $707 jp ClearScreenArea @@ -1891,14 +1891,14 @@ DrawHUDsAndHPBars: ; 3cd5a (f:4d5a) DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 9, 7 + coord hl, 9, 7 ld bc, $50b call ClearScreenArea callab PlacePlayerHUDTiles - hlCoord 18, 9 + coord hl, 18, 9 ld [hl], $73 ld de, wBattleMonNick - hlCoord 10, 7 + coord hl, 10, 7 call CenterMonName call PlaceString ld hl, wBattleMonSpecies @@ -1909,7 +1909,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) ld de, wLoadedMonLevel ld bc, $b call CopyData - hlCoord 14, 8 + coord hl, 14, 8 push hl inc hl ld de, wLoadedMonStatus @@ -1920,7 +1920,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) .asm_3cdae ld a, [wLoadedMonSpecies] ld [wcf91], a - hlCoord 10, 9 + coord hl, 10, 9 predef DrawHP ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -1952,15 +1952,15 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $40c call ClearScreenArea callab PlaceEnemyHUDTiles ld de, wEnemyMonNick - hlCoord 1, 0 + coord hl, 1, 0 call CenterMonName call PlaceString - hlCoord 4, 1 + coord hl, 4, 1 push hl inc hl ld de, wEnemyMonStatus @@ -2033,7 +2033,7 @@ DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) .drawHPBar xor a ld [wHPBarType], a - hlCoord 2, 2 + coord hl, 2, 2 call DrawHPBar ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -2108,12 +2108,12 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) ld bc, $b call CopyData ; the following simulates the keystrokes by drawing menus on screen - hlCoord 9, 14 + coord hl, 9, 14 ld [hl], "▶" ld c, 80 call DelayFrames ld [hl], $7f - hlCoord 9, 16 + coord hl, 9, 16 ld [hl], "▶" ld c, 50 call DelayFrames @@ -2145,7 +2145,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) .safariLeftColumn Coorda 13, 14 Coorda 13, 16 - hlCoord 7, 14 + coord hl, 7, 14 ld de, W_NUMSAFARIBALLS ld bc, $102 call PrintNumber @@ -2178,7 +2178,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) .safariRightColumn Coorda 1, 14 ; clear upper cursor position in left column Coorda 1, 16 ; clear lower cursor position in left column - hlCoord 7, 14 + coord hl, 7, 14 ld de, W_NUMSAFARIBALLS ld bc, $102 call PrintNumber @@ -2399,7 +2399,7 @@ PartyMenuOrRockOrRun: call GBPalNormal jp DisplayBattleMenu .partyMonDeselected - hlCoord 11, 11 + coord hl, 11, 11 ld bc, $81 ld a, $7f call FillMemory @@ -2561,17 +2561,17 @@ MoveSelectionMenu: ; 3d219 (f:5219) ret z ld hl, wBattleMonMoves call .loadmoves - hlCoord 4, 12 + coord hl, 4, 12 ld b, $4 ld c, $e di call TextBoxBorder - hlCoord 4, 12 + coord hl, 4, 12 ld [hl], $7a - hlCoord 10, 12 + coord hl, 10, 12 ld [hl], $7e ei - hlCoord 6, 13 + coord hl, 6, 13 call .writemoves ld b, $5 ld a, $c @@ -2579,11 +2579,11 @@ MoveSelectionMenu: ; 3d219 (f:5219) .mimicmenu ld hl, wEnemyMonMoves call .loadmoves - hlCoord 0, 7 + coord hl, 0, 7 ld b, $4 ld c, $e call TextBoxBorder - hlCoord 2, 8 + coord hl, 2, 8 call .writemoves ld b, $1 ld a, $7 @@ -2594,11 +2594,11 @@ MoveSelectionMenu: ; 3d219 (f:5219) ld bc, $2c call AddNTimes call .loadmoves - hlCoord 4, 7 + coord hl, 4, 7 ld b, $4 ld c, $e call TextBoxBorder - hlCoord 6, 8 + coord hl, 6, 8 call .writemoves ld b, $5 ld a, $7 @@ -2654,7 +2654,7 @@ SelectMenuItem: ; 3d2fe (f:52fe) jr z, .battleselect dec a jr nz, .select - hlCoord 1, 14 + coord hl, 1, 14 ld de, WhichTechniqueString call PlaceString jr .select @@ -2666,7 +2666,7 @@ SelectMenuItem: ; 3d2fe (f:52fe) ld a, [wMenuItemToSwap] and a jr z, .select - hlCoord 5, 13 + coord hl, 5, 13 dec a ld bc, $14 call AddNTimes @@ -2903,7 +2903,7 @@ SwapMovesInMenu: ; 3d435 (f:5435) PrintMenuItem: ; 3d4b6 (f:54b6) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 0, 8 + coord hl, 0, 8 ld b, $3 ld c, $9 call TextBoxBorder @@ -2916,7 +2916,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6) ld a, [wCurrentMenuItem] cp b jr nz, .notDisabled - hlCoord 1, 10 + coord hl, 1, 10 ld de, DisabledText call PlaceString jr .moveDisabled @@ -2948,23 +2948,23 @@ PrintMenuItem: ; 3d4b6 (f:54b6) and $3f ld [wcd6d], a ; print TYPE/ and / - hlCoord 1, 9 + coord hl, 1, 9 ld de, TypeText call PlaceString - hlCoord 7, 11 + coord hl, 7, 11 ld [hl], "/" - hlCoord 5, 9 + coord hl, 5, 9 ld [hl], "/" - hlCoord 5, 11 + coord hl, 5, 11 ld de, wcd6d ld bc, $102 call PrintNumber - hlCoord 8, 11 + coord hl, 8, 11 ld de, wd11e ld bc, $102 call PrintNumber call GetCurrentMove - hlCoord 2, 10 + coord hl, 2, 10 predef PrintMoveType .moveDisabled ld a, $1 @@ -4924,7 +4924,7 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) ld [wHPBarNewHP+1],a ld a,[hl] ld [wHPBarNewHP],a - hlCoord 2, 2 + coord hl, 2, 2 xor a ld [wHPBarType],a predef UpdateHPBar2 ; animate the HP bar shortening @@ -5042,7 +5042,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200) ld [wHPBarMaxHP+1],a ld a,[hl] ld [wHPBarMaxHP],a - hlCoord 10, 9 + coord hl, 10, 9 ld a,$01 ld [wHPBarType],a predef UpdateHPBar2 ; animate the HP bar shortening @@ -6456,7 +6456,7 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) ld [$0], a ld a, $31 ld [$ffe1], a - hlCoord 1, 5 + coord hl, 1, 5 predef_jump CopyUncompressedPicToTilemap ; does nothing since no stats are ever selected (barring glitches) @@ -6875,7 +6875,7 @@ InitBattleCommon: ; 3ef3d (f:6f3d) ld [$ffe1], a dec a ld [wAICount], a - hlCoord 12, 0 + coord hl, 12, 0 predef CopyUncompressedPicToTilemap ld a, $ff ld [wEnemyMonPartyPos], a @@ -6929,7 +6929,7 @@ InitWildBattle: ; 3ef8b (f:6f8b) xor a ld [W_TRAINERCLASS], a ld [$ffe1], a - hlCoord 12, 0 + coord hl, 12, 0 predef CopyUncompressedPicToTilemap ; common code that executes after init battle code specific to trainer or wild battles @@ -6951,10 +6951,10 @@ InitBattle_Common: ; 3efeb (f:6feb) ld a, $9c ld [H_AUTOBGTRANSFERDEST + 1], a call LoadScreenTilesFromBuffer1 - hlCoord 9, 7 + coord hl, 9, 7 ld bc, $50a call ClearScreenArea - hlCoord 1, 0 + coord hl, 1, 0 ld bc, $40a call ClearScreenArea call ClearSprites @@ -7098,7 +7098,7 @@ LoadMonBackPic: ; 3f103 (f:7103) ; been loaded with GetMonHeader. ld a, [wBattleMonSpecies2] ld [wcf91], a - hlCoord 1, 5 + coord hl, 1, 5 ld b, $7 ld c, $8 call ClearScreenArea diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 06280a15..e9be0da5 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -121,7 +121,7 @@ PlacePlayerHUDTiles: ; 3a902 (e:6902) ld de, wTrainerFacingDirection ld bc, $3 call CopyData - hlCoord 18, 10 + coord hl, 18, 10 ld de, rIE jr PlaceHUDTiles @@ -136,7 +136,7 @@ PlaceEnemyHUDTiles: ; 3a919 (e:6919) ld de, wTrainerFacingDirection ld bc, $3 call CopyData - hlCoord 1, 2 + coord hl, 1, 2 ld de, $1 jr PlaceHUDTiles diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index 075cbeb1..8264e49c 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -19,7 +19,7 @@ EndOfBattle: ; 137aa (4:77aa) jr z, .placeWinOrLoseString ld de, DrawText .placeWinOrLoseString - hlCoord 6, 8 + coord hl, 6, 8 call PlaceString ld c, 200 call DelayFrames diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 73d3bcc2..e3b3f42c 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -4,7 +4,7 @@ MarowakAnim: ; 708ca (1c:48ca) ld [rOBP1], a call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap - hlCoord 12, 0 + coord hl, 12, 0 ld bc, $707 call ClearScreenArea call Delay3 diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 7320da29..dfb2fe35 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -1,18 +1,18 @@ ; display "[player] VS [enemy]" text box with pokeballs representing their parties next to the names DisplayLinkBattleVersusTextBox: ; 372d6 (d:72d6) call LoadTextBoxTilePatterns - hlCoord 3, 4 + coord hl, 3, 4 ld b, $7 ld c, $c call TextBoxBorder - hlCoord 4, 5 + coord hl, 4, 5 ld de, wPlayerName call PlaceString - hlCoord 4, 10 + coord hl, 4, 10 ld de, wLinkEnemyTrainerName call PlaceString ; place bold "VS" tiles between the names - hlCoord 9, 8 + coord hl, 9, 8 ld a, $69 ld [hli], a ld [hl], $6a diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm index be52e76d..1096794f 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/moveEffects/drain_hp_effect.asm @@ -71,10 +71,10 @@ DrainHPEffect_: ; 783f (1:783f) .next ld a, [H_WHOSETURN] and a - hlCoord 10, 9 + coord hl, 10, 9 ld a, $1 jr z, .next2 - hlCoord 2, 2 + coord hl, 2, 2 xor a .next2 ld [wHPBarType], a diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index d9729747..cea63a1f 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -89,10 +89,10 @@ HealEffect_: ; 3b9ec (e:79ec) call BankswitchEtoF ld a, [H_WHOSETURN] and a - hlCoord 10, 9 + coord hl, 10, 9 ld a, $1 jr z, .updateHPBar - hlCoord 2, 2 + coord hl, 2, 2 xor a .updateHPBar ld [wHPBarType], a diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 95b54922..51232af6 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -53,12 +53,12 @@ RecoilEffect_: ; 1392c (4:792c) ld [hli], a ld [hl], a .getHPBarCoords - hlCoord 10, 9 + coord hl, 10, 9 ld a, [H_WHOSETURN] and a ld a, $1 jr z, .updateHPBar - hlCoord 2, 2 + coord hl, 2, 2 xor a .updateHPBar ld [wHPBarType], a diff --git a/engine/battle/scroll_draw_trainer_pic.asm b/engine/battle/scroll_draw_trainer_pic.asm index 18df86e0..b32650e3 100644 --- a/engine/battle/scroll_draw_trainer_pic.asm +++ b/engine/battle/scroll_draw_trainer_pic.asm @@ -6,7 +6,7 @@ _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3) ld b, $1 call GoPAL_SET callab _LoadTrainerPic - hlCoord 19, 0 + coord hl, 19, 0 ld c, $0 .scrollLoop inc c diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 55314ea9..a53f00f6 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -641,7 +641,7 @@ AIRecoverHP: ; 3a6da (e:66da) AIPrintItemUseAndUpdateHPBar: ; 3a718 (e:6718) call AIPrintItemUse_ - hlCoord 2, 2 + coord hl, 2, 2 xor a ld [wHPBarType],a predef UpdateHPBar2 diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 03dc6fb6..5964f996 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -25,7 +25,7 @@ TryDoWildEncounter: ; 13870 (4:7870) .asm_1389e ; determine if wild pokemon can appear in the half-block we're standing in ; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile? - hlCoord 9, 9 + coord hl, 9, 9 ld c, [hl] ld a, [W_GRASSTILE] cp c diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 87f7b34c..fbdb6260 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -9,11 +9,11 @@ CableClub_DoBattleOrTrade: ; 5317 (1:5317) call LoadFontTilePatterns call LoadHpBarAndStatusTilePatterns call LoadTrainerInfoTextBoxTiles - hlCoord 3, 8 + coord hl, 3, 8 ld b, 2 ld c, 12 call CableClub_TextBoxBorder - hlCoord 4, 10 + coord hl, 4, 10 ld de, PleaseWaitString call PlaceString ld hl, wPlayerNumHits @@ -399,7 +399,7 @@ TradeCenter_SelectMon: ld [wTopMenuItemY], a ld a, 1 ld [wTopMenuItemX], a - hlCoord 1, 1 + coord hl, 1, 1 ld bc, $0601 call ClearScreenArea .playerMonMenu_HandleInput @@ -464,11 +464,11 @@ TradeCenter_SelectMon: dec a .displayStatsTradeMenu push af - hlCoord 0, 14 + coord hl, 0, 14 ld b, 2 ld c, 18 call CableClub_TextBoxBorder - hlCoord 2, 16 + coord hl, 2, 16 ld de, .statsTrade call PlaceString xor a @@ -596,15 +596,15 @@ ReturnToCableClubRoom: ; 577d (1:577d) ret TradeCenter_DrawCancelBox: - hlCoord 11, 15 + coord hl, 11, 15 ld a, $7e ld bc, 2 * 20 + 9 call FillMemory - hlCoord 0, 15 + coord hl, 0, 15 ld b, 1 ld c, 9 call CableClub_TextBoxBorder - hlCoord 2, 16 + coord hl, 2, 16 ld de, CancelTextString jp PlaceString @@ -613,7 +613,7 @@ CancelTextString: TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] - hlCoord 1, 9 + coord hl, 1, 9 ld bc, 20 call AddNTimes ld [hl], $ec ; cursor @@ -630,24 +630,24 @@ TradeCenter_DisplayStats: jp TradeCenter_DrawCancelBox TradeCenter_DrawPartyLists: - hlCoord 0, 0 + coord hl, 0, 0 ld b, 6 ld c, 18 call CableClub_TextBoxBorder - hlCoord 0, 8 + coord hl, 0, 8 ld b, 6 ld c, 18 call CableClub_TextBoxBorder - hlCoord 5, 0 + coord hl, 5, 0 ld de, wPlayerName call PlaceString - hlCoord 5, 8 + coord hl, 5, 8 ld de, wLinkEnemyTrainerName call PlaceString - hlCoord 2, 1 + coord hl, 2, 1 ld de, wPartySpecies call TradeCenter_PrintPartyListNames - hlCoord 2, 9 + coord hl, 2, 9 ld de, wEnemyPartyMons ; fall through @@ -684,7 +684,7 @@ TradeCenter_Trade: ld [wSerialExchangeNybbleReceiveData], a ld [wMenuWatchMovingOutOfBounds], a ld [wMenuJoypadPollCount], a - hlCoord 0, 12 + coord hl, 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder @@ -709,10 +709,10 @@ TradeCenter_Trade: ld [wd11e], a call GetMonName ld hl, WillBeTradedText - bcCoord 1, 14 + coord bc, 1, 14 call TextCommandProcessor call SaveScreenTilesToBuffer1 - hlCoord 10, 7 + coord hl, 10, 7 ld bc, $080b ld a, TRADE_CANCEL_MENU ld [wTwoOptionMenuID], a @@ -726,11 +726,11 @@ TradeCenter_Trade: ; if trade cancelled ld a, $1 ld [wSerialExchangeNybbleSendData], a - hlCoord 0, 12 + coord hl, 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - hlCoord 1, 14 + coord hl, 1, 14 ld de, TradeCanceled call PlaceString call Serial_PrintWaitingTextAndSyncAndExchangeNybble @@ -743,11 +743,11 @@ TradeCenter_Trade: dec a ; did the other person cancel? jr nz, .doTrade ; if the other person cancelled - hlCoord 0, 12 + coord hl, 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - hlCoord 1, 14 + coord hl, 1, 14 ld de, TradeCanceled call PlaceString jp .tradeCancelled @@ -851,11 +851,11 @@ TradeCenter_Trade: call Serial_PrintWaitingTextAndSyncAndExchangeNybble ld c, 40 call DelayFrames - hlCoord 0, 12 + coord hl, 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - hlCoord 1, 14 + coord hl, 1, 14 ld de, TradeCompleted call PlaceString predef SaveSAVtoSRAM2 diff --git a/engine/clear_save.asm b/engine/clear_save.asm index 66d7e920..2febb123 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -5,7 +5,7 @@ DoClearSaveDialogue: ; 1c98a (7:498a) call LoadTextBoxTilePatterns ld hl, ClearSaveDataText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ld a, NO_YES_MENU ld [wTwoOptionMenuID], a diff --git a/engine/evolution.asm b/engine/evolution.asm index 4776b3b6..9ed38c21 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -99,7 +99,7 @@ EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) Evolution_LoadPic: ; 7beb9 (1e:7eb9) call GetMonHeader - hlCoord 7, 2 + coord hl, 7, 2 jp LoadFlippedFrontSpriteByMonIndex Func_7bec2: ; 7bec2 (1e:7ec2) @@ -117,7 +117,7 @@ Func_7bed6: ; 7bed6 (1e:7ed6) push bc xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 7, 2 + coord hl, 7, 2 ld bc, $707 ld de, $d .asm_7bee3 diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2b54108d..4a253c68 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -121,7 +121,7 @@ Evolution_PartyMonLoop: ; loop over party mons call DelayFrames xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $c14 call ClearScreenArea ld a, $1 diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 81ccffdc..0d933571 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -57,11 +57,11 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) call HoFDisplayAndRecordMonInfo ld c, 80 call DelayFrames - hlCoord 2, 13 + coord hl, 2, 13 ld b, $3 ld c, $e call TextBoxBorder - hlCoord 4, 15 + coord hl, 4, 15 ld de, HallOfFameText call PlaceString ld c, 180 @@ -112,7 +112,7 @@ HoFShowMonOrPlayer: ; 70278 (1c:4278) call HoFLoadPlayerPics jr .next1 .showMon - hlCoord 12, 5 + coord hl, 12, 5 call GetMonHeader call LoadFrontSpriteByMonIndex predef LoadMonBackPic @@ -157,22 +157,22 @@ HoFDisplayAndRecordMonInfo: ; 702e1 (1c:42e1) jp HoFRecordMonInfo HoFDisplayMonInfo: ; 702f0 (1c:42f0) - hlCoord 0, 2 + coord hl, 0, 2 ld b, 9 ld c, 10 call TextBoxBorder - hlCoord 2, 6 + coord hl, 2, 6 ld de, HoFMonInfoText call PlaceString - hlCoord 1, 4 + coord hl, 1, 4 ld de, wcd6d call PlaceString ld a, [wHoFMonLevel] - hlCoord 8, 7 + coord hl, 8, 7 call PrintLevelCommon ld a, [wHoFMonSpecies] ld [wd0b5], a - hlCoord 3, 9 + coord hl, 3, 9 predef PrintMonType ld a, [wHoFMonSpecies] jp PlayCry @@ -203,28 +203,28 @@ HoFLoadPlayerPics: ; 7033e (1c:433e) HoFLoadMonPlayerPicTileIDs: ; 7036d (1c:436d) ; c = base tile ID ld b, 0 - hlCoord 12, 5 + coord hl, 12, 5 predef_jump CopyTileIDsFromList HoFDisplayPlayerStats: ; 70377 (1c:4377) ld hl, wd747 set 3, [hl] predef DisplayDexRating - hlCoord 0, 4 + coord hl, 0, 4 ld b, $6 ld c, $a call TextBoxBorder - hlCoord 5, 0 + coord hl, 5, 0 ld b, $2 ld c, $9 call TextBoxBorder - hlCoord 7, 2 + coord hl, 7, 2 ld de, wPlayerName call PlaceString - hlCoord 1, 6 + coord hl, 1, 6 ld de, HoFPlayTimeText call PlaceString - hlCoord 5, 7 + coord hl, 5, 7 ld de, W_PLAYTIMEHOURS + 1 ld bc, $103 call PrintNumber @@ -233,10 +233,10 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377) ld de, W_PLAYTIMEMINUTES + 1 ld bc, $8102 call PrintNumber - hlCoord 1, 9 + coord hl, 1, 9 ld de, HoFMoneyText call PlaceString - hlCoord 4, 10 + coord hl, 4, 10 ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index a8b4f812..841929b8 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -72,7 +72,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) call LoadMonFrontSprite ld a, $80 ld [$ffe1], a - hlCoord 10, 11 + coord hl, 10, 11 predef AnimateSendingOutMon call WaitForTextScrollButtonPress call LoadScreenTilesFromBuffer1 @@ -109,11 +109,11 @@ LinkCableHelp: ; 5dc29 (17:5c29) .asm_5c51 ld hl, wd730 set 6, [hl] - hlCoord 0, 0 + coord hl, 0, 0 ld b, $8 ld c, $d call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de, HowToLinkText call PlaceString ld hl, LinkCableHelpText2 @@ -193,13 +193,13 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) .asm_5dd15 ld hl, wd730 set 6, [hl] - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $060a call TextBoxBorder - hlCoord 1, 2 + coord hl, 1, 2 ld de, StatusAilmentText1 call PlaceString - hlCoord 6, 2 + coord hl, 6, 2 ld de, StatusAilmentText2 call PlaceString ld hl, ViridianSchoolBlackboardText2 diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index c835775e..810d9bfe 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -402,11 +402,11 @@ BillsHousePokemonList: ; 1ec05 (7:6c05) .asm_1ec2d ld hl, wd730 set 6, [hl] - hlCoord 0, 0 + coord hl, 0, 0 ld b, $a ld c, $9 call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de, BillsMonListText call PlaceString ld hl, BillsHousePokemonListText2 diff --git a/engine/intro.asm b/engine/intro.asm index bbe47cdb..79cc2101 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -205,7 +205,7 @@ IntroClearScreen: ; 417f0 (10:57f0) IntroClearMiddleOfScreen: ; 417f8 (10:57f8) ; clear the area of the tile map between the black bars on the top and bottom - hlCoord 0, 4 + coord hl, 0, 4 ld bc, SCREEN_WIDTH * 10 IntroClearCommon: ; 417fe (10:57fe) @@ -263,7 +263,7 @@ IntroMoveMon: ; 4180e (10:580e) ret IntroCopyTiles: ; 4183f (10:583f) - hlCoord 13, 7 + coord hl, 13, 7 CopyTileIDsFromList_ZeroBaseTileID: ; 41842 (10:5842) ld c, 0 @@ -337,10 +337,10 @@ PlayShootingStar: ; 4188a (10:588a) IntroDrawBlackBars: ; 418e9 (10:58e9) ; clear the screen and draw black bars on the top and bottom call IntroClearScreen - hlCoord 0, 0 + coord hl, 0, 0 ld c, SCREEN_WIDTH * 4 call IntroPlaceBlackTiles - hlCoord 0, 14 + coord hl, 0, 14 ld c, SCREEN_WIDTH * 4 call IntroPlaceBlackTiles ld hl, vBGMap1 diff --git a/engine/items/items.asm b/engine/items/items.asm index 7617ba6c..bd19c152 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -913,7 +913,7 @@ ItemUseMedicine: ; dabb (3:5abb) sbc b ld [hl],a ld [wHPBarNewHP+1],a - hlCoord 4, 1 + coord hl, 4, 1 ld a,[wWhichPokemon] ld bc,2 * 20 call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled @@ -2095,7 +2095,7 @@ ItemUseTMHM: ; e479 (3:6479) call PrintText ld hl,TeachMachineMoveText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc,$080f ld a,TWO_OPTION_MENU ld [wTextBoxID],a @@ -2486,7 +2486,7 @@ TossItem_: ; e6f1 (3:66f1) call CopyStringToCF4B ; copy name to wcf4b ld hl,IsItOKToTossItemText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc,$080f ld a,TWO_OPTION_MENU ld [wTextBoxID],a diff --git a/engine/learn_move.asm b/engine/learn_move.asm index cb5bdbd7..1c0e038c 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -76,7 +76,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b) AbandonLearning: ; 6eda (1:6eda) ld hl, AbandonLearningText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -99,7 +99,7 @@ TryingToLearn: ; 6f07 (1:6f07) push hl ld hl, TryingToLearnText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -120,11 +120,11 @@ TryingToLearn: ; 6f07 (1:6f07) push hl ld hl, WhichMoveToForgetText call PrintText - hlCoord 4, 7 + coord hl, 4, 7 ld b, $4 ld c, $e call TextBoxBorder - hlCoord 6, 8 + coord hl, 6, 8 ld de, wMovesString ld a, [hFlags_0xFFF6] set 2, a diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 59da2774..d491cd38 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -11,17 +11,17 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) ld a, [wNumHoFTeams] and a jr nz, .leaguePCAvailable - hlCoord 0, 0 + coord hl, 0, 0 ld b, 8 ld c, 14 jr .next .noOaksPC - hlCoord 0, 0 + coord hl, 0, 0 ld b, 6 ld c, 14 jr .next .leaguePCAvailable - hlCoord 0, 0 + coord hl, 0, 0 ld b, 10 ld c, 14 .next @@ -32,15 +32,15 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) ld a, [wd7f1] bit 0, a jr nz, .metBill - hlCoord 2, 2 + coord hl, 2, 2 ld de, SomeonesPCText jr .next2 .metBill - hlCoord 2, 2 + coord hl, 2, 2 ld de, BillsPCText .next2 call PlaceString - hlCoord 2, 4 + coord hl, 2, 4 ld de, wPlayerName call PlaceString ld l, c @@ -50,7 +50,7 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) ld a, [wd74b] bit 5, a ; received pokedex? jr z, .noOaksPC2 - hlCoord 2, 6 + coord hl, 2, 6 ld de, OaksPCText call PlaceString ld a, [wNumHoFTeams] @@ -58,20 +58,20 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) jr z, .noLeaguePC ld a, 4 ld [wMaxMenuItem], a - hlCoord 2, 8 + coord hl, 2, 8 ld de, PKMNLeaguePCText call PlaceString - hlCoord 2, 10 + coord hl, 2, 10 ld de, LogOffPCText jr .next3 .noLeaguePC - hlCoord 2, 8 + coord hl, 2, 8 ld de, LogOffPCText jr .next3 .noOaksPC2 ld a, $2 ld [wMaxMenuItem], a - hlCoord 2, 6 + coord hl, 2, 6 ld de, LogOffPCText .next3 call PlaceString @@ -122,11 +122,11 @@ BillsPCMenu: ; 214e8 (8:54e8) ld bc, (BANK(PokeballTileGraphics) << 8) + $01 call CopyVideoData call LoadScreenTilesFromBuffer2DisableBGTransfer - hlCoord 0, 0 + coord hl, 0, 0 ld b, 10 ld c, 12 call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de, BillsPCMenuText call PlaceString ld hl, wTopMenuItemY @@ -149,7 +149,7 @@ BillsPCMenu: ; 214e8 (8:54e8) ld [wPlayerMonNumber], a ld hl, WhatText call PrintText - hlCoord 9, 14 + coord hl, 9, 14 ld b, 2 ld c, 9 call TextBoxBorder @@ -159,7 +159,7 @@ BillsPCMenu: ; 214e8 (8:54e8) jr c, .singleDigitBoxNum ; two digit box num sub 9 - hlCoord 17, 16 + coord hl, 17, 16 ld [hl], "1" add "0" jr .next @@ -167,7 +167,7 @@ BillsPCMenu: ; 214e8 (8:54e8) add "1" .next Coorda 18, 16 - hlCoord 10, 16 + coord hl, 10, 16 ld de, BoxNoPCText call PlaceString ld a, 1 @@ -391,7 +391,7 @@ HMMoveArray: ; 21745 (8:5745) db -1 DisplayDepositWithdrawMenu: ; 2174b (8:574b) - hlCoord 9, 10 + coord hl, 9, 10 ld b, 6 ld c, 9 call TextBoxBorder @@ -401,9 +401,9 @@ DisplayDepositWithdrawMenu: ; 2174b (8:574b) jr nz, .next ld de, WithdrawPCText .next - hlCoord 11, 12 + coord hl, 11, 12 call PlaceString - hlCoord 11, 14 + coord hl, 11, 14 ld de, StatsCancelPCText call PlaceString ld hl, wTopMenuItemY diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 33453a53..56373dd3 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -12,7 +12,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ld bc, $0010 ld a, BANK(CircleTile) call FarCopyData2 - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $1012 predef Diploma_TextBoxBorder ld hl, DiplomaTextPointersAndCoords @@ -33,7 +33,7 @@ DisplayDiploma: ; 566e2 (15:66e2) pop bc dec c jr nz, .asm_56715 - hlCoord 10, 4 + coord hl, 10, 4 ld de, wPlayerName call PlaceString callba DrawPlayerCharacter diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index c38ab86b..560ed421 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -95,18 +95,18 @@ LeaguePCShowMon: ; 76610 (1d:6610) ld b, $0B ld c, 0 call GoPAL_SET - hlCoord 12, 5 + coord hl, 12, 5 call GetMonHeader call LoadFrontSpriteByMonIndex call GBPalNormal - hlCoord 0, 13 + coord hl, 0, 13 ld b, 2 ld c, $12 call TextBoxBorder - hlCoord 1, 15 + coord hl, 1, 15 ld de, HallOfFameNoText call PlaceString - hlCoord 16, 15 + coord hl, 16, 15 ld de, wHoFTeamNo ld bc, $0103 call PrintNumber diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 10ad7a2d..9e160f81 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -33,20 +33,20 @@ MainMenu: ; 5af2 (1:5af2) ld a,[wd088] cp a,1 jr z,.next1 - hlCoord 0, 0 + coord hl, 0, 0 ld b,6 ld c,13 call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de,ContinueText call PlaceString jr .next2 .next1 - hlCoord 0, 0 + coord hl, 0, 0 ld b,4 ld c,13 call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de,NewGameText call PlaceString .next2 @@ -139,12 +139,12 @@ LinkMenu: ; 5c0a (1:5c0a) call SaveScreenTilesToBuffer1 ld hl, WhereWouldYouLikeText call PrintText - hlCoord 5, 5 + coord hl, 5, 5 ld b, $6 ld c, $d call TextBoxBorder call UpdateSprites - hlCoord 7, 7 + coord hl, 7, 7 ld de, CableClubOptionsText call PlaceString xor a @@ -340,21 +340,21 @@ CableClubOptionsText: ; 5d97 (1:5d97) ContinueGame: ; 5db5 (1:5db5) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 4, 7 + coord hl, 4, 7 ld b, $8 ld c, $e call TextBoxBorder - hlCoord 5, 9 + coord hl, 5, 9 ld de, SaveScreenInfoText call PlaceString - hlCoord 12, 9 + coord hl, 12, 9 ld de, wPlayerName call PlaceString - hlCoord 17, 11 + coord hl, 17, 11 call Func_5e2f - hlCoord 16, 13 + coord hl, 16, 13 call Func_5e42 - hlCoord 13, 15 + coord hl, 13, 15 call Func_5e55 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -364,23 +364,23 @@ ContinueGame: ; 5db5 (1:5db5) PrintSaveScreenText: ; 5def (1:5def) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 4, 0 + coord hl, 4, 0 ld b, $8 ld c, $e call TextBoxBorder call LoadTextBoxTilePatterns call UpdateSprites - hlCoord 5, 2 + coord hl, 5, 2 ld de, SaveScreenInfoText call PlaceString - hlCoord 12, 2 + coord hl, 12, 2 ld de, wPlayerName call PlaceString - hlCoord 17, 4 + coord hl, 17, 4 call Func_5e2f - hlCoord 16, 6 + coord hl, 16, 6 call Func_5e42 - hlCoord 13, 8 + coord hl, 13, 8 call Func_5e55 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -424,28 +424,28 @@ SaveScreenInfoText: ; 5e6a (1:5e6a) next "TIME@" DisplayOptionMenu: ; 5e8a (1:5e8a) - hlCoord 0, 0 + coord hl, 0, 0 ld b,3 ld c,18 call TextBoxBorder - hlCoord 0, 5 + coord hl, 0, 5 ld b,3 ld c,18 call TextBoxBorder - hlCoord 0, 10 + coord hl, 0, 10 ld b,3 ld c,18 call TextBoxBorder - hlCoord 1, 1 + coord hl, 1, 1 ld de,TextSpeedOptionText call PlaceString - hlCoord 1, 6 + coord hl, 1, 6 ld de,BattleAnimationOptionText call PlaceString - hlCoord 1, 11 + coord hl, 1, 11 ld de,BattleStyleOptionText call PlaceString - hlCoord 2, 16 + coord hl, 2, 16 ld de,OptionMenuCancelText call PlaceString xor a @@ -639,7 +639,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c) dec hl ld a,[hl] ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate - hlCoord 0, 3 + coord hl, 0, 3 call .placeUnfilledRightArrow sla c ld a,1 ; On @@ -647,7 +647,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c) ld a,10 ; Off .storeBattleAnimationCursorX ld [wOptionsBattleAnimCursorX],a ; battle animation cursor X coordinate - hlCoord 0, 8 + coord hl, 0, 8 call .placeUnfilledRightArrow sla c ld a,1 @@ -655,10 +655,10 @@ SetCursorPositionsFromOptions: ; 604c (1:604c) ld a,10 .storeBattleStyleCursorX ld [wOptionsBattleStyleCursorX],a ; battle style cursor X coordinate - hlCoord 0, 13 + coord hl, 0, 13 call .placeUnfilledRightArrow ; cursor in front of Cancel - hlCoord 0, 16 + coord hl, 0, 16 ld a,1 .placeUnfilledRightArrow ld e,a diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 2416f0da..20deb834 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -4,7 +4,7 @@ AskName: ; 64eb (1:64eb) push hl ld a, [W_ISINBATTLE] dec a - hlCoord 0, 0 + coord hl, 0, 0 ld b, $4 ld c, $b call z, ClearScreenArea ; only if in wild batle @@ -13,7 +13,7 @@ AskName: ; 64eb (1:64eb) call GetMonName ld hl, DoYouWantToNicknameText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -93,7 +93,7 @@ DisplayNamingScreen: ; 6596 (1:6596) call LoadHpBarAndStatusTilePatterns call LoadEDTile callba LoadMonPartySpriteGfx - hlCoord 0, 4 + coord hl, 0, 4 ld b, $9 ld c, $12 call TextBoxBorder @@ -343,7 +343,7 @@ PrintAlphabet: ; 676f (1:676f) jr nz, .lowercase ld de, UpperCaseAlphabet .lowercase - hlCoord 2, 5 + coord hl, 2, 5 ld bc, $509 ; 5 rows, 9 columns .outerLoop push bc @@ -374,13 +374,13 @@ PrintNicknameAndUnderscores: ; 680e (1:680e) call CalcStringLength ld a, c ld [wHPBarMaxHP], a - hlCoord 10, 2 + coord hl, 10, 2 ld bc, $10a call ClearScreenArea - hlCoord 10, 2 + coord hl, 10, 2 ld de, wcf4b call PlaceString - hlCoord 10, 3 + coord hl, 10, 3 ld a, [wNamingScreenType] cp NAME_MON_SCREEN jr nc, .pokemon1 @@ -419,7 +419,7 @@ PrintNicknameAndUnderscores: ; 680e (1:680e) .emptySpacesRemaining ld c, a ld b, $0 - hlCoord 10, 3 + coord hl, 10, 3 add hl, bc ld [hl], $77 ; raised underscore tile id ret @@ -467,7 +467,7 @@ CalcStringLength: ; 68eb (1:68eb) jr .loop PrintNamingText: ; 68f8 (1:68f8) - hlCoord 0, 1 + coord hl, 0, 1 ld a, [wNamingScreenType] ld de, YourTextString and a @@ -482,12 +482,12 @@ PrintNamingText: ; 68f8 (1:68f8) pop af ld [wd11e], a call GetMonName - hlCoord 4, 1 + coord hl, 4, 1 call PlaceString ld hl, $1 add hl, bc ld [hl], $c9 - hlCoord 1, 3 + coord hl, 1, 3 ld de, NicknameTextString jr .placeString .notNickname diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index fcdd5c50..00ae3912 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -30,7 +30,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) jp z,.printMessage call ErasePartyMenuCursors callba SendBlkPacket_PartyMenu - hlCoord 3, 0 + coord hl, 3, 0 ld de,wPartySpecies xor a ld c,a diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index f436ae24..89974dd0 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -22,12 +22,12 @@ PlayerPCMenu: ; 790c (1:790c) ld hl, wFlags_0xcd60 set 5, [hl] call LoadScreenTilesFromBuffer2 - hlCoord 0, 0 + coord hl, 0, 0 ld b, $8 ld c, $e call TextBoxBorder call UpdateSprites - hlCoord 2, 2 + coord hl, 2, 2 ld de, PlayersPCMenuEntries call PlaceString ld hl, wTopMenuItemY diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 80eedecd..08ce0da9 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -118,7 +118,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) pop af ld [wCurrentMenuItem],a push bc - hlCoord 0, 3 + coord hl, 0, 3 ld de,20 ld bc,$7f0d ; 13 blank tiles call DrawTileLine ; cover up the menu cursor in the pokemon list @@ -126,7 +126,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ret .buttonBPressed push bc - hlCoord 15, 10 + coord hl, 15, 10 ld de,20 ld bc,$7f07 ; 7 blank tiles call DrawTileLine ; cover up the menu cursor in the side menu @@ -153,43 +153,43 @@ HandlePokedexListMenu: ; 40111 (10:4111) xor a ld [H_AUTOBGTRANSFERENABLED],a ; draw the horizontal line separating the seen and owned amounts from the menu - hlCoord 15, 8 + coord hl, 15, 8 ld a,$7a ; horizontal line tile ld [hli],a ld [hli],a ld [hli],a ld [hli],a ld [hli],a - hlCoord 14, 0 + coord hl, 14, 0 ld [hl],$71 ; vertical line tile - hlCoord 14, 1 + coord hl, 14, 1 call DrawPokedexVerticalLine - hlCoord 14, 9 + coord hl, 14, 9 call DrawPokedexVerticalLine ld hl,wPokedexSeen ld b,wPokedexSeenEnd - wPokedexSeen call CountSetBits ld de,wd11e - hlCoord 16, 3 + coord hl, 16, 3 ld bc,$0103 call PrintNumber ; print number of seen pokemon ld hl,wPokedexOwned ld b,wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld de,wd11e - hlCoord 16, 6 + coord hl, 16, 6 ld bc,$0103 call PrintNumber ; print number of owned pokemon - hlCoord 16, 2 + coord hl, 16, 2 ld de,PokedexSeenText call PlaceString - hlCoord 16, 5 + coord hl, 16, 5 ld de,PokedexOwnText call PlaceString - hlCoord 1, 1 + coord hl, 1, 1 ld de,PokedexContentsText call PlaceString - hlCoord 16, 10 + coord hl, 16, 10 ld de,PokedexMenuItemsText call PlaceString ; find the highest pokedex number among the pokemon the player has seen @@ -211,10 +211,10 @@ HandlePokedexListMenu: ; 40111 (10:4111) .loop xor a ld [H_AUTOBGTRANSFERENABLED],a - hlCoord 4, 2 + coord hl, 4, 2 ld bc,$0e0a call ClearScreenArea - hlCoord 1, 3 + coord hl, 1, 3 ld a,[wListScrollOffset] ld [wd11e],a ld d,7 @@ -411,18 +411,18 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) push af xor a ld [hTilesetType],a - hlCoord 0, 0 + coord hl, 0, 0 ld de,1 ld bc,$6414 call DrawTileLine ; draw top border - hlCoord 0, 17 + coord hl, 0, 17 ld b,$6f call DrawTileLine ; draw bottom border - hlCoord 0, 1 + coord hl, 0, 1 ld de,20 ld bc,$6610 call DrawTileLine ; draw left border - hlCoord 19, 1 + coord hl, 19, 1 ld b,$67 call DrawTileLine ; draw right border ld a,$63 ; upper left corner tile @@ -433,14 +433,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) Coorda 0, 17 ld a,$6e ; lower right corner tile Coorda 19, 17 - hlCoord 0, 9 + coord hl, 0, 9 ld de,PokedexDataDividerLine call PlaceString ; draw horizontal divider line - hlCoord 9, 6 + coord hl, 9, 6 ld de,HeightWeightText call PlaceString call GetMonName - hlCoord 9, 2 + coord hl, 9, 2 call PlaceString ld hl,PokedexEntryPointers ld a,[wd11e] @@ -452,7 +452,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld a,[hli] ld e,a ld d,[hl] ; de = address of pokedex entry - hlCoord 9, 4 + coord hl, 9, 4 call PlaceString ; print species name ld h,b ld l,c @@ -460,7 +460,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld a,[wd11e] push af call IndexToPokedex - hlCoord 2, 8 + coord hl, 2, 8 ld a, "№" ld [hli],a ld a,$f2 @@ -482,7 +482,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) call Delay3 call GBPalNormal call GetMonHeader ; load pokemon picture location - hlCoord 1, 1 + coord hl, 1, 1 call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture ld a,[wcf91] call PlayCry ; play pokemon cry @@ -495,14 +495,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description inc de ; de = address of feet (height) ld a,[de] ; reads feet, but a is overwritten without being used - hlCoord 12, 6 + coord hl, 12, 6 ld bc,$0102 call PrintNumber ; print feet (height) ld a,$60 ; feet symbol tile (one tick) ld [hl],a inc de inc de ; de = address of inches (height) - hlCoord 15, 6 + coord hl, 15, 6 ld bc,$8102 call PrintNumber ; print inches (height) ld a,$61 ; inches symbol tile (two ticks) @@ -524,10 +524,10 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld a,[de] ; a = lower byte of weight ld [hl],a ; store lower byte of weight in [hDexWeight + 1] ld de,hDexWeight - hlCoord 11, 8 + coord hl, 11, 8 ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits call PrintNumber ; print weight - hlCoord 14, 8 + coord hl, 14, 8 ld a,[hDexWeight + 1] sub a,10 ld a,[hDexWeight] @@ -545,7 +545,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld [hDexWeight],a ; restore original value of [hDexWeight] pop hl inc hl ; hl = address of pokedex description text - bcCoord 1, 11 + coord bc, 1, 11 ld a,2 ld [$fff4],a call TextCommandProcessor ; print pokedex description text diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index f7206a7f..d1fa0c72 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -22,7 +22,7 @@ CeladonPrizeMenu: ; 5271b (14:671b) ld a,$01 ld [wTopMenuItemX],a call PrintPrizePrice - hlCoord 0, 2 + coord hl, 0, 2 ld b,$08 ld c,$10 call TextBoxBorder @@ -93,42 +93,42 @@ GetPrizeMenuId: ; 5278e (14:678e) ld a,[W_PRIZE1] ld [wd11e],a call GetItemName - hlCoord 2, 4 + coord hl, 2, 4 call PlaceString ld a,[W_PRIZE2] ld [wd11e],a call GetItemName - hlCoord 2, 6 + coord hl, 2, 6 call PlaceString ld a,[W_PRIZE3] ld [wd11e],a call GetItemName - hlCoord 2, 8 + coord hl, 2, 8 call PlaceString jr .putNoThanksText .putMonName ld a,[W_PRIZE1] ld [wd11e],a call GetMonName - hlCoord 2, 4 + coord hl, 2, 4 call PlaceString ld a,[W_PRIZE2] ld [wd11e],a call GetMonName - hlCoord 2, 6 + coord hl, 2, 6 call PlaceString ld a,[W_PRIZE3] ld [wd11e],a call GetMonName - hlCoord 2, 8 + coord hl, 2, 8 call PlaceString .putNoThanksText - hlCoord 2, 10 + coord hl, 2, 10 ld de,NoThanksText call PlaceString ; put prices on the right side of the textbox ld de,wd141 - hlCoord 13, 5 + coord hl, 13, 5 ; reg. c: ; [low nybble] number of bytes ; [bit 765 = %100] space-padding (not zero-padding) @@ -137,29 +137,29 @@ GetPrizeMenuId: ; 5278e (14:678e) ; used by text-command $02) call PrintBCDNumber ld de,wd143 - hlCoord 13, 7 + coord hl, 13, 7 ld c,(%1 << 7 | 2) call PrintBCDNumber ld de,wd145 - hlCoord 13, 9 + coord hl, 13, 9 ld c,(1 << 7 | 2) jp PrintBCDNumber INCLUDE "data/prizes.asm" PrintPrizePrice: ; 5287a (14:687a) - hlCoord 11, 0 + coord hl, 11, 0 ld b,$01 ld c,$07 call TextBoxBorder call UpdateSprites - hlCoord 12, 0 + coord hl, 12, 0 ld de,.CoinText call PlaceString - hlCoord 13, 1 + coord hl, 13, 1 ld de,.SixSpacesText call PlaceString - hlCoord 13, 1 + coord hl, 13, 1 ld de,wPlayerCoins ld c,%10000010 call PrintBCDNumber diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 2804ef7b..0036d66e 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -285,7 +285,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) ; writes a blank tile to all possible menu cursor positions on the party menu ErasePartyMenuCursors: ; 132ed (4:72ed) - hlCoord 0, 1 + coord hl, 0, 1 ld bc,2 * 20 ; menu cursor positions are 2 rows apart ld a,6 ; 6 menu cursor positions .loop @@ -526,10 +526,10 @@ DrawTrainerInfo: ; 1349a (4:749a) ld bc,(BANK(RedPicFront) << 8) | $01 predef DisplayPicCenteredOrUpperRight call DisableLCD - hlCoord 0, 2 + coord hl, 0, 2 ld a," " call TrainerInfo_DrawVerticalLine - hlCoord 1, 2 + coord hl, 1, 2 call TrainerInfo_DrawVerticalLine ld hl,vChars2 + $70 ld de,vChars2 @@ -572,7 +572,7 @@ DrawTrainerInfo: ; 1349a (4:749a) dec a ld [hli],a ld [hl],1 - hlCoord 0, 0 + coord hl, 0, 0 call TrainerInfo_DrawTextBox ld hl,wTrainerInfoTextBoxWidthPlus1 ld a,16 + 1 @@ -580,27 +580,27 @@ DrawTrainerInfo: ; 1349a (4:749a) dec a ld [hli],a ld [hl],3 - hlCoord 1, 10 + coord hl, 1, 10 call TrainerInfo_DrawTextBox - hlCoord 0, 10 + coord hl, 0, 10 ld a,$d7 call TrainerInfo_DrawVerticalLine - hlCoord 19, 10 + coord hl, 19, 10 call TrainerInfo_DrawVerticalLine - hlCoord 6, 9 + coord hl, 6, 9 ld de,TrainerInfo_BadgesText call PlaceString - hlCoord 2, 2 + coord hl, 2, 2 ld de,TrainerInfo_NameMoneyTimeText call PlaceString - hlCoord 7, 2 + coord hl, 7, 2 ld de,wPlayerName call PlaceString - hlCoord 8, 4 + coord hl, 8, 4 ld de,wPlayerMoney ld c,$e3 call PrintBCDNumber - hlCoord 9, 6 + coord hl, 9, 6 ld de,W_PLAYTIMEHOURS + 1 ; hours ld bc,$4103 call PrintNumber @@ -713,7 +713,7 @@ SwitchPartyMon: ; 13613 (4:7613) SwitchPartyMon_ClearGfx: ; 13625 (4:7625) push af - hlCoord 0, 0 + coord hl, 0, 0 ld bc, SCREEN_WIDTH * 2 call AddNTimes ld c, SCREEN_WIDTH * 2 diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 3f73a84f..75de182b 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -105,7 +105,7 @@ StatusScreen: ; 12953 (4:6953) push af xor a ld [hTilesetType], a - hlCoord 19, 1 + coord hl, 19, 1 ld bc, $060a call DrawLineBox ; Draws the box around name, HP and status ld de, $fffa @@ -113,54 +113,54 @@ StatusScreen: ; 12953 (4:6953) ld [hl], $f2 ; . after No ("." is a different one) dec hl ld [hl], "№" - hlCoord 19, 9 + coord hl, 19, 9 ld bc, $0806 call DrawLineBox ; Draws the box around types, ID No. and OT - hlCoord 10, 9 + coord hl, 10, 9 ld de, Type1Text call PlaceString ; "TYPE1/" - hlCoord 11, 3 + coord hl, 11, 3 predef DrawHP ld hl, wcf25 call GetHealthBarColor ld b, $3 call GoPAL_SET ; SGB palette - hlCoord 16, 6 + coord hl, 16, 6 ld de, wLoadedMonStatus call PrintStatusCondition jr nz, .StatusWritten - hlCoord 16, 6 + coord hl, 16, 6 ld de, OKText call PlaceString ; "OK" .StatusWritten - hlCoord 9, 6 + coord hl, 9, 6 ld de, StatusText call PlaceString ; "STATUS/" - hlCoord 14, 2 + coord hl, 14, 2 call PrintLevel ; Pokémon level ld a, [W_MONHDEXNUM] ld [wd11e], a ld [wd0b5], a predef IndexToPokedex - hlCoord 3, 7 + coord hl, 3, 7 ld de, wd11e ld bc, $8103 ; Zero-padded, 3 call PrintNumber ; Pokémon no. - hlCoord 11, 10 + coord hl, 11, 10 predef PrintMonType ld hl, NamePointers2 call .GetStringPointer ld d, h ld e, l - hlCoord 9, 1 + coord hl, 9, 1 call PlaceString ; Pokémon name ld hl, OTPointers call .GetStringPointer ld d, h ld e, l - hlCoord 12, 16 + coord hl, 12, 16 call PlaceString ; OT - hlCoord 12, 14 + coord hl, 12, 14 ld de, wLoadedMonOTID ld bc, $8205 ; 5 call PrintNumber ; ID Number @@ -168,7 +168,7 @@ StatusScreen: ; 12953 (4:6953) call PrintStatsBox call Delay3 call GBPalNormal - hlCoord 1, 0 + coord hl, 1, 0 call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture ld a, [wcf91] call PlayCry ; play Pokémon cry @@ -247,19 +247,19 @@ PrintStatsBox: ; 12ae4 (4:6ae4) ld a, d and a ; a is 0 from the status screen jr nz, .DifferentBox - hlCoord 0, 8 + coord hl, 0, 8 ld b, $8 ld c, $8 call TextBoxBorder ; Draws the box - hlCoord 1, 9 ; Start printing stats from here + coord hl, 1, 9 ; Start printing stats from here ld bc, $0019 ; Number offset jr .PrintStats .DifferentBox - hlCoord 9, 2 + coord hl, 9, 2 ld b, $8 ld c, $9 call TextBoxBorder - hlCoord 11, 3 + coord hl, 11, 3 ld bc, $0018 .PrintStats push bc @@ -306,16 +306,16 @@ StatusScreen2: ; 12b57 (4:6b57) ld bc, NUM_MOVES call CopyData callab FormatMovesString - hlCoord 9, 2 + coord hl, 9, 2 ld bc, $050a call ClearScreenArea ; Clear under name - hlCoord 19, 3 + coord hl, 19, 3 ld [hl], $78 - hlCoord 0, 8 + coord hl, 0, 8 ld b, $8 ld c, $12 call TextBoxBorder ; Draw move container - hlCoord 2, 9 + coord hl, 2, 9 ld de, wMovesString call PlaceString ; Print moves ld a, [wNumMovesMinusOne] @@ -324,7 +324,7 @@ StatusScreen2: ; 12b57 (4:6b57) ld a, $4 sub c ld b, a ; Number of moves ? - hlCoord 11, 10 + coord hl, 11, 10 ld de, SCREEN_WIDTH * 2 ld a, $72 ; special P tile id call StatusScreen_PrintPP ; Print "PP" @@ -336,7 +336,7 @@ StatusScreen2: ; 12b57 (4:6b57) call StatusScreen_PrintPP ; Fill the rest with -- .InitPP ; 12bbb ld hl, wLoadedMonMoves - deCoord 14, 10 + coord de, 14, 10 ld b, 0 .PrintPP ; 12bc3 ld a, [hli] @@ -386,7 +386,7 @@ StatusScreen2: ; 12b57 (4:6b57) cp $4 jr nz, .PrintPP .PPDone - hlCoord 9, 3 + coord hl, 9, 3 ld de, EXPPointsText call PlaceString ld a, [wLoadedMonLevel] ; level @@ -396,7 +396,7 @@ StatusScreen2: ; 12b57 (4:6b57) inc a ld [wLoadedMonLevel], a ; Increase temporarily if not 100 .Level100 - hlCoord 14, 6 + coord hl, 14, 6 ld [hl], $70 ; 1-tile "to" inc hl inc hl @@ -404,22 +404,22 @@ StatusScreen2: ; 12b57 (4:6b57) pop af ld [wLoadedMonLevel], a ld de, wLoadedMonExp - hlCoord 12, 4 + coord hl, 12, 4 ld bc, $0307 call PrintNumber ; exp call .asm_12c86 ld de, wLoadedMonExp - hlCoord 7, 6 + coord hl, 7, 6 ld bc, $0307 call PrintNumber - hlCoord 9, 0 + coord hl, 9, 0 call StatusScreen_ClearName - hlCoord 9, 1 + coord hl, 9, 1 call StatusScreen_ClearName ld a, [W_MONHDEXNUM] ld [wd11e], a call GetMonName - hlCoord 9, 1 + coord hl, 9, 1 call PlaceString ld a, $1 ld [$ffba], a diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 07cf8854..0f6c6a13 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -17,15 +17,15 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld [wTopMenuItemX], a ld hl, wd730 set 6, [hl] - hlCoord 0, 3 + coord hl, 0, 3 ld b, 8 ld c, 12 call TextBoxBorder call UpdateSprites - hlCoord 2, 5 + coord hl, 2, 5 ld de, DrinkText call PlaceString - hlCoord 9, 6 + coord hl, 9, 6 ld de, DrinkPriceText call PlaceString ld hl, wd730 diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index bd7f672e..c7b2f4d6 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -68,7 +68,7 @@ OakSpeech: ; 6115 (1:6115) ld [wd0b5],a ld [wcf91],a call GetMonHeader - hlCoord 6, 4 + coord hl, 6, 4 call LoadFlippedFrontSpriteByMonIndex call MovePicLeft ld hl,OakSpeechText2 @@ -141,7 +141,7 @@ OakSpeech: ; 6115 (1:6115) ld [MBC1RomBank],a ld c,20 call DelayFrames - hlCoord 6, 5 + coord hl, 6, 5 ld b,7 ld c,7 call ClearScreenArea @@ -224,9 +224,9 @@ IntroDisplayPicCenteredOrUpperRight: ; 62a4 (1:62a4) pop bc ld a,c and a - hlCoord 15, 1 + coord hl, 15, 1 jr nz,.next - hlCoord 6, 4 + coord hl, 6, 4 .next xor a ld [$FFE1],a diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index f881b43b..bdc4d38f 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -66,7 +66,7 @@ HisNameIsText: ; 69e7 (1:69e7) OakSpeechSlidePicLeft: ; 69ec (1:69ec) push de - hlCoord 0, 0 + coord hl, 0, 0 lb bc, 12, 11 call ClearScreenArea ; clear the name list text box ld c, 10 @@ -76,13 +76,13 @@ OakSpeechSlidePicLeft: ; 69ec (1:69ec) ld bc, $b call CopyData call Delay3 - hlCoord 12, 4 + coord hl, 12, 4 lb de, 6, 6 * SCREEN_WIDTH + 5 ld a, $ff jr OakSpeechSlidePicCommon OakSpeechSlidePicRight: ; 6a12 (1:6a12) - hlCoord 5, 4 + coord hl, 5, 4 lb de, 6, 6 * SCREEN_WIDTH + 5 xor a @@ -161,15 +161,15 @@ OakSpeechSlidePicCommon: ; 6a19 (1:6a19) DisplayIntroNameTextBox: ; 6a6c (1:6a6c) push de - hlCoord 0, 0 + coord hl, 0, 0 ld b, $a ld c, $9 call TextBoxBorder - hlCoord 3, 0 + coord hl, 3, 0 ld de, .namestring call PlaceString pop de - hlCoord 2, 2 + coord hl, 2, 2 call PlaceString call UpdateSprites xor a diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index 3d39ad6b..18ce23ed 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -20,7 +20,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) dec l ld b, l ld c, $d - hlCoord 0, 0 + coord hl, 0, 0 call TextBoxBorder call UpdateSprites call Func_610c2 @@ -101,7 +101,7 @@ Func_610c2: ; 610c2 (18:50c2) push hl ld [wd11e], a call GetItemName - hlCoord 2, 2 + coord hl, 2, 2 ld a, [$ffdb] ld bc, SCREEN_WIDTH * 2 call AddNTimes diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index c85a4174..89b09bba 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -704,7 +704,7 @@ GetTileSpriteStandsOn: ; 5207 (1:5207) add SCREEN_WIDTH ; screen X tile + 20 ld d, $0 ld e, a - hlCoord 0, 0 + coord hl, 0, 0 add hl, bc add hl, bc add hl, bc diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index e6fdfc92..ebc99eed 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -84,7 +84,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld hl,PokemartTellSellPriceText ld bc,$0e01 call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc,$080f ld a,TWO_OPTION_MENU ld [wTextBoxID],a @@ -162,7 +162,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) call CopyStringToCF4B ; copy name to wcf4b ld hl,PokemartTellBuyPriceText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc,$080f ld a,TWO_OPTION_MENU ld [wTextBoxID],a diff --git a/engine/save.asm b/engine/save.asm index 6dc1a46c..56468595 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -151,10 +151,10 @@ SaveSAV: ; 7370a (1c:770a) ret nz .save call SaveSAVtoSRAM - hlCoord 1, 13 + coord hl, 1, 13 ld bc,$0412 call ClearScreenArea ; clear area 4x12 starting at 13,1 - hlCoord 1, 14 + coord hl, 1, 14 ld de,NowSavingString call PlaceString ld c,120 @@ -172,7 +172,7 @@ NowSavingString: SaveSAVConfirm: ; 73768 (1c:7768) call PrintText - hlCoord 0, 7 + coord hl, 0, 7 ld bc,$0801 ld a,TWO_OPTION_MENU ld [wTextBoxID],a @@ -426,20 +426,20 @@ Func_7393f: ; 7393f (1c:793f) and $7f ld [wCurrentMenuItem], a ld [wLastMenuItem], a - hlCoord 0, 0 + coord hl, 0, 0 ld b, $2 ld c, $9 call TextBoxBorder ld hl, ChooseABoxText call PrintText - hlCoord 11, 0 + coord hl, 11, 0 ld b, $c ld c, $7 call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] ld de, BoxNames - hlCoord 13, 1 + coord hl, 13, 1 call PlaceString ld hl, hFlags_0xFFF6 res 2, [hl] @@ -448,7 +448,7 @@ Func_7393f: ; 7393f (1c:793f) cp 9 jr c, .asm_739a6 sub 9 - hlCoord 8, 2 + coord hl, 8, 2 ld [hl], "1" add "0" jr .asm_739a8 @@ -456,11 +456,11 @@ Func_7393f: ; 7393f (1c:793f) add "1" .asm_739a8 Coorda 9, 2 - hlCoord 1, 2 + coord hl, 1, 2 ld de, BoxNoText call PlaceString call Func_73a84 - hlCoord 18, 1 + coord hl, 18, 1 ld de, wWhichTrade ld bc, SCREEN_WIDTH ld a, $c diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 9a4c85da..ea1eb315 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -79,11 +79,11 @@ MainSlotMachineLoop: ; 37395 (d:7395) ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld [wMenuWatchMovingOutOfBounds], a - hlCoord 14, 11 + coord hl, 14, 11 ld b, 5 ld c, 4 call TextBoxBorder - hlCoord 16, 12 + coord hl, 16, 12 ld de, CoinMultiplierSlotMachineText call PlaceString call HandleMenuInput @@ -133,7 +133,7 @@ MainSlotMachineLoop: ; 37395 (d:7395) .skip2 ld hl, OneMoreGoSlotMachineText call PrintText - hlCoord 14, 12 + coord hl, 14, 12 ld bc, $0d0f xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a @@ -614,7 +614,7 @@ YeahText: ; 37722 (d:7722) SlotMachine_PrintWinningSymbol: ; 37728 (d:7728) ; prints winning symbol and down arrow in text box - hlCoord 2, 14 + coord hl, 2, 14 ld a, [wSlotMachineWinningSymbol] add $25 ld [hli], a @@ -626,7 +626,7 @@ SlotMachine_PrintWinningSymbol: ; 37728 (d:7728) ld [hli], a inc a ld [hl], a - hlCoord 18, 16 + coord hl, 18, 16 ld [hl], $ee ; down arrow ret @@ -641,13 +641,13 @@ SlotMachine_SubtractBetFromPlayerCoins: ; 37741 (d:7741) predef SubBCDPredef SlotMachine_PrintCreditCoins: ; 37754 (d:7754) - hlCoord 5, 1 + coord hl, 5, 1 ld de, wPlayerCoins ld c, $2 jp PrintBCDNumber SlotMachine_PrintPayoutCoins: ; 3775f (d:775f) - hlCoord 11, 1 + coord hl, 11, 1 ld de, wPayoutCoins ld bc, $8204 ; 2 bytes, 4 digits, leading zeroes jp PrintNumber @@ -724,19 +724,19 @@ SlotMachine_LightBalls: ; 377d5 (d:77d5) jr z, SlotMachine_UpdateTwoCoinBallTiles SlotMachine_UpdateThreeCoinBallTiles: ; 377e3 (d:77e3) - hlCoord 3, 2 + coord hl, 3, 2 call SlotMachine_UpdateBallTiles - hlCoord 3, 10 + coord hl, 3, 10 call SlotMachine_UpdateBallTiles SlotMachine_UpdateTwoCoinBallTiles: ; 377ef (d:77ef) - hlCoord 3, 4 + coord hl, 3, 4 call SlotMachine_UpdateBallTiles - hlCoord 3, 8 + coord hl, 3, 8 call SlotMachine_UpdateBallTiles SlotMachine_UpdateOneCoinBallTiles: ; 377fb (d:77fb) - hlCoord 3, 6 + coord hl, 3, 6 SlotMachine_UpdateBallTiles: ; 377fe (d:77fe) ld a, [wd08a] @@ -863,7 +863,7 @@ LoadSlotMachineTiles: ; 378a8 (d:78a8) ld a, BANK(SlotMachineTiles2) call FarCopyData2 ld hl, SlotMachineMap - deCoord 0, 0 + coord de, 0, 0 ld bc, $00f0 call CopyData call EnableLCD diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 74f7ad61..3a4e2e4c 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -70,7 +70,7 @@ ENDC call ClearBothBGMaps ; place tiles for pokemon logo (except for the last row) - hlCoord 2, 1 + coord hl, 2, 1 ld a, $80 ld de, SCREEN_WIDTH ld c, 6 @@ -88,7 +88,7 @@ ENDC jr nz, .pokemonLogoTileLoop ; place tiles for the last row of the pokemon logo - hlCoord 2, 7 + coord hl, 2, 7 ld a, $31 ld b, $10 .pokemonLogoLastTileRowLoop @@ -105,7 +105,7 @@ ENDC ld [hl], a ; place tiles for title screen copyright - hlCoord 2, 17 + coord hl, 2, 17 ld de, .tileScreenCopyrightTiles ld b, $10 .tileScreenCopyrightTilesLoop @@ -362,7 +362,7 @@ ClearBothBGMaps: ; 4519 (1:4519) LoadTitleMonSprite: ; 4524 (1:4524) ld [wcf91], a ld [wd0b5], a - hlCoord 5, 10 + coord hl, 5, 10 call GetMonHeader jp LoadFrontSpriteByMonIndex @@ -381,7 +381,7 @@ LoadCopyrightTiles: ; 4541 (1:4541) ld hl, vChars2 + $600 ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c call CopyVideoData - hlCoord 2, 7 + coord hl, 2, 7 ld de, CopyrightTextString jp PlaceString @@ -395,7 +395,7 @@ INCLUDE "data/title_mons.asm" ; prints version text (red, blue) PrintGameVersionOnTitleScreen: ; 4598 (1:4598) - hlCoord 7, 8 + coord hl, 7, 8 ld de, VersionOnTitleScreenText jp PlaceString diff --git a/engine/town_map.asm b/engine/town_map.asm index a92f49e4..302efa0f 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -11,7 +11,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) push af ld b, $0 call DrawPlayerOrBirdSprite ; player sprite - hlCoord 1, 0 + coord hl, 1, 0 ld de, wcd6d call PlaceString ld hl, wOAMBuffer @@ -28,7 +28,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) jr .enterLoop .townMapLoop - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $114 call ClearScreenArea ld hl, TownMapOrder @@ -55,7 +55,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) inc de cp $50 jr nz, .copyMapName - hlCoord 1, 0 + coord hl, 1, 0 ld de, wcd6d call PlaceString ld hl, wOAMBuffer + $10 @@ -117,7 +117,7 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60) push hl call DisplayWildLocations call GetMonName - hlCoord 1, 0 + coord hl, 1, 0 call PlaceString ld h, b ld l, c @@ -152,34 +152,34 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) push af ld [hl], $ff push hl - hlCoord 0, 0 + coord hl, 0, 0 ld de, ToText call PlaceString ld a, [W_CURMAP] ld b, $0 call DrawPlayerOrBirdSprite ld hl, wFlyLocationsList - deCoord 18, 0 + coord de, 18, 0 .townMapFlyLoop ld a, $7f ld [de], a push hl push hl - hlCoord 3, 0 + coord hl, 3, 0 ld bc, $10f call ClearScreenArea pop hl ld a, [hl] ld b, $4 call DrawPlayerOrBirdSprite ; draw bird sprite - hlCoord 3, 0 + coord hl, 3, 0 ld de, wcd6d call PlaceString ld c, 15 call DelayFrames - hlCoord 18, 0 + coord hl, 18, 0 ld [hl], $ed - hlCoord 19, 0 + coord hl, 19, 0 ld [hl], $ee pop hl .inputLoop @@ -218,7 +218,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) ld [hl], a ret .pressedUp - deCoord 18, 0 + coord de, 18, 0 inc hl ld a, [hl] cp $ff @@ -230,7 +230,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) ld hl, wFlyLocationsList jp .townMapFlyLoop .pressedDown - deCoord 19, 0 + coord de, 19, 0 dec hl ld a, [hl] cp $ff @@ -276,7 +276,7 @@ LoadTownMap: ; 7109b (1c:509b) call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites - hlCoord 0, 0 + coord hl, 0, 0 ld b, $12 ld c, $12 call TextBoxBorder @@ -291,7 +291,7 @@ LoadTownMap: ; 7109b (1c:509b) ld bc, $8 ld a, BANK(MonNestIcon) call FarCopyDataDouble - hlCoord 0, 0 + coord hl, 0, 0 ld de, CompressedMap .nextTile ld a, [de] @@ -394,11 +394,11 @@ DisplayWildLocations: ; 711ef (1c:51ef) and a ; were any OAM entries written? jr nz, .drawPlayerSprite ; if no OAM entries were written, print area unknown text - hlCoord 1, 7 + coord hl, 1, 7 ld b, $2 ld c, $f call TextBoxBorder - hlCoord 2, 9 + coord hl, 2, 9 ld de, AreaUnknownText call PlaceString jr .done diff --git a/engine/trade.asm b/engine/trade.asm index 37ff5c05..531085b9 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -148,7 +148,7 @@ Trade_Delay80: ; 41191 (10:5191) jp DelayFrames Trade_ClearTileMap: ; 41196 (10:5196) - hlCoord 0, 0 + coord hl, 0, 0 ld bc, 20 * 18 ld a, " " jp FillMemory @@ -234,7 +234,7 @@ Trade_ShowPlayerMon: ; 41245 (10:5245) ld [hSCX], a xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 4, 0 + coord hl, 4, 0 ld b, 6 ld c, 10 call TextBoxBorder @@ -283,7 +283,7 @@ Trade_DrawOpenEndOfLinkCable: ; 41298 (10:5298) call DelayFrame ld a, %10001011 ld [rLCDC], a - hlCoord 6, 2 + coord hl, 6, 2 ld b, $7 ; open end of link cable tile ID list index call CopyTileIDsFromList_ZeroBaseTileID call Trade_CopyTileMapToVRAM @@ -355,7 +355,7 @@ Trade_ShowEnemyMon: ; 41336 (10:5336) ld a, TRADE_BALL_TILT_ANIM call Trade_ShowAnimation call Trade_ShowClearedWindow - hlCoord 4, 10 + coord hl, 4, 10 ld b, 6 ld c, 10 call TextBoxBorder @@ -372,7 +372,7 @@ Trade_ShowEnemyMon: ; 41336 (10:5336) ld a, [wTradedEnemyMonSpecies] call PlayCry call Trade_Delay100 - hlCoord 4, 10 + coord hl, 4, 10 ld bc, $80c call ClearScreenArea jp PrintTradeTakeCareText @@ -464,7 +464,7 @@ Trade_DrawLeftGameboy: ; 4142d (10:542d) call Trade_ClearTileMap ; draw link cable - hlCoord 11, 4 + coord hl, 11, 4 ld a, $5d ld [hli], a ld a, $5e @@ -475,16 +475,16 @@ Trade_DrawLeftGameboy: ; 4142d (10:542d) jr nz, .loop ; draw gameboy pic - hlCoord 5, 3 + coord hl, 5, 3 ld b, $6 call CopyTileIDsFromList_ZeroBaseTileID ; draw text box with player name below gameboy pic - hlCoord 4, 12 + coord hl, 4, 12 ld b, 2 ld c, 7 call TextBoxBorder - hlCoord 5, 14 + coord hl, 5, 14 ld de, wPlayerName call PlaceString @@ -494,7 +494,7 @@ Trade_DrawRightGameboy: ; 4145c (10:545c) call Trade_ClearTileMap ; draw horizontal segment of link cable - hlCoord 0, 4 + coord hl, 0, 4 ld a, $5e ld c, $e .loop @@ -522,16 +522,16 @@ Trade_DrawRightGameboy: ; 4145c (10:545c) ld [hl], a ; draw gameboy pic - hlCoord 7, 8 + coord hl, 7, 8 ld b, $6 call CopyTileIDsFromList_ZeroBaseTileID ; draw text box with enemy name above link cable - hlCoord 6, 0 + coord hl, 6, 0 ld b, $2 ld c, $7 call TextBoxBorder - hlCoord 7, 2 + coord hl, 7, 2 ld de, wLinkEnemyTrainerName call PlaceString @@ -540,7 +540,7 @@ Trade_DrawRightGameboy: ; 4145c (10:545c) Trade_DrawCableAcrossScreen: ; 4149f (10:549f) ; Draws the link cable across the screen. call Trade_ClearTileMap - hlCoord 0, 4 + coord hl, 0, 4 ld a, $5e ld c, SCREEN_WIDTH .loop @@ -553,7 +553,7 @@ Trade_CopyCableTilesOffScreen: ; 414ae (10:54ae) ; This is used to copy the link cable tiles off screen so that the cable ; continues when the screen is scrolled. push hl - hlCoord 0, 4 + coord hl, 0, 4 call CopyToScreenEdgeTiles pop hl ld a, h @@ -737,7 +737,7 @@ Trade_LoadMonSprite: ; 415a4 (10:55a4) xor $1 ld [H_AUTOBGTRANSFERENABLED], a call GetMonHeader - hlCoord 7, 2 + coord hl, 7, 2 call LoadFlippedFrontSpriteByMonIndex ld c, 10 jp DelayFrames diff --git a/engine/trade2.asm b/engine/trade2.asm index da199e77..d7a16716 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -1,43 +1,43 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) - hlCoord 5, 0 + coord hl, 5, 0 ld de,Trade_MonInfoText call PlaceString ld a,[wTradedPlayerMonSpecies] ld [wd11e],a predef IndexToPokedex - hlCoord 9, 0 + coord hl, 9, 0 ld de,wd11e ld bc,$8103 call PrintNumber - hlCoord 5, 2 + coord hl, 5, 2 ld de,wcf4b call PlaceString - hlCoord 8, 4 + coord hl, 8, 4 ld de,wTradedPlayerMonOT call PlaceString - hlCoord 8, 6 + coord hl, 8, 6 ld de,wTradedPlayerMonOTID ld bc,$8205 jp PrintNumber Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) - hlCoord 5, 10 + coord hl, 5, 10 ld de,Trade_MonInfoText call PlaceString ld a,[wTradedEnemyMonSpecies] ld [wd11e],a predef IndexToPokedex - hlCoord 9, 10 + coord hl, 9, 10 ld de,wd11e ld bc,$8103 call PrintNumber - hlCoord 5, 12 + coord hl, 5, 12 ld de,wcd6d call PlaceString - hlCoord 8, 14 + coord hl, 8, 14 ld de,wTradedEnemyMonOT call PlaceString - hlCoord 8, 16 + coord hl, 8, 16 ld de,wTradedEnemyMonOTID ld bc,$8205 jp PrintNumber diff --git a/home.asm b/home.asm index f9004e7e..1b910054 100644 --- a/home.asm +++ b/home.asm @@ -1405,7 +1405,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6) call DisplayTextBoxID ; draw the menu text box call UpdateSprites ; disable sprites behind the text box ; the code up to .skipMovingSprites appears to be useless - hlCoord 4, 2 ; coordinates of upper left corner of menu text box + coord hl, 4, 2 ; coordinates of upper left corner of menu text box ld de,$090e ; height and width of menu text box ld a,[wListMenuID] and a ; is it a PC pokemon list? @@ -1446,7 +1446,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) call DelayFrames xor a ld [wCurrentMenuItem],a - hlCoord 5, 4 + coord hl, 5, 4 ld a,l ld [wMenuCursorLocation],a ld a,h @@ -1568,23 +1568,23 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ; text box dimensions/coordinates for just quantity - hlCoord 15, 9 + coord hl, 15, 9 ld b,1 ; height ld c,3 ; width ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.drawTextBox ; text box dimensions/coordinates for quantity and price - hlCoord 7, 9 + coord hl, 7, 9 ld b,1 ; height ld c,11 ; width .drawTextBox call TextBoxBorder - hlCoord 16, 10 + coord hl, 16, 10 ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.printInitialQuantity - hlCoord 8, 10 + coord hl, 8, 10 .printInitialQuantity ld de,InitialQuantityText call PlaceString @@ -1624,7 +1624,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ld a,[wMaxItemQuantity] ld [hl],a .handleNewQuantity - hlCoord 17, 10 + coord hl, 17, 10 ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.printQuantity @@ -1663,13 +1663,13 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ld a,[hDivideBCDQuotient + 2] ld [hMoney + 2],a .skipHalvingPrice - hlCoord 12, 10 + coord hl, 12, 10 ld de,SpacesBetweenQuantityAndPriceText call PlaceString ld de,hMoney ; total price ld c,$a3 call PrintBCDNumber - hlCoord 9, 10 + coord hl, 9, 10 .printQuantity ld de,wItemQuantity ; current quantity ld bc,$8102 ; print leading zeroes, 1 byte, 2 digits @@ -1708,7 +1708,7 @@ ExitListMenu:: ; 2e3b (0:2e3b) ret PrintListMenuEntries:: ; 2e5a (0:2e5a) - hlCoord 5, 3 + coord hl, 5, 3 ld b,$09 ld c,$0e call ClearScreenArea @@ -1733,7 +1733,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) jr nc,.noCarry inc d .noCarry - hlCoord 6, 4 ; coordinates of first list entry name + coord hl, 6, 4 ; coordinates of first list entry name ld b,4 ; print 4 names .loop ld a,b @@ -3011,7 +3011,7 @@ Func_35f4:: ; 35f4 (0:35f4) InitYesNoTextBoxParameters:: ; 35ff (0:35ff) xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ret @@ -3019,7 +3019,7 @@ YesNoChoicePokeCenter:: ; 360a (0:360a) call SaveScreenTilesToBuffer1 ld a, HEAL_CANCEL_MENU ld [wTwoOptionMenuID], a - hlCoord 11, 6 + coord hl, 11, 6 ld bc, $80c jr DisplayYesNoChoice @@ -3027,7 +3027,7 @@ Func_361a:: ; 361a (0:361a) call SaveScreenTilesToBuffer1 ld a, WIDE_YES_NO_MENU ld [wTwoOptionMenuID], a - hlCoord 12, 7 + coord hl, 12, 7 ld bc, $080d DisplayYesNoChoice:: ; 3628 (0:3628) ld a, TWO_OPTION_MENU @@ -3176,7 +3176,7 @@ UncompressSpriteFromDE:: ; 36eb (0:36eb) SaveScreenTilesToBuffer2:: ; 36f4 (0:36f4) - hlCoord 0, 0 + coord hl, 0, 0 ld de, wTileMapBackup2 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyData @@ -3193,13 +3193,13 @@ LoadScreenTilesFromBuffer2DisableBGTransfer:: ; 3709 (0:3709) xor a ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup2 - deCoord 0, 0 + coord de, 0, 0 ld bc, $168 call CopyData ret SaveScreenTilesToBuffer1:: ; 3719 (0:3719) - hlCoord 0, 0 + coord hl, 0, 0 ld de, wTileMapBackup ld bc, SCREEN_WIDTH * SCREEN_HEIGHT jp CopyData @@ -3208,7 +3208,7 @@ LoadScreenTilesFromBuffer1:: ; 3725 (0:3725) xor a ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup - deCoord 0, 0 + coord de, 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyData ld a, $1 @@ -3470,7 +3470,7 @@ WaitForTextScrollButtonPress:: ; 3865 (0:3865) jr z, .skipAnimation call TownMapSpriteBlinkingAnimation .skipAnimation - hlCoord 18, 16 + coord hl, 18, 16 call HandleDownArrowBlinkTiming pop hl call JoypadLowSensitivity @@ -3946,7 +3946,7 @@ HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2) and a ; was a key pressed? jr nz,.keyPressed push hl - hlCoord 18, 11 ; coordinates of blinking down arrow in some menus + coord hl, 18, 11 ; coordinates of blinking down arrow in some menus call HandleDownArrowBlinkTiming ; blink down arrow (if any) pop hl ld a,[wMenuJoypadPollCount] @@ -4037,7 +4037,7 @@ PlaceMenuCursor:: ; 3b7c (0:3b7c) ld a,[wTopMenuItemY] and a ; is the y coordinate 0? jr z,.adjustForXCoord - hlCoord 0, 0 + coord hl, 0, 0 ld bc,SCREEN_WIDTH .topMenuItemLoop add hl,bc @@ -4207,7 +4207,7 @@ PrintText:: ; 3c49 (0:3c49) call Delay3 pop hl Func_3c59:: ; 3c59 (0:3c59) - bcCoord 1, 14 + coord bc, 1, 14 jp TextCommandProcessor diff --git a/home/copy2.asm b/home/copy2.asm index f872ebbc..3f7a4400 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -184,17 +184,17 @@ CopyScreenTileBufferToVRAM:: ld c, 6 ld hl, $600 * 0 - deCoord 0, 6 * 0 + coord de, 0, 6 * 0 call .setup call DelayFrame ld hl, $600 * 1 - deCoord 0, 6 * 1 + coord de, 0, 6 * 1 call .setup call DelayFrame ld hl, $600 * 2 - deCoord 0, 6 * 2 + coord de, 0, 6 * 2 call .setup jp DelayFrame @@ -217,7 +217,7 @@ ClearScreen:: ; for the bg map to update. ld bc, 20 * 18 inc b - hlCoord 0, 0 + coord hl, 0, 0 ld a, $7f .loop ld [hli], a diff --git a/home/overworld.asm b/home/overworld.asm index da514763..0485335a 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1420,7 +1420,7 @@ LoadCurrentMapView:: ; 0caa (0:0caa) ld bc,$0002 add hl,bc .copyToVisibleAreaBuffer - deCoord 0, 0 ; base address for the tiles that are directly transfered to VRAM during V-blank + coord de, 0, 0 ; base address for the tiles that are directly transfered to VRAM during V-blank ld b, SCREEN_HEIGHT .rowLoop2 ld c, SCREEN_WIDTH @@ -1693,7 +1693,7 @@ MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85) ; the portion of the map that was newly exposed due to the player's movement ScheduleNorthRowRedraw:: ; 0e91 (0:0e91) - hlCoord 0, 0 + coord hl, 0, 0 call CopyToScreenEdgeTiles ld a,[wMapViewVRAMPointer] ld [H_SCREENEDGEREDRAWADDR],a @@ -1715,7 +1715,7 @@ CopyToScreenEdgeTiles:: ; 0ea6 (0:0ea6) ret ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2) - hlCoord 0, 16 + coord hl, 0, 16 call CopyToScreenEdgeTiles ld a,[wMapViewVRAMPointer] ld l,a @@ -1734,7 +1734,7 @@ ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2) ret ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3) - hlCoord 18, 0 + coord hl, 18, 0 call ScheduleColumnRedrawHelper ld a,[wMapViewVRAMPointer] ld c,a @@ -1772,7 +1772,7 @@ ScheduleColumnRedrawHelper:: ; 0ef2 (0:0ef2) ret ScheduleWestColumnRedraw:: ; 0f08 (0:0f08) - hlCoord 0, 0 + coord hl, 0, 0 call ScheduleColumnRedrawHelper ld a,[wMapViewVRAMPointer] ld [H_SCREENEDGEREDRAWADDR],a @@ -2323,7 +2323,7 @@ LoadMapData:: ; 1241 (0:1241) call LoadTilesetTilePatternData call LoadCurrentMapView ; copy current map view to VRAM - hlCoord 0, 0 + coord hl, 0, 0 ld de,vBGMap0 ld b,18 .vramCopyLoop diff --git a/home/text.asm b/home/text.asm index ebdc83f4..7eb5148b 100644 --- a/home/text.asm +++ b/home/text.asm @@ -76,7 +76,7 @@ PlaceNextChar:: ; 1956 (0:1956) cp $4F jr nz,.next3 pop hl - hlCoord 1, 16 + coord hl, 1, 16 push hl jp PlaceNextChar_inc @@ -290,13 +290,13 @@ Char51:: ; 1ab4 (0:1ab4) Coorda 18, 16 call ProtectedDelay3 call ManualTextScroll - hlCoord 1, 13 + coord hl, 1, 13 ld bc,$0412 call ClearScreenArea ld c,20 call DelayFrames pop de - hlCoord 1, 14 + coord hl, 1, 14 jp PlaceNextChar_inc Char49:: ; 1ad5 (0:1ad5) @@ -305,14 +305,14 @@ Char49:: ; 1ad5 (0:1ad5) Coorda 18, 16 call ProtectedDelay3 call ManualTextScroll - hlCoord 1, 10 + coord hl, 1, 10 ld bc,$0712 call ClearScreenArea ld c,20 call DelayFrames pop de pop hl - hlCoord 1, 11 + coord hl, 1, 11 push hl jp PlaceNextChar_inc @@ -330,13 +330,13 @@ Char4C:: ; 1b0a (0:1b0a) push de call Next1B18 call Next1B18 - hlCoord 1, 16 + coord hl, 1, 16 pop de jp PlaceNextChar_inc Next1B18:: ; 1b18 (0:1b18) - hlCoord 0, 14 - deCoord 0, 13 + coord hl, 0, 14 + coord de, 0, 13 ld b,60 .next ld a,[hli] @@ -344,7 +344,7 @@ Next1B18:: ; 1b18 (0:1b18) inc de dec b jr nz,.next - hlCoord 1, 16 + coord hl, 1, 16 ld a, " " ld b,SCREEN_WIDTH - 2 .next2 @@ -499,7 +499,7 @@ TextCommand03:: ; 1bb7 (0:1bb7) ; (no arguments) TextCommand05:: ; 1bc5 (0:1bc5) pop hl - bcCoord 1, 16 ; address of second line of dialogue text box + coord bc, 1, 16 ; address of second line of dialogue text box jp NextTextCommand ; blink arrow and wait for A or B to be pressed @@ -528,7 +528,7 @@ TextCommand07:: ; 1be7 (0:1be7) call Next1B18 ; scroll up text call Next1B18 pop hl - bcCoord 1, 16 ; address of second line of dialogue text box + coord bc, 1, 16 ; address of second line of dialogue text box jp NextTextCommand ; execute asm inline diff --git a/home/vcopy.asm b/home/vcopy.asm index d42293d9..e90accb5 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -130,7 +130,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57) dec a jr z,.transferMiddleThird .transferBottomThird - hlCoord 0, 12 + coord hl, 0, 12 ld sp,hl ld a,[H_AUTOBGTRANSFERDEST + 1] ld h,a @@ -141,7 +141,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57) xor a ; TRANSFERTOP jr .doTransfer .transferTopThird - hlCoord 0, 0 + coord hl, 0, 0 ld sp,hl ld a,[H_AUTOBGTRANSFERDEST + 1] ld h,a @@ -150,7 +150,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57) ld a,TRANSFERMIDDLE jr .doTransfer .transferMiddleThird - hlCoord 0, 6 + coord hl, 0, 6 ld sp,hl ld a,[H_AUTOBGTRANSFERDEST + 1] ld h,a diff --git a/macros.asm b/macros.asm index a25c0006..10317246 100644 --- a/macros.asm +++ b/macros.asm @@ -67,22 +67,11 @@ bcd3: MACRO coins equs "bcd2" money equs "bcd3" -;\1 = X -;\2 = Y -hlCoord: MACRO - ld hl, wTileMap + 20 * \2 + \1 - ENDM - -;\1 = X -;\2 = Y -deCoord: MACRO - ld de, wTileMap + 20 * \2 + \1 - ENDM - -;\1 = X -;\2 = Y -bcCoord: MACRO - ld bc, wTileMap + 20 * \2 + \1 +;\1 = r +;\2 = X +;\3 = Y +coord: MACRO + ld \1, wTileMap + 20 * \3 + \2 ENDM ;\1 = X diff --git a/main.asm b/main.asm index 9ceb5f81..08747a5a 100755 --- a/main.asm +++ b/main.asm @@ -158,7 +158,7 @@ INCLUDE "engine/overworld/oam.asm" INCLUDE "engine/oam_dma.asm" PrintWaitingText: - hlCoord 3, 10 + coord hl, 3, 10 ld b, $1 ld c, $b ld a, [W_ISINBATTLE] @@ -169,7 +169,7 @@ PrintWaitingText: .asm_4c17 call CableClub_TextBoxBorder .asm_4c1a - hlCoord 4, 11 + coord hl, 4, 11 ld de, WaitingText call PlaceString ld c, 50 @@ -1005,18 +1005,18 @@ DisplayTextIDInit: ; 7096 (1:7096) ld a,[wd74b] bit 5,a ; does the player have the pokedex? ; start menu with pokedex - hlCoord 10, 0 + coord hl, 10, 0 ld b,$0e ld c,$08 jr nz,.drawTextBoxBorder ; start menu without pokedex - hlCoord 10, 0 + coord hl, 10, 0 ld b,$0c ld c,$08 jr .drawTextBoxBorder ; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box .notStartMenu - hlCoord 0, 12 + coord hl, 0, 12 ld b,$04 ld c,$12 .drawTextBoxBorder @@ -1074,12 +1074,12 @@ DrawStartMenu: ; 710b (1:710b) ld a,[wd74b] bit 5,a ; does the player have the pokedex? ; menu with pokedex - hlCoord 10, 0 + coord hl, 10, 0 ld b,$0e ld c,$08 jr nz,.drawTextBoxBorder ; shorter menu if the player doesn't have the pokedex - hlCoord 10, 0 + coord hl, 10, 0 ld b,$0c ld c,$08 .drawTextBoxBorder @@ -1097,7 +1097,7 @@ DrawStartMenu: ; 710b (1:710b) ld [wMenuWatchMovingOutOfBounds],a ld hl,wd730 set 6,[hl] ; no pauses between printing each letter - hlCoord 12, 2 + coord hl, 12, 2 ld a,[wd74b] bit 5,a ; does the player have the pokedex? ; case for not having pokdex @@ -1276,7 +1276,7 @@ GetTextBoxIDText: ; 7367 (1:7367) ; hl = address of upper left corner of text box GetAddressOfScreenCoords: ; 7375 (1:7375) push bc - hlCoord 0, 0 + coord hl, 0, 0 ld bc,20 .loop ; loop to add d rows to the base address ld a,d @@ -1437,11 +1437,11 @@ DisplayMoneyBox: ; 74ba (1:74ba) ld a, MONEY_BOX_TEMPLATE ld [wTextBoxID], a call DisplayTextBoxID - hlCoord 13, 1 + coord hl, 13, 1 ld b, $1 ld c, $6 call ClearScreenArea - hlCoord 12, 1 + coord hl, 12, 1 ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber @@ -1734,14 +1734,14 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) jr nz, .fieldMovesExist ; no field moves - hlCoord 11, 11 + coord hl, 11, 11 ld b, 5 ld c, 7 call TextBoxBorder call UpdateSprites ld a, 12 ld [hFieldMoveMonMenuTopMenuItemX], a - hlCoord 13, 12 + coord hl, 13, 12 ld de, PokemonMenuEntries jp PlaceString @@ -1750,7 +1750,7 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) ; Calculate the text box position and dimensions based on the leftmost X coord ; of the field move names before adjusting for the number of field moves. - hlCoord 0, 11 + coord hl, 0, 11 ld a, [wFieldMovesLeftmostXCoord] dec a ld e, a @@ -1781,7 +1781,7 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) call UpdateSprites ; Calculate the position of the first field move name to print. - hlCoord 0, 12 + coord hl, 0, 12 ld a, [wFieldMovesLeftmostXCoord] inc a ld e, a @@ -1830,7 +1830,7 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) pop hl ld a, [wFieldMovesLeftmostXCoord] ld [hFieldMoveMonMenuTopMenuItemX], a - hlCoord 0, 12 + coord hl, 0, 12 ld a, [wFieldMovesLeftmostXCoord] inc a ld e, a @@ -2316,28 +2316,28 @@ PrintSafariZoneSteps: ; c52f (3:452f) ret c cp UNKNOWN_DUNGEON_2 ret nc - hlCoord 0, 0 + coord hl, 0, 0 ld b, $3 ld c, $7 call TextBoxBorder - hlCoord 1, 1 + coord hl, 1, 1 ld de, wSafariSteps ld bc, $203 call PrintNumber - hlCoord 4, 1 + coord hl, 4, 1 ld de, SafariSteps call PlaceString - hlCoord 1, 3 + coord hl, 1, 3 ld de, SafariBallText call PlaceString ld a, [W_NUMSAFARIBALLS] cp $a jr nc, .asm_c56d - hlCoord 5, 3 + coord hl, 5, 3 ld a, $7f ld [hl], a .asm_c56d - hlCoord 6, 3 + coord hl, 6, 3 ld de, W_NUMSAFARIBALLS ld bc, $102 jp PrintNumber @@ -3025,11 +3025,11 @@ DrawBadges: ; ea03 (3:6a03) ld [hli], a ld [hl], $60 ; First name - hlCoord 2, 11 + coord hl, 2, 11 ld de, wTempObtainedBadgesBooleans call .DrawBadgeRow - hlCoord 2, 14 + coord hl, 2, 14 ld de, wTempObtainedBadgesBooleans + 4 ; call .DrawBadgeRow ; ret diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 55ceb5cc..6779d9f6 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -51,15 +51,15 @@ BikeShopText1: ; 1d745 (7:5745) ld [wTopMenuItemX], a ld hl, wd730 set 6, [hl] - hlCoord 0, 0 + coord hl, 0, 0 ld b, $4 ld c, $f call TextBoxBorder call UpdateSprites - hlCoord 2, 2 + coord hl, 2, 2 ld de, BikeShopMenuText call PlaceString - hlCoord 8, 3 + coord hl, 8, 3 ld de, BikeShopMenuPrice call PlaceString ld hl, BikeShopText_1d815 diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index b9c006d1..519c0c67 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -480,32 +480,32 @@ CeladonGameCornerText_48f19: ; 48f19 (12:4f19) CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) ld hl, wd730 set 6, [hl] - hlCoord 11, 0 + coord hl, 11, 0 ld b, $5 ld c, $7 call TextBoxBorder call UpdateSprites - hlCoord 12, 1 + coord hl, 12, 1 ld b, $4 ld c, $7 call ClearScreenArea - hlCoord 12, 2 + coord hl, 12, 2 ld de, GameCornerMoneyText call PlaceString - hlCoord 12, 3 + coord hl, 12, 3 ld de, GameCornerBlankText1 call PlaceString - hlCoord 12, 3 + coord hl, 12, 3 ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber - hlCoord 12, 4 + coord hl, 12, 4 ld de, GameCornerCoinText call PlaceString - hlCoord 12, 5 + coord hl, 12, 5 ld de, GameCornerBlankText2 call PlaceString - hlCoord 15, 5 + coord hl, 15, 5 ld de, wPlayerCoins ld c, $82 call PrintBCDNumber diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 8b6ff60f..b0afbee0 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -63,7 +63,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) dec l ld b, l ld c, $c - hlCoord 0, 0 + coord hl, 0, 0 call TextBoxBorder call UpdateSprites call CeladonMartRoofScript_48532 @@ -200,7 +200,7 @@ CeladonMartRoofScript_48532: ; 48532 (12:4532) push hl ld [wd11e], a call GetItemName - hlCoord 2, 2 + coord hl, 2, 2 ld a, [$ffdb] ld bc, SCREEN_WIDTH * 2 call AddNTimes diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 361f4997..a8cf3b8d 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -53,7 +53,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) call DelayFrames ld b, $9c call CopyScreenTileBufferToVRAM - hlCoord 0, 10 + coord hl, 0, 10 ld bc, $0078 ld a, $14 call FillMemory -- cgit v1.3.1-sl0p From c169073eed4f0362ef42170098a141a2fcbd71d0 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 18 Jul 2015 20:49:52 -0700 Subject: misc --- constants/misc_constants.asm | 1 - engine/HoF_room_pc.asm | 2 +- engine/battle/animations.asm | 10 +- engine/battle/core.asm | 2 +- engine/battle/experience.asm | 2 +- engine/battle/init_battle_variables.asm | 2 +- engine/cable_club.asm | 2 +- engine/evolution.asm | 67 ++++++------ engine/evos_moves.asm | 68 +++++++----- engine/experience.asm | 84 ++++++++------- engine/game_corner_slots.asm | 2 +- engine/game_corner_slots2.asm | 4 +- engine/give_pokemon.asm | 25 +++-- engine/hidden_object_functions17.asm | 6 +- engine/hidden_object_functions7.asm | 2 +- engine/items/itemfinder.asm | 32 +++--- engine/items/items.asm | 36 +++---- engine/menu/league_pc.asm | 8 +- engine/menu/main_menu.asm | 120 +++++++++++---------- engine/menu/pokedex.asm | 18 ++-- engine/menu/prize_menu.asm | 10 +- engine/menu/status_screen.asm | 43 ++++---- engine/oak_speech.asm | 4 +- engine/oam_dma.asm | 2 +- engine/overworld/hidden_items.asm | 44 ++++---- engine/overworld/hidden_objects.asm | 10 +- engine/overworld/movement.asm | 17 ++- engine/palettes.asm | 46 ++++---- engine/predefs.asm | 8 +- engine/save.asm | 181 +++++++++++++++++--------------- engine/slot_machine.asm | 2 +- engine/titlescreen.asm | 2 +- home/init.asm | 16 +-- hram.asm | 4 + macros.asm | 2 +- main.asm | 8 +- scripts/agatha.asm | 2 +- scripts/bruno.asm | 2 +- scripts/ceruleancity.asm | 2 +- scripts/daycarem.asm | 144 +++++++++++++------------ scripts/lance.asm | 2 +- scripts/lorelei.asm | 2 +- scripts/mansion3.asm | 2 +- scripts/mtmoonpokecenter.asm | 36 +++---- scripts/museum1f.asm | 8 +- scripts/oakslab.asm | 20 ++-- scripts/pewterpokecenter.asm | 34 +++--- scripts/safarizoneentrance.asm | 2 +- scripts/seafoamislands1.asm | 4 +- scripts/seafoamislands2.asm | 4 +- scripts/seafoamislands3.asm | 4 +- scripts/seafoamislands4.asm | 4 +- scripts/seafoamislands5.asm | 4 +- scripts/silphco7.asm | 2 +- scripts/vermiliondock.asm | 47 +++++---- scripts/victoryroad2.asm | 2 +- scripts/victoryroad3.asm | 8 +- sram.asm | 8 +- text/maps/daycare_1.asm | 20 ++-- text/maps/daycare_2.asm | 14 +-- wram.asm | 86 +++++++++++++-- 61 files changed, 743 insertions(+), 612 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 5eecb38f..c06e7a65 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -10,7 +10,6 @@ HOF_MON EQU $10 HOF_TEAM EQU PARTY_LENGTH * HOF_MON HOF_TEAM_CAPACITY EQU 50 - A_BUTTON EQU %00000001 B_BUTTON EQU %00000010 SELECT EQU %00000100 diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index dc05814a..06c926db 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -29,7 +29,7 @@ HallOfFamePC: ; 7405c (1d:405c) ld c, 128 call DelayFrames xor a - ld [wWhichTrade], a + ld [wNumCreditsMonsDisplayed - 1], a ; not read ld [wNumCreditsMonsDisplayed], a jp Credits diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 6803c38b..d21e07e5 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -796,9 +796,9 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) dec a ret nz ; if it's the end of the ball shaking subanimation, check if more shakes are left and restart the subanimation - ld a,[wWhichTrade] ; number of shakes + ld a,[wNumShakes] ; number of shakes dec a ; decrement number of shakes - ld [wWhichTrade],a + ld [wNumShakes],a ret z ; if there are shakes left, restart the subanimation ld a,[W_SUBANIMSUBENTRYADDR] @@ -1998,11 +1998,11 @@ AnimationWavyScreen: ; 79666 (1e:5666) ret Func_796ae: ; 796ae (1e:56ae) - ld a, [$ff41] + ld a, [rSTAT] and $3 jr nz, Func_796ae ld a, [hl] - ld [$ff43], a + ld [rSCX], a inc hl ld a, [hl] cp d @@ -2895,7 +2895,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ; store these for later ld a,b and a,$F - ld [wWhichTrade],a + ld [wNumShakes],a ld hl,.PokeBallAnimations ; choose which toss animation to use diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5deeb4dc..3cf3c9e9 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6298,7 +6298,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) dec de dec de xor a - ld [wHPBarMaxHP], a + ld [wLearningMovesFromDayCare], a predef WriteMonMoves ; get moves based on current level .loadMovePPs ld hl, wEnemyMonMoves diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 11a1e87c..6ec8c463 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -254,7 +254,7 @@ GainExperience: ; 5524f (15:524f) ld a, [wd0b5] ld [wd11e], a predef LearnMoveFromLevelUp - ld hl, wccd3 + ld hl, wCanEvolveFlags ld a, [wWhichPokemon] ld c, a ld b, $1 diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 74df62aa..f10e9f5e 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -19,7 +19,7 @@ InitBattleVariables: ; 525af (14:65af) ld hl, wcf1d ld [hli], a ld [hl], a - ld hl, wccd3 + ld hl, wCanEvolveFlags ld b, $3c .loop ld [hli], a diff --git a/engine/cable_club.asm b/engine/cable_club.asm index fbdb6260..9ccffdbb 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -297,7 +297,7 @@ CallCurrentTradeCenterFunction: ld b, 0 ld a, [wTradeCenterPointerTableIndex] cp $ff - jp z, LoadTitlescreenGraphics + jp z, DisplayTitleScreen add a ld c, a add hl, bc diff --git a/engine/evolution.asm b/engine/evolution.asm index 9ed38c21..d110110a 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -20,11 +20,11 @@ EvolveMon: ; 7bde9 (1e:7de9) xor a ld [H_AUTOBGTRANSFERENABLED], a ld [hTilesetType], a - ld a, [wHPBarMaxHP] + ld a, [wEvoOldSpecies] ld [wcf1d], a ld c, $0 call EvolutionSetWholeScreenPalette - ld a, [wHPBarMaxHP + 1] + ld a, [wEvoNewSpecies] ld [wcf91], a ld [wd0b5], a call Evolution_LoadPic @@ -32,13 +32,13 @@ EvolveMon: ; 7bde9 (1e:7de9) ld hl, vBackPic ld bc, 7 * 7 call CopyVideoData - ld a, [wHPBarMaxHP] + ld a, [wEvoOldSpecies] ld [wcf91], a ld [wd0b5], a call Evolution_LoadPic ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a - ld a, [wHPBarMaxHP] + ld a, [wEvoOldSpecies] call PlayCry call WaitForSoundToFinish ld c, BANK(Music_SafariZone) @@ -49,23 +49,23 @@ EvolveMon: ; 7bde9 (1e:7de9) ld c, $1 call EvolutionSetWholeScreenPalette ld bc, $110 -.asm_7be63 +.animLoop push bc call Evolution_CheckForCancel jr c, .evolutionCancelled - call Func_7bec2 + call Evolution_BackAndForthAnim pop bc inc b dec c dec c - jr nz, .asm_7be63 + jr nz, .animLoop xor a - ld [wHPBarOldHP + 1], a + ld [wEvoCancelled], a ld a, $31 - ld [wHPBarOldHP], a - call Func_7bed6 - ld a, [wHPBarMaxHP + 1] -.afterCancellation + ld [wEvoMonTileOffset], a + call Evolution_ChangeMonPic ; show the new species pic + ld a, [wEvoNewSpecies] +.done ld [wcf1d], a ld a, $ff ld [wc0ee], a @@ -81,17 +81,17 @@ EvolveMon: ; 7bde9 (1e:7de9) pop bc pop de pop hl - ld a, [wHPBarOldHP + 1] + ld a, [wEvoCancelled] and a ret z scf ret .evolutionCancelled pop bc - ld a, $1 - ld [wHPBarOldHP + 1], a - ld a, [wHPBarMaxHP] - jr .afterCancellation + ld a, 1 + ld [wEvoCancelled], a + ld a, [wEvoOldSpecies] + jr .done EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) ld b, $b @@ -102,37 +102,38 @@ Evolution_LoadPic: ; 7beb9 (1e:7eb9) coord hl, 7, 2 jp LoadFlippedFrontSpriteByMonIndex -Func_7bec2: ; 7bec2 (1e:7ec2) +Evolution_BackAndForthAnim: ; 7bec2 (1e:7ec2) +; show the mon change back and forth between the new and old species b times ld a, $31 - ld [wHPBarOldHP], a - call Func_7bed6 - ld a, $cf - ld [wHPBarOldHP], a - call Func_7bed6 + ld [wEvoMonTileOffset], a + call Evolution_ChangeMonPic + ld a, -$31 + ld [wEvoMonTileOffset], a + call Evolution_ChangeMonPic dec b - jr nz, Func_7bec2 + jr nz, Evolution_BackAndForthAnim ret -Func_7bed6: ; 7bed6 (1e:7ed6) +Evolution_ChangeMonPic: ; 7bed6 (1e:7ed6) push bc xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 7, 2 - ld bc, $707 - ld de, $d -.asm_7bee3 + lb bc, 7, 7 + ld de, SCREEN_WIDTH - 7 +.loop push bc -.asm_7bee4 - ld a, [wHPBarOldHP] +.innerLoop + ld a, [wEvoMonTileOffset] add [hl] ld [hli], a dec c - jr nz, .asm_7bee4 + jr nz, .innerLoop pop bc add hl, de dec b - jr nz, .asm_7bee3 - ld a, $1 + jr nz, .loop + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 pop bc diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 4a253c68..9a0f2d84 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -1,6 +1,6 @@ ; try to evolve the mon in [wWhichPokemon] TryEvolvingMon: ; 3ad0e (e:6d0e) - ld hl, wccd3 + ld hl, wCanEvolveFlags xor a ld [hl], a ld a, [wWhichPokemon] @@ -31,17 +31,17 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [hl] cp $ff ; have we reached the end of the party? jp z, .done - ld [wHPBarMaxHP], a + ld [wEvoOldSpecies], a push hl ld a, [wWhichPokemon] ld c, a - ld hl, wccd3 + ld hl, wCanEvolveFlags ld b, $2 call Evolution_FlagAction ld a, c and a ; is the mon's bit set? jp z, Evolution_PartyMonLoop ; if not, go to the next mon - ld a, [wHPBarMaxHP] + ld a, [wEvoOldSpecies] dec a ld b, 0 ld hl, EvosMovesPointerTable @@ -110,7 +110,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld [wd121], a push hl ld a, [hl] - ld [wHPBarMaxHP + 1], a + ld [wEvoNewSpecies], a ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName @@ -122,7 +122,7 @@ Evolution_PartyMonLoop: ; loop over party mons xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 0, 0 - ld bc, $c14 + lb bc, 12, 20 call ClearScreenArea ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -137,7 +137,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [hl] ld [wd0b5], a ld [wLoadedMonSpecies], a - ld [wHPBarMaxHP + 1], a + ld [wEvoNewSpecies], a ld a, MONSTER_NAME ld [wNameListType], a ld a, BANK(TrainerNames) ; bank is not used for monster names @@ -357,7 +357,7 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) ld bc, wPartyMon2 - wPartyMon1 call AddNTimes .next - ld b, $4 + ld b, NUM_MOVES .checkCurrentMovesLoop ; check if the move to learn is already known ld a, [hli] cp d @@ -377,14 +377,13 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) ; writes the moves a mon has at level [W_CURENEMYLVL] to [de] ; move slots are being filled up sequentially and shifted if all slots are full -; [wHPBarMaxHP]: (?) WriteMonMoves: ; 3afb8 (e:6fb8) call GetPredefRegisters push hl push de push bc ld hl, EvosMovesPointerTable - ld b, $0 + ld b, 0 ld a, [wcf91] ; cur mon ID dec a add a @@ -411,25 +410,30 @@ WriteMonMoves: ; 3afb8 (e:6fb8) ld a, [W_CURENEMYLVL] cp b jp c, .done ; mon level < move level (assumption: learnset is sorted by level) - ld a, [wHPBarMaxHP] + ld a, [wLearningMovesFromDayCare] and a jr z, .skipMinLevelCheck - ld a, [wWhichTrade] ; min move level) + ld a, [wDayCareStartLevel] cp b jr nc, .nextMove2 ; min level >= move level + .skipMinLevelCheck + +; check if the move is already known push de - ld c, $4 -.moveAlreadyLearnedCheckLoop + ld c, NUM_MOVES +.alreadyKnowsCheckLoop ld a, [de] inc de cp [hl] jr z, .nextMove dec c - jr nz, .moveAlreadyLearnedCheckLoop + jr nz, .alreadyKnowsCheckLoop + +; try to find an empty move slot pop de push de - ld c, $4 + ld c, NUM_MOVES .findEmptySlotLoop ld a, [de] and a @@ -437,47 +441,55 @@ WriteMonMoves: ; 3afb8 (e:6fb8) inc de dec c jr nz, .findEmptySlotLoop - pop de ; no empty move slots found + +; no empty move slots found + pop de push de push hl ld h, d ld l, e call WriteMonMoves_ShiftMoveData ; shift all moves one up (deleting move 1) - ld a, [wHPBarMaxHP] + ld a, [wLearningMovesFromDayCare] and a jr z, .writeMoveToSlot + +; shift PP as well if learning moves from day care push de - ld bc, $12 + ld bc, wPartyMon1PP - (wPartyMon1Moves + 3) add hl, bc ld d, h ld e, l call WriteMonMoves_ShiftMoveData ; shift all move PP data one up pop de + .writeMoveToSlot pop hl .writeMoveToSlot2 ld a, [hl] ld [de], a - ld a, [wHPBarMaxHP] + ld a, [wLearningMovesFromDayCare] and a jr z, .nextMove - push hl ; write move PP value + +; write move PP value if learning moves from day care + push hl ld a, [hl] - ld hl, $15 + ld hl, wPartyMon1PP - wPartyMon1Moves add hl, de push hl dec a ld hl, Moves - ld bc, $6 + ld bc, 6 call AddNTimes - ld de, wHPBarMaxHP + ld de, wBuffer ld a, BANK(Moves) call FarCopyData - ld a, [wHPBarNewHP + 1] + ld a, [wBuffer + 5] pop hl ld [hl], a pop hl jr .nextMove + .done pop bc pop de @@ -486,13 +498,13 @@ WriteMonMoves: ; 3afb8 (e:6fb8) ; shifts all move data one up (freeing 4th move slot) WriteMonMoves_ShiftMoveData: ; 3b04e (e:704e) - ld c, $3 -.asm_3b050 + ld c, NUM_MOVES - 1 +.loop inc de ld a, [de] ld [hli], a dec c - jr nz, .asm_3b050 + jr nz, .loop ret Evolution_FlagAction: ; 3b057 (e:7057) diff --git a/engine/experience.asm b/engine/experience.asm index 752536cf..b43fbcf9 100755 --- a/engine/experience.asm +++ b/engine/experience.asm @@ -10,15 +10,15 @@ CalcLevelFromExperience: ; 58f43 (16:4f43) push hl ld hl, wLoadedMonExp + 2 ; current exp ; compare exp needed for level d with current exp - ld a, [H_MULTIPLICAND + 2] + ld a, [hExperience + 2] ld c, a ld a, [hld] sub c - ld a, [H_MULTIPLICAND + 1] + ld a, [hExperience + 1] ld c, a ld a, [hld] sbc c - ld a, [H_MULTIPLICAND] + ld a, [hExperience] ld c, a ld a, [hl] sbc c @@ -33,7 +33,7 @@ CalcExperience: ; 58f6a (16:4f6a) add a add a ld c, a - ld b, $0 + ld b, 0 ld hl, GrowthRateTable add hl, bc call CalcDSquared @@ -50,96 +50,100 @@ CalcExperience: ; 58f6a (16:4f6a) ld [H_DIVISOR], a ld b, $4 call Divide - ld a, [H_MULTIPLICAND] ; (aliases: H_NUMTOPRINT) + ld a, [H_QUOTIENT + 1] push af - ld a, [H_MULTIPLICAND+1] + ld a, [H_QUOTIENT + 2] push af - ld a, [H_MULTIPLICAND+2] + ld a, [H_QUOTIENT + 3] push af call CalcDSquared ld a, [hl] and $7f ld [H_MULTIPLIER], a call Multiply - ld a, [H_MULTIPLICAND] ; (aliases: H_NUMTOPRINT) + ld a, [H_PRODUCT + 1] push af - ld a, [H_MULTIPLICAND+1] + ld a, [H_PRODUCT + 2] push af - ld a, [H_MULTIPLICAND+2] + ld a, [H_PRODUCT + 3] push af ld a, [hli] push af xor a ld [H_MULTIPLICAND], a - ld [H_MULTIPLICAND+1], a + ld [H_MULTIPLICAND + 1], a ld a, d - ld [H_MULTIPLICAND+2], a + ld [H_MULTIPLICAND + 2], a ld a, [hli] ld [H_MULTIPLIER], a call Multiply ld b, [hl] - ld a, [H_MULTIPLICAND+2] + ld a, [H_PRODUCT + 3] sub b - ld [H_MULTIPLICAND+2], a + ld [H_PRODUCT + 3], a ld b, $0 - ld a, [H_MULTIPLICAND+1] + ld a, [H_PRODUCT + 2] sbc b - ld [H_MULTIPLICAND+1], a - ld a, [H_MULTIPLICAND] + ld [H_PRODUCT + 2], a + ld a, [H_PRODUCT + 1] sbc b - ld [H_MULTIPLICAND], a + ld [H_PRODUCT + 1], a +; The difference of the linear term and the constant term consists of 3 bytes +; starting at H_PRODUCT + 1. Below, hExperience (an alias of that address) will +; be used instead for the further work of adding or subtracting the squared +; term and adding the cubed term. pop af and $80 jr nz, .subtractSquaredTerm ; check sign pop bc - ld a, [H_MULTIPLICAND+2] + ld a, [hExperience + 2] add b - ld [H_MULTIPLICAND+2], a + ld [hExperience + 2], a pop bc - ld a, [H_MULTIPLICAND+1] + ld a, [hExperience + 1] adc b - ld [H_MULTIPLICAND+1], a + ld [hExperience + 1], a pop bc - ld a, [H_MULTIPLICAND] + ld a, [hExperience] adc b - ld [H_MULTIPLICAND], a + ld [hExperience], a jr .addCubedTerm .subtractSquaredTerm pop bc - ld a, [H_MULTIPLICAND+2] + ld a, [hExperience + 2] sub b - ld [H_MULTIPLICAND+2], a + ld [hExperience + 2], a pop bc - ld a, [H_MULTIPLICAND+1] + ld a, [hExperience + 1] sbc b - ld [H_MULTIPLICAND+1], a + ld [hExperience + 1], a pop bc - ld a, [H_MULTIPLICAND] + ld a, [hExperience] sbc b - ld [H_MULTIPLICAND], a + ld [hExperience], a .addCubedTerm pop bc - ld a, [H_MULTIPLICAND+2] + ld a, [hExperience + 2] add b - ld [H_MULTIPLICAND+2], a + ld [hExperience + 2], a pop bc - ld a, [H_MULTIPLICAND+1] + ld a, [hExperience + 1] adc b - ld [H_MULTIPLICAND+1], a + ld [hExperience + 1], a pop bc - ld a, [H_MULTIPLICAND] + ld a, [hExperience] adc b - ld [H_MULTIPLICAND], a + ld [hExperience], a ret ; calculates d*d CalcDSquared: ; 59010 (16:5010) xor a - ld [H_MULTIPLICAND], a ; (aliases: H_NUMTOPRINT) - ld [H_MULTIPLICAND+1], a + ld [H_MULTIPLICAND], a + ld [H_MULTIPLICAND + 1], a ld a, d - ld [H_MULTIPLICAND+2], a - ld [H_MULTIPLIER], a ; (aliases: H_DIVISOR, H_REMAINDER, H_POWEROFTEN) + ld [H_MULTIPLICAND + 2], a + ld [H_MULTIPLIER], a jp Multiply ; each entry has the following scheme: diff --git a/engine/game_corner_slots.asm b/engine/game_corner_slots.asm index b3b2490c..ff17d4d3 100755 --- a/engine/game_corner_slots.asm +++ b/engine/game_corner_slots.asm @@ -7,7 +7,7 @@ StartSlotMachine: ; 37e2d (d:7e2d) cp $ff jr z, .printSomeonesKeys callba AbleToPlaySlotsCheck - ld a, [wHiddenObjectFunctionArgument] + ld a, [wCanPlaySlots] and a ret z ld a, [wLuckySlotHiddenObjectIndex] diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm index 850b1f99..643536ea 100755 --- a/engine/game_corner_slots2.asm +++ b/engine/game_corner_slots2.asm @@ -1,4 +1,4 @@ -AbleToPlaySlotsCheck ; 2ff09 (b:7f09) +AbleToPlaySlotsCheck: ; 2ff09 (b:7f09) ld a, [wSpriteStateData1 + 2] and $8 jr z, .done ; not able @@ -19,7 +19,7 @@ AbleToPlaySlotsCheck ; 2ff09 (b:7f09) call PrintPredefTextID xor a .done - ld [wWhichTrade], a + ld [wCanPlaySlots], a ret GameCornerCoinCaseText: ; 2ff32 (b:7f32) diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 45e88b9c..4b45631d 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -1,13 +1,16 @@ _GivePokemon: ; 4fda5 (13:7da5) +; returns success in carry +; and whether the mon was added to the party in [wAddedToParty] call EnableAutoTextBoxDrawing xor a - ld [wccd3], a + ld [wAddedToParty], a ld a, [wPartyCount] cp PARTY_LENGTH - jr c, .asm_4fe01 + jr c, .addToParty ld a, [W_NUMINBOX] cp MONS_PER_BOX - jr nc, .asm_4fdf9 + jr nc, .boxFull +; add to box xor a ld [W_ENEMYBATTSTATUS3], a ld a, [wcf91] @@ -19,32 +22,32 @@ _GivePokemon: ; 4fda5 (13:7da5) ld a, [wCurrentBoxNum] and $7f cp 9 - jr c, .asm_4fdec + jr c, .singleDigitBoxNum sub 9 ld [hl], "1" inc hl add "0" - jr .asm_4fdee -.asm_4fdec + jr .next +.singleDigitBoxNum add "1" -.asm_4fdee +.next ld [hli], a ld [hl], "@" ld hl, SetToBoxText call PrintText scf ret -.asm_4fdf9 +.boxFull ld hl, BoxIsFullText call PrintText and a ret -.asm_4fe01 +.addToParty call SetPokedexOwnedFlag call AddPartyMon - ld a, $1 + ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld [wccd3], a + ld [wAddedToParty], a scf ret diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 841929b8..44941d36 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -55,7 +55,7 @@ KabutopsFossilText: ; 5dbd4 (17:5bd4) DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ; Displays a pokemon's front sprite in a pop-up window. ; [wcf91] = pokemon interal id number - ld a, $1 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a @@ -85,7 +85,7 @@ PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a) call EnableAutoTextBoxDrawing ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wWhichTrade] + ld a, [wHiddenObjectFunctionArgument] call PrintPredefTextID ret @@ -310,7 +310,7 @@ VermilionGymTrashText: ; 5ddf7 (17:5df7) GymTrashScript: ; 5ddfc (17:5dfc) call EnableAutoTextBoxDrawing - ld a, [wWhichTrade] + ld a, [wHiddenObjectFunctionArgument] ld [wcd5b], a ; Don't do the trash can puzzle if it's already been done. diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 31ae17a4..8e8b27b1 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -128,7 +128,7 @@ CinnabarGymQuiz: ; 1ea25 (7:6a25) TX_ASM xor a ld [wda38], a - ld a, [wWhichTrade] + ld a, [wHiddenObjectFunctionArgument] push af and $f ld [$ffdb], a diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 96abecd3..51277632 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -1,14 +1,14 @@ HiddenItemNear: ; 7481f (1d:481f) ld hl, HiddenItemCoords - ld b, $0 -.asm_74824 - ld de, $0003 + ld b, 0 +.loop + ld de, 3 ld a, [W_CURMAP] call IsInRestOfArray ret nc ; return if current map has no hidden items push bc push hl - ld hl, wd6f0 + ld hl, wObtainedHiddenItemsFlags ld c, b ld b, $2 predef FlagActionPredef @@ -22,28 +22,30 @@ HiddenItemNear: ; 7481f (1d:481f) inc hl ld e, [hl] inc hl - jr nz, .asm_74824 + jr nz, .loop ; if the item has already been obtained +; check if the item is within 4-5 tiles (depending on the direction of item) ld a, [W_YCOORD] - call Func_7486b + call Sub5ClampTo0 cp d - jr nc, .asm_74824 + jr nc, .loop ld a, [W_YCOORD] - add $4 + add 4 cp d - jr c, .asm_74824 + jr c, .loop ld a, [W_XCOORD] - call Func_7486b + call Sub5ClampTo0 cp e - jr nc, .asm_74824 + jr nc, .loop ld a, [W_XCOORD] - add $5 + add 5 cp e - jr c, .asm_74824 + jr c, .loop scf ret -Func_7486b: ; 7486b (1d:486b) - sub $5 +Sub5ClampTo0: ; 7486b (1d:486b) +; subtract 5 but clamp to 0 + sub 5 cp $f0 ret c xor a diff --git a/engine/items/items.asm b/engine/items/items.asm index fe2d71c8..bc8d16fa 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1216,11 +1216,11 @@ ItemUseMedicine: ; dabb (3:5abb) ld bc,-19 add hl,bc ; hl now points to experience ; update experience to minimum for new level - ld a,[$ff96] + ld a,[hExperience] ld [hli],a - ld a,[$ff97] + ld a,[hExperience + 1] ld [hli],a - ld a,[$ff98] + ld a,[hExperience + 2] ld [hl],a pop hl ld a,[wWhichPokemon] @@ -1618,8 +1618,8 @@ ItemUsePokeflute: ; e140 (3:6140) jp PrintText .inBattle xor a - ld [wWhichTrade],a ; initialize variable that indicates if any pokemon were woken up to zero - ld b,~SLP & $FF + ld [wWereAnyMonsAsleep],a + ld b,~SLP & $ff ld hl,wPartyMon1Status call WakeUpEntireParty ld a,[W_ISINBATTLE] @@ -1638,7 +1638,7 @@ ItemUsePokeflute: ; e140 (3:6140) and b ; remove Sleep status ld [hl],a call LoadScreenTilesFromBuffer2 ; restore saved screen - ld a,[wWhichTrade] + ld a,[wWereAnyMonsAsleep] and a ; were any pokemon asleep before playing the flute? ld hl,PlayedFluteNoEffectText jp z,PrintText ; if no pokemon were asleep @@ -1662,9 +1662,9 @@ ItemUsePokeflute: ; e140 (3:6140) ; INPUT: ; hl must point to status of first pokemon in party (player's or enemy's) ; b must equal ~SLP -; [wWhichTrade] should be initialized to 0 +; [wWereAnyMonsAsleep] should be initialized to 0 ; OUTPUT: -; [wWhichTrade]: set to 1 if any pokemon were asleep +; [wWereAnyMonsAsleep]: set to 1 if any pokemon were asleep WakeUpEntireParty: ; e1e5 (3:61e5) ld de,44 ld c,6 @@ -1674,7 +1674,7 @@ WakeUpEntireParty: ; e1e5 (3:61e5) and a,SLP ; is pokemon asleep? jr z,.notAsleep ld a,1 - ld [wWhichTrade],a ; indicate that a pokemon had to be woken up + ld [wWereAnyMonsAsleep],a ; indicate that a pokemon had to be woken up .notAsleep pop af and b ; remove Sleep status @@ -1874,7 +1874,7 @@ ItemUsePPRestore: ; e31e (3:631e) ld a,[wWhichPokemon] push af ld a,[wcf91] - ld [wWhichTrade],a + ld [wPPRestoreItem],a .chooseMon xor a ld [wUpdateSpritesEnabled],a @@ -1884,13 +1884,13 @@ ItemUsePPRestore: ; e31e (3:631e) jr nc,.chooseMove jp .itemNotUsed .chooseMove - ld a,[wWhichTrade] + ld a,[wPPRestoreItem] cp a,ELIXER jp nc,.useElixir ; if Elixir or Max Elixir ld a,$02 ld [wMoveMenuType],a ld hl,RaisePPWhichTechniqueText - ld a,[wWhichTrade] + ld a,[wPPRestoreItem] cp a,ETHER ; is it a PP Up? jr c,.printWhichTechniqueMessage ; if so, print the raise PP message ld hl,RestorePPWhichTechniqueText ; otherwise, print the restore PP message @@ -1911,7 +1911,7 @@ ItemUsePPRestore: ; e31e (3:631e) call GetMoveName call CopyStringToCF4B ; copy name to wcf4b pop hl - ld a,[wWhichTrade] + ld a,[wPPRestoreItem] cp a,ETHER jr nc,.useEther ; if Ether or Max Ether .usePPUp @@ -1973,7 +1973,7 @@ ItemUsePPRestore: ; e31e (3:631e) add hl,bc ; hl now points to move's PP ld a,[wd11e] ld b,a ; b = max PP - ld a,[wWhichTrade] + ld a,[wPPRestoreItem] cp a,MAX_ETHER jr z,.fullyRestorePP ld a,[hl] ; move PP @@ -2005,7 +2005,7 @@ ItemUsePPRestore: ; e31e (3:631e) jr .storeNewAmount .useElixir ; decrement the item ID so that ELIXER becomes ETHER and MAX_ELIXER becomes MAX_ETHER - ld hl,wWhichTrade + ld hl,wPPRestoreItem dec [hl] dec [hl] xor a @@ -2701,13 +2701,13 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld d, a callab CalcExperience pop de - ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) + ld a, [hExperience] ld [de], a inc de - ld a, [$ff97] + ld a, [hExperience + 1] ld [de], a inc de - ld a, [$ff98] + ld a, [hExperience + 2] ld [de], a inc de xor a diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 560ed421..06a7894c 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -12,7 +12,7 @@ PKMNLeaguePC: ; 0x7657e ld [hTilesetType], a ld [W_SPRITEFLIPPED], a ld [wUpdateSpritesEnabled], a - ld [wTrainerScreenX], a + ld [wHoFTeamIndex2], a ld [wHoFTeamNo], a ld a, [wNumHoFTeams] ld b, a @@ -27,13 +27,13 @@ PKMNLeaguePC: ; 0x7657e ld hl, wHoFTeamNo inc [hl] push bc - ld a, [wTrainerScreenX] - ld [wHoFMonSpecies], a + ld a, [wHoFTeamIndex2] + ld [wHoFTeamIndex], a callba LoadHallOfFameTeams call LeaguePCShowTeam pop bc jr c, .doneShowingTeams - ld hl, wTrainerScreenX + ld hl, wHoFTeamIndex2 inc [hl] ld a, [hl] cp b diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 9e160f81..5dc6e61f 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -1,17 +1,16 @@ MainMenu: ; 5af2 (1:5af2) ; Check save file - call Func_5bff + call InitOptions xor a - ld [wd08a],a + ld [wOptionsInitialized],a inc a - ld [wd088],a - call Func_609e - jr nc,.next0 + ld [wSaveFileStatus],a + call CheckForPlayerNameInSRAM + jr nc,.mainMenuLoop - ; Predef 52 loads the save from SRAM to RAM predef LoadSAV -.next0 +.mainMenuLoop ld c,20 call DelayFrames xor a ; LINK_STATE_NONE @@ -30,9 +29,10 @@ MainMenu: ; 5af2 (1:5af2) call LoadFontTilePatterns ld hl,wd730 set 6,[hl] - ld a,[wd088] + ld a,[wSaveFileStatus] cp a,1 - jr z,.next1 + jr z,.noSaveFile +; there's a save file coord hl, 0, 0 ld b,6 ld c,13 @@ -41,7 +41,7 @@ MainMenu: ; 5af2 (1:5af2) ld de,ContinueText call PlaceString jr .next2 -.next1 +.noSaveFile coord hl, 0, 0 ld b,4 ld c,13 @@ -63,31 +63,33 @@ MainMenu: ; 5af2 (1:5af2) ld [wTopMenuItemY],a ld a,$B ld [wMenuWatchedKeys],a - ld a,[wd088] + ld a,[wSaveFileStatus] ld [wMaxMenuItem],a call HandleMenuInput - bit 1,a - jp nz,LoadTitlescreenGraphics ; load title screen (gfx and arrangement) + bit 1,a ; pressed B? + jp nz,DisplayTitleScreen ; if so, go back to the title screen ld c,20 call DelayFrames ld a,[wCurrentMenuItem] ld b,a - ld a,[wd088] + ld a,[wSaveFileStatus] cp a,2 - jp z,.next3 - inc b ; adjust MenuArrow_Counter -.next3 + jp z,.skipInc +; If there's no save file, increment the current menu item so that the numbers +; are the same whether or not there's a save file. + inc b +.skipInc ld a,b and a - jr z,.next4 ; if press_A on Continue + jr z,.choseContinue cp a,1 - jp z,Func_5d52 ; if press_A on NewGame - call DisplayOptionMenu ; if press_a on Options + jp z,StartNewGame + call DisplayOptionMenu ld a,1 - ld [wd08a],a - jp .next0 -.next4 - call ContinueGame + ld [wOptionsInitialized],a + jp .mainMenuLoop +.choseContinue + call DisplayContinueGameInfo ld hl,wd126 set 5,[hl] .inputLoop @@ -100,7 +102,7 @@ MainMenu: ; 5af2 (1:5af2) bit 0,a jr nz,.pressedA bit 1,a - jp nz,.next0 ; pressedB + jp nz,.mainMenuLoop ; pressed B jr .inputLoop .pressedA call GBPalWhiteOutWithDelay3 @@ -122,10 +124,10 @@ MainMenu: ; 5af2 (1:5af2) call SpecialWarpIn jp SpecialEnterMap -Func_5bff: ; 5bff (1:5bff) - ld a,1 +InitOptions: ; 5bff (1:5bff) + ld a,1 ; no delay ld [wLetterPrintingDelayFlags],a - ld a,3 + ld a,3 ; medium speed ld [W_OPTIONS],a ret @@ -301,7 +303,7 @@ LinkCanceledText: ; 5d4d (1:5d4d) TX_FAR _LinkCanceledText db "@" -Func_5d52: ; 5d52 (1:5d52) +StartNewGame: ; 5d52 (1:5d52) ld hl, wd732 res 1, [hl] call OakSpeech @@ -337,12 +339,12 @@ CableClubOptionsText: ; 5d97 (1:5d97) db "COLOSSEUM", $4e db "CANCEL@" -ContinueGame: ; 5db5 (1:5db5) +DisplayContinueGameInfo: ; 5db5 (1:5db5) xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 7 - ld b, $8 - ld c, $e + ld b, 8 + ld c, 14 call TextBoxBorder coord hl, 5, 9 ld de, SaveScreenInfoText @@ -351,12 +353,12 @@ ContinueGame: ; 5db5 (1:5db5) ld de, wPlayerName call PlaceString coord hl, 17, 11 - call Func_5e2f + call PrintNumBadges coord hl, 16, 13 - call Func_5e42 + call PrintNumOwnedMons coord hl, 13, 15 - call Func_5e55 - ld a, $1 + call PrintPlayTime + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ld c, 30 jp DelayFrames @@ -377,17 +379,17 @@ PrintSaveScreenText: ; 5def (1:5def) ld de, wPlayerName call PlaceString coord hl, 17, 4 - call Func_5e2f + call PrintNumBadges coord hl, 16, 6 - call Func_5e42 + call PrintNumOwnedMons coord hl, 13, 8 - call Func_5e55 + call PrintPlayTime ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ld c, 30 jp DelayFrames -Func_5e2f: ; 5e2f (1:5e2f) +PrintNumBadges: ; 5e2f (1:5e2f) push hl ld hl, W_OBTAINEDBADGES ld b, $1 @@ -397,7 +399,7 @@ Func_5e2f: ; 5e2f (1:5e2f) ld bc, $102 jp PrintNumber -Func_5e42: ; 5e42 (1:5e42) +PrintNumOwnedMons: ; 5e42 (1:5e42) push hl ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned @@ -407,7 +409,7 @@ Func_5e42: ; 5e42 (1:5e42) ld bc, $103 jp PrintNumber -Func_5e55: ; 5e55 (1:5e55) +PrintPlayTime: ; 5e55 (1:5e55) ld de, W_PLAYTIMEHOURS + 1 ld bc, $103 call PrintNumber @@ -678,28 +680,32 @@ TextSpeedOptionData: ; 6096 (1:6096) db 7 ; default X coordinate (Medium) db $ff ; terminator -Func_609e: ; 609e (1:609e) - ld a, $a - ld [$0], a +CheckForPlayerNameInSRAM: ; 609e (1:609e) +; Check if the player name data in SRAM has a string terminator character +; (indicating that a name may have been saved there) and return whether it does +; in carry. + ld a, SRAM_ENABLE + ld [MBC1SRamEnable], a ld a, $1 - ld [$6000], a - ld [$4000], a + ld [MBC1SRamBankingMode], a + ld [MBC1SRamBank], a ld b, $b - ld hl, $a598 -.asm_60b0 + ld hl, sPlayerName +.loop ld a, [hli] - cp $50 - jr z, .asm_60c1 + cp "@" + jr z, .found dec b - jr nz, .asm_60b0 + jr nz, .loop +; not found xor a - ld [$0], a - ld [$6000], a + ld [MBC1SRamEnable], a + ld [MBC1SRamBankingMode], a and a ret -.asm_60c1 +.found xor a - ld [$0], a - ld [$6000], a + ld [MBC1SRamEnable], a + ld [MBC1SRamBankingMode], a scf ret diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 08ce0da9..4e173bc0 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -71,8 +71,8 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ld [wd11e],a ld a,[wd11e] push af - ld a,[wWhichTrade] - push af + ld a,[wDexMaxSeenMon] + push af ; this doesn't need to be preserved ld hl,wPokedexSeen call IsPokemonBitSet ld b,2 @@ -108,7 +108,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ld b,1 .exitSideMenu pop af - ld [wWhichTrade],a + ld [wDexMaxSeenMon],a pop af ld [wd11e],a pop af @@ -207,7 +207,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) jr .maxSeenPokemonLoop .storeMaxSeenPokemon ld a,b - ld [wWhichTrade],a ; max seen pokemon + ld [wDexMaxSeenMon],a .loop xor a ld [H_AUTOBGTRANSFERENABLED],a @@ -218,7 +218,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) ld a,[wListScrollOffset] ld [wd11e],a ld d,7 - ld a,[wWhichTrade] + ld a,[wDexMaxSeenMon] cp a,7 jr nc,.printPokemonLoop ld d,a @@ -294,9 +294,9 @@ HandlePokedexListMenu: ; 40111 (10:4111) bit 7,a ; was Down pressed? jr z,.checkIfRightPressed .downPressed ; scroll down one row - ld a,[wWhichTrade] + ld a,[wDexMaxSeenMon] cp a,7 - jp c,.loop + jp c,.loop ; can't if the list is shorter than 7 sub a,7 ld b,a ld a,[wListScrollOffset] @@ -309,9 +309,9 @@ HandlePokedexListMenu: ; 40111 (10:4111) bit 4,a ; was Right pressed? jr z,.checkIfLeftPressed .rightPressed ; scroll down 7 rows - ld a,[wWhichTrade] + ld a,[wDexMaxSeenMon] cp a,7 - jp c,.loop + jp c,.loop ; can't if the list is shorter than 7 sub a,6 ld b,a ld a,[wListScrollOffset] diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index d1fa0c72..b1b751b9 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -231,18 +231,24 @@ HandlePrizeChoice: ; 528c6 (14:68c6) pop af ld b,a call GivePokemon + +; If either the party or box was full, wait after displaying message. push af - ld a,[wccd3] ; XXX is there room? + ld a,[wAddedToParty] and a call z,WaitForTextScrollButtonPress pop af + +; If the mon couldn't be given to the player (because both the party and box +; were full), return without subtracting coins. ret nc + .SubtractCoins call LoadCoinsToSubtract ld hl,hCoins + 1 ld de,wPlayerCoins + 1 ld c,$02 ; how many bytes - predef SubBCDPredef ; subtract coins (BCD daa operations) + predef SubBCDPredef jp PrintPrizePrice .BagFull ld hl,PrizeRoomBagIsFullTextPtr diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 75de182b..3bf3464a 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -297,8 +297,8 @@ StatusScreen2: ; 12b57 (4:6b57) push af xor a ld [hTilesetType], a - ld [$ffba], a - ld bc, $0005 + ld [H_AUTOBGTRANSFERENABLED], a + ld bc, NUM_MOVES + 1 ld hl, wMoves call FillMemory ld hl, wLoadedMonMoves @@ -307,13 +307,13 @@ StatusScreen2: ; 12b57 (4:6b57) call CopyData callab FormatMovesString coord hl, 9, 2 - ld bc, $050a + lb bc, 5, 10 call ClearScreenArea ; Clear under name coord hl, 19, 3 ld [hl], $78 coord hl, 0, 8 - ld b, $8 - ld c, $12 + ld b, 8 + ld c, 18 call TextBoxBorder ; Draw move container coord hl, 2, 9 ld de, wMovesString @@ -387,9 +387,9 @@ StatusScreen2: ; 12b57 (4:6b57) jr nz, .PrintPP .PPDone coord hl, 9, 3 - ld de, EXPPointsText + ld de, StatusScreenExpText call PlaceString - ld a, [wLoadedMonLevel] ; level + ld a, [wLoadedMonLevel] push af cp MAX_LEVEL jr z, .Level100 @@ -407,11 +407,11 @@ StatusScreen2: ; 12b57 (4:6b57) coord hl, 12, 4 ld bc, $0307 call PrintNumber ; exp - call .asm_12c86 + call CalcExpToLevelUp ld de, wLoadedMonExp coord hl, 7, 6 ld bc, $0307 - call PrintNumber + call PrintNumber ; exp needed to level up coord hl, 9, 0 call StatusScreen_ClearName coord hl, 9, 1 @@ -422,7 +422,7 @@ StatusScreen2: ; 12b57 (4:6b57) coord hl, 9, 1 call PlaceString ld a, $1 - ld [$ffba], a + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 call WaitForTextScrollButtonPress ; wait for button pop af @@ -433,25 +433,26 @@ StatusScreen2: ; 12b57 (4:6b57) ld [$ff24], a call GBPalWhiteOut jp ClearScreen -.asm_12c86 ; This does some magic with lvl/exp? - ld a, [wLoadedMonLevel] ; Load level + +CalcExpToLevelUp: ; 12c86 (4:6c86) + ld a, [wLoadedMonLevel] cp MAX_LEVEL - jr z, .asm_12ca7 ; If 100 + jr z, .atMaxLevel inc a ld d, a callab CalcExperience ld hl, wLoadedMonExp + 2 - ld a, [$ff98] + ld a, [hExperience + 2] sub [hl] ld [hld], a - ld a, [$ff97] + ld a, [hExperience + 1] sbc [hl] ld [hld], a - ld a, [$ff96] + ld a, [hExperience] sbc [hl] ld [hld], a ret -.asm_12ca7 +.atMaxLevel ld hl, wLoadedMonExp xor a ld [hli], a @@ -459,11 +460,9 @@ StatusScreen2: ; 12b57 (4:6b57) ld [hl], a ret -EXPPointsText: ; 12caf (4:6caf) - db "EXP POINTS", $4e - -LevelUpText: ; 12cba (4:6cba) - db "LEVEL UP@" +StatusScreenExpText: ; 12caf (4:6caf) + db "EXP POINTS" + next "LEVEL UP@" StatusScreen_ClearName: ; 12cc3 (4:6cc3) ld bc, 10 diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index c7b2f4d6..9b9b1c7e 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -19,9 +19,9 @@ SetDefaultNames: ; 60ca (1:60ca) ld [W_OPTIONS], a pop af ld [wLetterPrintingDelayFlags], a - ld a, [wd08a] + ld a, [wOptionsInitialized] and a - call z, Func_5bff + call z, InitOptions ld hl, NintenText ld de, wPlayerName ld bc, $b diff --git a/engine/oam_dma.asm b/engine/oam_dma.asm index bd89677a..7326445e 100644 --- a/engine/oam_dma.asm +++ b/engine/oam_dma.asm @@ -15,7 +15,7 @@ WriteDMACodeToHRAM: DMARoutine: ; initiate DMA ld a, wOAMBuffer / $100 - ld [$ff46], a + ld [rDMA], a ; wait for DMA to finish ld a, $28 diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 910fcf04..3fb4ffca 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -1,9 +1,9 @@ HiddenItems: ; 76688 (1d:6688) ld hl, HiddenItemCoords - call Func_76857 - ld [wTrainerScreenX], a - ld hl, wd6f0 - ld a, [wTrainerScreenX] + call FindHiddenItemOrCoinsIndex + ld [wHiddenItemOrCoinsIndex], a + ld hl, wObtainedHiddenItemsFlags + ld a, [wHiddenItemOrCoinsIndex] ld c, a ld b, $2 predef FlagActionPredef @@ -11,9 +11,9 @@ HiddenItems: ; 76688 (1d:6688) and a ret nz call EnableAutoTextBoxDrawing - ld a, $1 + ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wWhichTrade] ; item ID + ld a, [wHiddenObjectFunctionArgument] ; item ID ld [wd11e], a call GetItemName tx_pre_jump FoundHiddenItemText @@ -23,12 +23,12 @@ INCLUDE "data/hidden_item_coords.asm" FoundHiddenItemText: ; 7675b (1d:675b) TX_FAR _FoundHiddenItemText TX_ASM - ld a, [wWhichTrade] ; item ID + ld a, [wHiddenObjectFunctionArgument] ; item ID ld b, a ld c, 1 call GiveItem jr nc, .BagFull - ld hl, wd6f0 + ld hl, wObtainedHiddenItemsFlags ld a, [wTrainerScreenX] ld c, a ld b, $1 @@ -56,10 +56,10 @@ HiddenCoins: ; 76799 (1d:6799) and a ret z ld hl, HiddenCoinCoords - call Func_76857 - ld [wTrainerScreenX], a - ld hl, wd6fe - ld a, [wTrainerScreenX] + call FindHiddenItemOrCoinsIndex + ld [wHiddenItemOrCoinsIndex], a + ld hl, wObtainedHiddenCoinsFlags + ld a, [wHiddenItemOrCoinsIndex] ld c, a ld b, $2 predef FlagActionPredef @@ -70,7 +70,7 @@ HiddenCoins: ; 76799 (1d:6799) ld [hCoins - 1], a ld [hCoins], a ld [hCoins + 1], a - ld a, [wWhichTrade] + ld a, [wHiddenObjectFunctionArgument] sub COIN cp 10 jr z, .bcd10 @@ -99,7 +99,7 @@ HiddenCoins: ; 76799 (1d:6799) ld hl, hCoins + 1 ld c, $2 predef AddBCDPredef - ld hl, wd6fe + ld hl, wObtainedHiddenCoinsFlags ld a, [wTrainerScreenX] ld c, a ld b, $1 @@ -130,31 +130,31 @@ DroppedHiddenCoinsText: ; 7684d (1d:684d) TX_FAR _DroppedHiddenCoinsText db "@" -Func_76857: ; 76857 (1d:6857) - ld a, [wTrainerScreenY] +FindHiddenItemOrCoinsIndex: ; 76857 (1d:6857) + ld a, [wHiddenObjectY] ld d, a - ld a, [wTrainerScreenX] + ld a, [wHiddenObjectX] ld e, a ld a, [W_CURMAP] ld b, a - ld c, $ff + ld c, -1 .loop inc c ld a, [hli] cp $ff ; end of the list? ret z ; if so, we're done here cp b - jr nz, .asm_76877 + jr nz, .next1 ld a, [hli] cp d - jr nz, .asm_76878 + jr nz, .next2 ld a, [hli] cp e jr nz, .loop ld a, c ret -.asm_76877 +.next1 inc hl -.asm_76878 +.next2 inc hl jr .loop diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index ae67aeed..cabfc093 100755 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm @@ -1,4 +1,4 @@ -Func_46981: ; 46981 (11:6981) +IsPlayerOnDungeonWarp: ; 46981 (11:6981) xor a ld [wWhichDungeonWarp], a ld a, [wd72d] @@ -6,7 +6,7 @@ Func_46981: ; 46981 (11:6981) ret nz call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wWhichDungeonWarp], a ld hl, wd72d set 4, [hl] @@ -58,7 +58,7 @@ CheckForHiddenObject: ; 469a0 (11:69a0) ld [wHiddenObjectX], a ld c, a call CheckIfCoordsInFrontOfPlayerMatch - ld a, [$ffea] + ld a, [hCoordsInFrontOfPlayerMatch] and a jr z, .foundMatchingObject inc hl @@ -85,7 +85,7 @@ CheckForHiddenObject: ; 469a0 (11:69a0) ret ; checks if the coordinates in front of the player's sprite match Y in b and X in c -; [$ffea] = $00 if they match, $ff if they don't match +; [hCoordsInFrontOfPlayerMatch] = $00 if they match, $ff if they don't match CheckIfCoordsInFrontOfPlayerMatch: ; 46a01 (11:6a01) ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_UP @@ -127,7 +127,7 @@ CheckIfCoordsInFrontOfPlayerMatch: ; 46a01 (11:6a01) .didNotMatch ld a, $ff .done - ld [$ffea], a + ld [hCoordsInFrontOfPlayerMatch], a ret INCLUDE "data/hidden_objects.asm" diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 89b09bba..f618261e 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -210,9 +210,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveDown ld de, 2*SCREEN_WIDTH add hl, de ; move tile pointer two rows down - ld de, $100 - - ld bc, $400 + lb de, 1, 0 + lb bc, 4, SPRITE_FACING_DOWN jr TryWalking .notDown cp $80 ; $40 <= a < $80: up (or right) @@ -223,8 +222,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveUp ld de, -2*SCREEN_WIDTH add hl, de ; move tile pointer two rows up - ld de, $ff00 - ld bc, $804 + lb de, -1, 0 + lb bc, 8, SPRITE_FACING_UP jr TryWalking .notUp cp $c0 ; $80 <= a < $c0: left (or up) @@ -235,8 +234,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveLeft dec hl dec hl ; move tile pointer two columns left - ld de, $ff - ld bc, $208 + lb de, 0, -1 + lb bc, 2, SPRITE_FACING_LEFT jr TryWalking .notLeft ; $c0 <= a: right (or down) ld a, [wCurSpriteMovement2] @@ -245,8 +244,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveRight inc hl inc hl ; move tile pointer two columns right - ld de, $1 - ld bc, $10c + lb de, 0, 1 + lb bc, 1, SPRITE_FACING_RIGHT jr TryWalking ; changes facing direction by zeroing the movement delta and calling TryWalking diff --git a/engine/palettes.asm b/engine/palettes.asm index a9160d21..a325e0a3 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -328,10 +328,10 @@ SendSGBPacket: ; 71feb (1c:5feb) ld [$fff9],a ; send RESET signal (P14=LOW, P15=LOW) xor a - ld [$ff00],a + ld [rJOYP],a ; set P14=HIGH, P15=HIGH ld a,$30 - ld [$ff00],a + ld [rJOYP],a ;load length of packets (16 bytes) ld b,$10 .nextByte @@ -348,10 +348,10 @@ SendSGBPacket: ; 71feb (1c:5feb) ; else (if 0th bit is zero) set P14=LOW,P15=HIGH (send bit 0) ld a,$20 .next0 - ld [$ff00],a + ld [rJOYP],a ; must set P14=HIGH,P15=HIGH between each "pulse" ld a,$30 - ld [$ff00],a + ld [rJOYP],a ; rotation will put next bit in 0th position (so we can always use command ; "bit 0,d" to fetch the bit that has to be sent) rr d @@ -362,10 +362,10 @@ SendSGBPacket: ; 71feb (1c:5feb) jr nz,.nextByte ; send bit 1 as a "stop bit" (end of parameter data) ld a,$20 - ld [$ff00],a + ld [rJOYP],a ; set P14=HIGH,P15=HIGH ld a,$30 - ld [$ff00],a + ld [rJOYP],a xor a ld [$fff9],a ; wait for about 70000 cycles @@ -448,38 +448,38 @@ CheckSGB: ; 7209b (1c:609b) ld [$fff9], a ei call Wait7000 - ld a, [rJOYP] ; $ff0 + ld a, [rJOYP] and $3 cp $3 jr nz, .asm_720fd ld a, $20 - ld [rJOYP], a ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 + ld [rJOYP], a + ld a, [rJOYP] + ld a, [rJOYP] call Wait7000 call Wait7000 ld a, $30 - ld [rJOYP], a ; $ff0 + ld [rJOYP], a call Wait7000 call Wait7000 ld a, $10 - ld [rJOYP], a ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 + ld [rJOYP], a + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] call Wait7000 call Wait7000 ld a, $30 - ld [rJOYP], a ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 + ld [rJOYP], a + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] call Wait7000 call Wait7000 - ld a, [rJOYP] ; $ff0 + ld a, [rJOYP] and $3 cp $3 jr nz, .asm_720fd diff --git a/engine/predefs.asm b/engine/predefs.asm index 17f94b73..73a22ad9 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -111,7 +111,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef InternalClockTradeAnim add_predef TrainerEngage add_predef IndexToPokedex - add_predef DisplayPicCenteredOrUpperRight; 3B display pic? + add_predef DisplayPicCenteredOrUpperRight add_predef UsedCut add_predef ShowPokedexData add_predef WriteMonMoves @@ -128,15 +128,15 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef DrawEnemyHUDAndHPBar add_predef LoadTownMap_Nest add_predef PrintMonType - add_predef EmotionBubble; 4C player exclamation + add_predef EmotionBubble add_predef EmptyFunc3; return immediately add_predef AskName add_predef PewterGuys add_predef SaveSAVtoSRAM2 - add_predef LoadSAVCheckSum2 + add_predef LoadSAV2 add_predef LoadSAV add_predef SaveSAVtoSRAM1 - add_predef DoInGameTradeDialogue ; 54 initiate trade + add_predef DoInGameTradeDialogue add_predef HallOfFamePC add_predef DisplayDexRating dbw $1E, _LeaveMapAnim ; wrong bank diff --git a/engine/save.asm b/engine/save.asm index 56468595..7265fa3c 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -4,11 +4,11 @@ LoadSAV: ; 735e8 (1c:75e8) call ClearScreen call LoadFontTilePatterns call LoadTextBoxTilePatterns - call LoadSAVCheckSum + call LoadSAV0 jr c, .badsum - call LoadSAVCheckSum1 + call LoadSAV1 jr c, .badsum - call LoadSAVCheckSum2 + call LoadSAV2 jr c, .badsum ld a, $2 ; good checksum jr .goodsum @@ -24,14 +24,14 @@ LoadSAV: ; 735e8 (1c:75e8) res 6, [hl] ld a, $1 ; bad checksum .goodsum - ld [wd088], a ; checksum flag + ld [wSaveFileStatus], a ret FileDataDestroyedText: ; 7361e (1c:761e) TX_FAR _FileDataDestroyedText db "@" -LoadSAVCheckSum: ; 73623 (1c:7623) +LoadSAV0: ; 73623 (1c:7623) ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -43,7 +43,9 @@ LoadSAVCheckSum: ; 73623 (1c:7623) ld c, a ld a, [sMainDataCheckSum] ; SAV's checksum cp c - jp z, .Func_73652 + jp z, .checkSumsMatched + +; If the computed checksum didn't match the saved on, try again. ld hl, sPlayerName ld bc, sMainDataCheckSum - sPlayerName call SAVCheckSum @@ -52,7 +54,7 @@ LoadSAVCheckSum: ; 73623 (1c:7623) cp c jp nz, SAVBadCheckSum -.Func_73652 ; 73652 (1c:7652) +.checkSumsMatched ld hl, sPlayerName ld de, wPlayerName ld bc, 11 @@ -76,7 +78,7 @@ LoadSAVCheckSum: ; 73623 (1c:7623) and a jp SAVGoodChecksum -LoadSAVCheckSum1: ; 73690 (1c:7690) +LoadSAV1: ; 73690 (1c:7690) ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -96,7 +98,7 @@ LoadSAVCheckSum1: ; 73690 (1c:7690) and a jp SAVGoodChecksum -LoadSAVCheckSum2: ; 736bd (1c:76bd) +LoadSAV2: ; 736bd (1c:76bd) ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -129,10 +131,11 @@ SAVGoodChecksum: ; 736f8 (1c:76f8) ld [MBC1SRamEnable], a ret -Func_73701: ; 73701 (1c:7701) - call LoadSAVCheckSum - call LoadSAVCheckSum1 - jp LoadSAVCheckSum2 +LoadSAVIgnoreBadCheckSum: ; 73701 (1c:7701) +; unused function that loads save data and ignores bad checksums + call LoadSAV0 + call LoadSAV1 + jp LoadSAV2 SaveSAV: ; 7370a (1c:770a) callba PrintSaveScreenText @@ -140,7 +143,7 @@ SaveSAV: ; 7370a (1c:770a) call SaveSAVConfirm and a ;|0 = Yes|1 = No| ret nz - ld a,[wd088] + ld a,[wSaveFileStatus] dec a jr z,.save call SAVCheckRandomID @@ -270,14 +273,14 @@ SaveSAVtoSRAM2: ; 7380f (1c:780f) SaveSAVtoSRAM: ; 73848 (1c:7848) ld a, $2 - ld [wd088], a + ld [wSaveFileStatus], a call SaveSAVtoSRAM0 call SaveSAVtoSRAM1 jp SaveSAVtoSRAM2 SAVCheckSum: ; 73856 (1c:7856) ;Check Sum (result[1 byte] is complemented) - ld d, $0 + ld d, 0 .loop ld a, [hli] add d @@ -290,11 +293,11 @@ SAVCheckSum: ; 73856 (1c:7856) cpl ret -Func_73863: ; 73863 (1c:7863) +CalcIndividualBoxCheckSums: ; 73863 (1c:7863) ld hl, sBox1 ; sBox7 - ld de, sBoxes1CheckSum2 ; sBoxes2CheckSum2 + ld de, sBank2IndividualBoxChecksums ; sBank3IndividualBoxChecksums ld b, NUM_BOXES / 2 -.asm_7386b +.loop push bc push de ld bc, wBoxMonNicksEnd - W_NUMINBOX @@ -304,21 +307,23 @@ Func_73863: ; 73863 (1c:7863) inc de pop bc dec b - jr nz, .asm_7386b + jr nz, .loop ret -Func_7387b: ; 7387b (1c:787b) - ld hl, PointerTable_73895 +GetBoxSRAMLocation: ; 7387b (1c:787b) +; in: a = box num +; out: b = box SRAM bank, hl = pointer to start of box + ld hl, BoxSRAMPointerTable ld a, [wCurrentBoxNum] and $7f cp NUM_BOXES / 2 - ld b, $2 - jr c, .asm_7388c + ld b, 2 + jr c, .next inc b sub NUM_BOXES / 2 -.asm_7388c +.next ld e, a - ld d, $0 + ld d, 0 add hl, de add hl, de ld a, [hli] @@ -326,7 +331,7 @@ Func_7387b: ; 7387b (1c:787b) ld l, a ret -PointerTable_73895: ; 73895 (1c:7895) +BoxSRAMPointerTable: ; 73895 (1c:7895) dw sBox1 ; sBox7 dw sBox2 ; sBox8 dw sBox3 ; sBox9 @@ -342,9 +347,9 @@ ChangeBox:: ; 738a1 (1c:78a1) and a ret nz ; return if No was chosen ld hl, wCurrentBoxNum - bit 7, [hl] - call z, Func_73a29 - call Func_7393f + bit 7, [hl] ; is it the first time player is changing the box? + call z, EmptyAllSRAMBoxes ; if so, empty all boxes in SRAM + call DisplayChangeBoxMenu call UpdateSprites ld hl, hFlags_0xFFF6 set 1, [hl] @@ -353,17 +358,17 @@ ChangeBox:: ; 738a1 (1c:78a1) res 1, [hl] bit 1, a ret nz - call Func_7387b + call GetBoxSRAMLocation ld e, l ld d, h ld hl, W_NUMINBOX - call Func_7390e + call CopyBoxToOrFromSRAM ; copy old box from WRAM to SRAM ld a, [wCurrentMenuItem] set 7, a ld [wCurrentBoxNum], a - call Func_7387b + call GetBoxSRAMLocation ld de, W_NUMINBOX - call Func_7390e + call CopyBoxToOrFromSRAM ; copy new box from SRAM to WRAM ld hl, W_MAPTEXTPTR ld de, wChangeBoxSavedMapTextPointer ld a, [hli] @@ -384,7 +389,8 @@ WhenYouChangeBoxText: ; 73909 (1c:7909) TX_FAR _WhenYouChangeBoxText db "@" -Func_7390e: ; 7390e (1c:790e) +CopyBoxToOrFromSRAM: ; 7390e (1c:790e) +; copy an entire box from hl to de with b as the SRAM bank push hl ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -395,30 +401,33 @@ Func_7390e: ; 7390e (1c:790e) ld bc, wBoxMonNicksEnd - W_NUMINBOX call CopyData pop hl + +; mark the memory that the box was copied from as am empty box xor a ld [hli], a dec a ld [hl], a + ld hl, sBox1 ; sBox7 - ld bc, sBoxes1CheckSum - sBox1 + ld bc, sBank2AllBoxesChecksum - sBox1 call SAVCheckSum - ld [sBoxes1CheckSum], a ; sBoxes2CheckSum - call Func_73863 + ld [sBank2AllBoxesChecksum], a ; sBank3AllBoxesChecksum + call CalcIndividualBoxCheckSums xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a ret -Func_7393f: ; 7393f (1c:793f) +DisplayChangeBoxMenu: ; 7393f (1c:793f) xor a ld [H_AUTOBGTRANSFERENABLED], a - ld a, $3 + ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $b + ld a, 11 ld [wMaxMenuItem], a - ld a, $1 + ld a, 1 ld [wTopMenuItemY], a - ld a, $c + ld a, 12 ld [wTopMenuItemX], a xor a ld [wMenuWatchMovingOutOfBounds], a @@ -427,14 +436,14 @@ Func_7393f: ; 7393f (1c:793f) ld [wCurrentMenuItem], a ld [wLastMenuItem], a coord hl, 0, 0 - ld b, $2 - ld c, $9 + ld b, 2 + ld c, 9 call TextBoxBorder ld hl, ChooseABoxText call PrintText coord hl, 11, 0 - ld b, $c - ld c, $7 + ld b, 12 + ld c, 7 call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] @@ -446,37 +455,37 @@ Func_7393f: ; 7393f (1c:793f) ld a, [wCurrentBoxNum] and $7f cp 9 - jr c, .asm_739a6 + jr c, .singleDigitBoxNum sub 9 coord hl, 8, 2 ld [hl], "1" add "0" - jr .asm_739a8 -.asm_739a6 + jr .next +.singleDigitBoxNum add "1" -.asm_739a8 +.next Coorda 9, 2 coord hl, 1, 2 ld de, BoxNoText call PlaceString - call Func_73a84 + call GetMonCountsForAllBoxes coord hl, 18, 1 - ld de, wWhichTrade + ld de, wBoxMonCounts ld bc, SCREEN_WIDTH ld a, $c -.asm_739c2 +.loop push af ld a, [de] - and a - jr z, .asm_739c9 - ld [hl], $78 -.asm_739c9 + and a ; is the box empty? + jr z, .skipPlacingPokeball + ld [hl], $78 ; place pokeball tile next to box name if box not empty +.skipPlacingPokeball add hl, bc inc de pop af dec a - jr nz, .asm_739c2 - ld a, $1 + jr nz, .loop + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ret @@ -501,51 +510,54 @@ BoxNames: ; 739d9 (1c:79d9) BoxNoText: ; 73a21 (1c:7a21) db "BOX No.@" -Func_73a29: ; 73a29 (1c:7a29) +EmptyAllSRAMBoxes: ; 73a29 (1c:7a29) +; marks all boxes in SRAM as empty (initialisation for the first time the +; player changes the box) ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 ld [MBC1SRamBankingMode], a - ld a, $2 + ld a, 2 ld [MBC1SRamBank], a - call Func_73a4b - ld a, $3 + call EmptySRAMBoxesInBank + ld a, 3 ld [MBC1SRamBank], a - call Func_73a4b + call EmptySRAMBoxesInBank xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a ret -Func_73a4b: ; 73a4b (1c:7a4b) +EmptySRAMBoxesInBank: ; 73a4b (1c:7a4b) +; marks every box in the current SRAM bank as empty ld hl, sBox1 ; sBox7 - call Func_73a7f + call EmptySRAMBox ld hl, sBox2 ; sBox8 - call Func_73a7f + call EmptySRAMBox ld hl, sBox3 ; sBox9 - call Func_73a7f + call EmptySRAMBox ld hl, sBox4 ; sBox10 - call Func_73a7f + call EmptySRAMBox ld hl, sBox5 ; sBox11 - call Func_73a7f + call EmptySRAMBox ld hl, sBox6 ; sBox12 - call Func_73a7f + call EmptySRAMBox ld hl, sBox1 ; sBox7 - ld bc, sBoxes1CheckSum - sBox1 + ld bc, sBank2AllBoxesChecksum - sBox1 call SAVCheckSum - ld [sBoxes1CheckSum], a ; sBoxes2CheckSum - call Func_73863 + ld [sBank2AllBoxesChecksum], a ; sBank3AllBoxesChecksum + call CalcIndividualBoxCheckSums ret -Func_73a7f: ; 73a7f (1c:7a7f) +EmptySRAMBox: ; 73a7f (1c:7a7f) xor a ld [hli], a dec a ld [hl], a ret -Func_73a84: ; 73a84 (1c:7a84) - ld hl, wWhichTrade +GetMonCountsForAllBoxes: ; 73a84 (1c:7a84) + ld hl, wBoxMonCounts push hl ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -553,24 +565,27 @@ Func_73a84: ; 73a84 (1c:7a84) ld [MBC1SRamBankingMode], a ld a, $2 ld [MBC1SRamBank], a - call Func_73ab8 + call GetMonCountsForBoxesInBank ld a, $3 ld [MBC1SRamBank], a - call Func_73ab8 + call GetMonCountsForBoxesInBank xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a pop hl + +; copy the count for the current box from WRAM ld a, [wCurrentBoxNum] and $7f ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [W_NUMINBOX] ld [hl], a + ret -Func_73ab8: ; 73ab8 (1c:7ab8) +GetMonCountsForBoxesInBank: ; 73ab8 (1c:7ab8) ld a, [sBox1] ; sBox7 ld [hli], a ld a, [sBox2] ; sBox8 @@ -646,7 +661,7 @@ SaveHallOfFameTeams: ; 73b0d (1c:7b0d) LoadHallOfFameTeams: ; 73b3f (1c:7b3f) ld hl, sHallOfFame ld bc, HOF_TEAM - ld a, [wWhichTrade] + ld a, [wHoFTeamIndex] call AddNTimes ld de, wcc5b ld bc, HOF_TEAM diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index ea1eb315..cf6ad3d5 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -867,7 +867,7 @@ LoadSlotMachineTiles: ; 378a8 (d:78a8) ld bc, $00f0 call CopyData call EnableLCD - ld hl, wTrainerEngageDistance + ld hl, wSlotMachineWheel1Offset ld a, $1c ld [hli], a ld [hli], a diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 3a4e2e4c..5acdd2c9 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -21,7 +21,7 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) ld [wc0ef], a ld [wc0f0], a -LoadTitlescreenGraphics: ; 42dd (1:42dd) +DisplayTitleScreen: ; 42dd (1:42dd) call GBPalWhiteOut ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a diff --git a/home/init.asm b/home/init.asm index 932797ac..3e8d1d2b 100644 --- a/home/init.asm +++ b/home/init.asm @@ -23,17 +23,17 @@ rLCDC_DEFAULT EQU %11100011 xor a ld [rIF], a ld [rIE], a - ld [$ff43], a - ld [$ff42], a + ld [rSCX], a + ld [rSCY], a ld [rSB], a ld [rSC], a ld [rWX], a - ld [$ff4a], a - ld [$ff06], a - ld [$ff07], a + ld [rWY], a + ld [rTMA], a + ld [rTAC], a ld [rBGP], a ld [rOBP0], a - ld [$ff49], a + ld [rOBP1], a ld a, rLCDC_ENABLE_MASK ld [rLCDC], a @@ -66,10 +66,10 @@ rLCDC_DEFAULT EQU %11100011 xor a ld [hTilesetType], a - ld [$ff41], a + ld [rSTAT], a ld [hSCX], a ld [hSCY], a - ld [$ff0f], a + ld [rIF], a ld a, 1 << VBLANK + 1 << TIMER + 1 << SERIAL ld [rIE], a diff --git a/hram.asm b/hram.asm index a05f3d18..8bbf7150 100644 --- a/hram.asm +++ b/hram.asm @@ -90,6 +90,8 @@ hNPCSpriteOffset EQU $FF95 ; temp value used when swapping bytes hSwapTemp EQU $FF95 +hExperience EQU $FF96 ; 3 bytes, big endian + ; Multiplcation and division variables are meant ; to overlap for back-to-back usage. Big endian. @@ -261,6 +263,8 @@ hQuotient2 EQU $FFE7 hSpriteVRAMSlotAndFacing EQU $FFE9 +hCoordsInFrontOfPlayerMatch EQU $FFEA + hSpriteAnimFrameCounter EQU $FFEA H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn diff --git a/macros.asm b/macros.asm index 5f1deaf6..ba83e73a 100644 --- a/macros.asm +++ b/macros.asm @@ -14,7 +14,7 @@ dex EQUS "db $5f, $50" ; End a Pokedex entry. percent EQUS "* $ff / 100" lb: MACRO ; r, hi, lo - ld \1, (\2) << 8 + (\3) + ld \1, (\2) << 8 + ((\3) & $ff) ENDM diff --git a/main.asm b/main.asm index 08747a5a..c90f5436 100755 --- a/main.asm +++ b/main.asm @@ -3743,7 +3743,7 @@ _AddPartyMon: ; f2e5 (3:72e5) dec de dec de xor a - ld [wHPBarMaxHP], a + ld [wLearningMovesFromDayCare], a predef WriteMonMoves pop de ld a, [wPlayerID] ; set trainer ID to player ID @@ -3758,13 +3758,13 @@ _AddPartyMon: ; f2e5 (3:72e5) callab CalcExperience pop de inc de - ld a, [H_MULTIPLICAND] ; write experience + ld a, [hExperience] ; write experience ld [de], a inc de - ld a, [H_MULTIPLICAND+1] + ld a, [hExperience + 1] ld [de], a inc de - ld a, [H_MULTIPLICAND+2] + ld a, [hExperience + 2] ld [de], a xor a ld b, $a diff --git a/scripts/agatha.asm b/scripts/agatha.asm index e65b1fa2..850cc0bb 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -67,7 +67,7 @@ AgathaScript0: ; 76490 (1d:6490) ld [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr c, .asm_764b4 ld hl, wd865 diff --git a/scripts/bruno.asm b/scripts/bruno.asm index bd28917c..76a5919a 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -67,7 +67,7 @@ BrunoScript0: ; 76339 (1d:6339) ld [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr c, .asm_7635d ld hl, wd864 diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 20873a81..2c7bd449 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -42,7 +42,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld hl, CeruleanCityCoords1 call ArePlayerCoordsInArray jr nc, .asm_194f7 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 ld a, $8 ld b, SPRITE_FACING_DOWN diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 330f2234..794d681e 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -9,19 +9,19 @@ DayCareMText1: ; 56254 (15:6254) call SaveScreenTilesToBuffer2 ld a, [W_DAYCARE_IN_USE] and a - jp nz, DayCareMScript_562e1 - ld hl, DayCareMText_5640f + jp nz, .daycareInUse + ld hl, DayCareIntroText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - ld hl, DayCareMText_5643b - jp nz, DayCareMScript_56409 + ld hl, DayCareComeAgainText + jp nz, .done ld a, [wPartyCount] dec a - ld hl, DayCareMText_56445 - jp z, DayCareMScript_56409 - ld hl, DayCareMText_56414 + ld hl, DayCareOnlyHaveOneMonText + jp z, .done + ld hl, DayCareWhichMonText call PrintText xor a ld [wUpdateSpritesEnabled], a @@ -33,17 +33,17 @@ DayCareMText1: ; 56254 (15:6254) call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal pop af - ld hl, DayCareMText_56437 - jp c, DayCareMScript_56409 + ld hl, DayCareAllRightThenText + jp c, .done callab KnowsHMMove - ld hl, DayCareMText_5644a - jp c, DayCareMScript_56409 + ld hl, DayCareCantAcceptMonWithHMText + jp c, .done xor a ld [wPartyAndBillsPCSavedMenuItem], a ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName - ld hl, DayCareMText_56419 + ld hl, DayCareWillLookAfterMonText call PrintText ld a, 1 ld [W_DAYCARE_IN_USE], a @@ -55,10 +55,10 @@ DayCareMText1: ; 56254 (15:6254) call RemovePokemon ld a, [wcf91] call PlayCry - ld hl, DayCareMText_5641e - jp DayCareMScript_56409 + ld hl, DayCareComeSeeMeInAWhileText + jp .done -DayCareMScript_562e1: ; 562e1 (15:62e1) +.daycareInUse xor a ld hl, W_DAYCAREMONNAME call GetPartyMonName @@ -68,40 +68,41 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) callab CalcLevelFromExperience ld a, d cp MAX_LEVEL - jr c, .asm_56315 + jr c, .skipCalcExp + ld d, MAX_LEVEL callab CalcExperience ld hl, wDayCareMonExp - ld a, [H_NUMTOPRINT] + ld a, [hExperience] ld [hli], a - ld a, [$ff97] + ld a, [hExperience + 1] ld [hli], a - ld a, [$ff98] + ld a, [hExperience + 2] ld [hl], a ld d, MAX_LEVEL -.asm_56315 +.skipCalcExp xor a - ld [wTrainerEngageDistance], a + ld [wDayCareNumLevelsGrown], a ld hl, wDayCareMonBoxLevel ld a, [hl] - ld [wTrainerSpriteOffset], a + ld [wDayCareStartLevel], a cp d ld [hl], d - ld hl, DayCareMText_56432 - jr z, .asm_56333 - ld a, [wTrainerSpriteOffset] + ld hl, DayCareMonNeedsMoreTimeText + jr z, .next + ld a, [wDayCareStartLevel] ld b, a ld a, d sub b - ld [wTrainerEngageDistance], a - ld hl, DayCareMText_56423 + ld [wDayCareNumLevelsGrown], a + ld hl, DayCareMonHasGrownText -.asm_56333 +.next call PrintText ld a, [wPartyCount] cp PARTY_LENGTH - ld hl, DayCareMText_56440 + ld hl, DayCareNoRoomForMonText jp z, .asm_56403 ld de, wTrainerFacingDirection xor a @@ -112,7 +113,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld a, $1 ld [hli], a ld [hl], $0 - ld a, [wTrainerEngageDistance] + ld a, [wDayCareNumLevelsGrown] inc a ld b, a ld c, $2 @@ -126,13 +127,13 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) pop hl dec b jr nz, .asm_56357 - ld hl, DayCareMText_56428 + ld hl, DayCareOweMoneyText call PrintText ld a, $13 ld [wTextBoxID], a call DisplayTextBoxID call YesNoChoice - ld hl, DayCareMText_56437 + ld hl, DayCareAllRightThenText ld a, [wCurrentMenuItem] and a jp nz, .asm_56403 @@ -144,13 +145,13 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld [hMoney + 2], a call HasEnoughMoney jr nc, .asm_56396 - ld hl, DayCareMText_56454 + ld hl, DayCareNotEnoughMoneyText jp .asm_56403 .asm_56396 xor a ld [W_DAYCARE_IN_USE], a - ld hl, wTrainerEngageDistance + ld hl, wDayCareNumLevelsGrown ld [hli], a inc hl ld de, wPlayerMoney + 2 @@ -161,7 +162,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID - ld hl, DayCareMText_5644f + ld hl, DayCareHeresYourMonText call PrintText ld a, DAYCARE_TO_PARTY ld [wMoveMonType], a @@ -178,10 +179,12 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld d, h ld e, l ld a, 1 - ld [wHPBarMaxHP], a + ld [wLearningMovesFromDayCare], a predef WriteMonMoves pop bc pop af + +; set mon's HP to max ld hl, wPartyMon1HP call AddNTimes ld d, h @@ -193,73 +196,74 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) inc de ld a, [hl] ld [de], a + ld a, [wcf91] call PlayCry - ld hl, DayCareMText_5642d - jr DayCareMScript_56409 + ld hl, DayCareGotMonBackText + jr .done .asm_56403 - ld a, [wTrainerSpriteOffset] + ld a, [wDayCareStartLevel] ld [wDayCareMonBoxLevel], a -DayCareMScript_56409: ; 56409 (15:6409) +.done call PrintText jp TextScriptEnd -DayCareMText_5640f: ; 5640f (15:640f) - TX_FAR _DayCareMText_5640f +DayCareIntroText: ; 5640f (15:640f) + TX_FAR _DayCareIntroText db "@" -DayCareMText_56414: ; 56414 (15:6414) - TX_FAR _DayCareMText_56414 +DayCareWhichMonText: ; 56414 (15:6414) + TX_FAR _DayCareWhichMonText db "@" -DayCareMText_56419: ; 56419 (15:6419) - TX_FAR _DayCareMText_56419 +DayCareWillLookAfterMonText: ; 56419 (15:6419) + TX_FAR _DayCareWillLookAfterMonText db "@" -DayCareMText_5641e: ; 5641e (15:641e) - TX_FAR _DayCareMText_5641e +DayCareComeSeeMeInAWhileText: ; 5641e (15:641e) + TX_FAR _DayCareComeSeeMeInAWhileText db "@" -DayCareMText_56423: ; 56423 (15:6423) - TX_FAR _DayCareMText_56423 +DayCareMonHasGrownText: ; 56423 (15:6423) + TX_FAR _DayCareMonHasGrownText db "@" -DayCareMText_56428: ; 56428 (15:6428) - TX_FAR _DayCareMText_56428 +DayCareOweMoneyText: ; 56428 (15:6428) + TX_FAR _DayCareOweMoneyText db "@" -DayCareMText_5642d: ; 5642d (15:642d) - TX_FAR _DayCareMText_5642d +DayCareGotMonBackText: ; 5642d (15:642d) + TX_FAR _DayCareGotMonBackText db "@" -DayCareMText_56432: ; 56432 (15:6432) - TX_FAR _DayCareMText_56432 +DayCareMonNeedsMoreTimeText: ; 56432 (15:6432) + TX_FAR _DayCareMonNeedsMoreTimeText db "@" -DayCareMText_56437: ; 56437 (15:6437) - TX_FAR _DayCareMText_56437 -DayCareMText_5643b: ; 5643b (15:643b) - TX_FAR _DayCareMText_5643b +DayCareAllRightThenText: ; 56437 (15:6437) + TX_FAR _DayCareAllRightThenText +DayCareComeAgainText: ; 5643b (15:643b) + TX_FAR _DayCareComeAgainText db "@" -DayCareMText_56440: ; 56440 (15:6440) - TX_FAR _DayCareMText_56440 +DayCareNoRoomForMonText: ; 56440 (15:6440) + TX_FAR _DayCareNoRoomForMonText db "@" -DayCareMText_56445: ; 56445 (15:6445) - TX_FAR _DayCareMText_56445 +DayCareOnlyHaveOneMonText: ; 56445 (15:6445) + TX_FAR _DayCareOnlyHaveOneMonText db "@" -DayCareMText_5644a: ; 5644a (15:644a) - TX_FAR _DayCareMText_5644a +DayCareCantAcceptMonWithHMText: ; 5644a (15:644a) + TX_FAR _DayCareCantAcceptMonWithHMText db "@" -DayCareMText_5644f: ; 5644f (15:644f) - TX_FAR _DayCareMText_5644f +DayCareHeresYourMonText: ; 5644f (15:644f) + TX_FAR _DayCareHeresYourMonText db "@" -DayCareMText_56454: ; 56454 (15:6454) - TX_FAR _DayCareMText_56454 +DayCareNotEnoughMoneyText: ; 56454 (15:6454) + TX_FAR _DayCareNotEnoughMoneyText db "@" diff --git a/scripts/lance.asm b/scripts/lance.asm index e335914b..a4089be4 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -60,7 +60,7 @@ LanceScript0: ; 5a305 (16:6305) jp nc, CheckFightingMapTrainers xor a ld [hJoyHeld], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr nc, .asm_5a325 ld a, $1 diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 1f1fcde0..eb6c3e7d 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -68,7 +68,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr c, .asm_76206 ld hl, wd863 diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index fa31718f..c22bf761 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -65,7 +65,7 @@ Mansion3Script_5225b: ; 5225b (14:625b) ret nz call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wWhichDungeonWarp], a ld hl, wd72d set 4, [hl] diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index bba73dbd..d4996b4b 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -25,51 +25,51 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) TX_ASM ld a, [wd7c6] add a - jp c, .asm_49353 + jp c, .alreadyBoughtMagikarp ld hl, MtMoonPokecenterText_4935c call PrintText - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID call YesNoChoice ld a, [wCurrentMenuItem] and a - jp nz, .asm_4934e + jp nz, .choseNo ld [hMoney], a ld [hMoney + 2], a ld a, $5 ld [hMoney + 1], a call HasEnoughMoney - jr nc, .asm_faa09 + jr nc, .enoughMoney ld hl, MtMoonPokecenterText_49366 - jr .asm_49356 -.asm_faa09 + jr .printText +.enoughMoney ld bc,(MAGIKARP << 8) | 5 call GivePokemon - jr nc, .asm_49359 + jr nc, .done xor a - ld [wWhichTrade], a - ld [wTrainerFacingDirection], a + ld [wPriceTemp], a + ld [wPriceTemp + 2], a ld a, $5 - ld [wTrainerEngageDistance], a - ld hl, wTrainerFacingDirection + ld [wPriceTemp + 1], a + ld hl, wPriceTemp + 2 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID ld hl, wd7c6 set 7, [hl] - jr .asm_49359 -.asm_4934e + jr .done +.choseNo ld hl, MtMoonPokecenterText_49361 - jr .asm_49356 -.asm_49353 + jr .printText +.alreadyBoughtMagikarp ld hl, MtMoonPokecenterText_4936b -.asm_49356 +.printText call PrintText -.asm_49359 +.done jp TextScriptEnd MtMoonPokecenterText_4935c: ; 4935c (12:535c) diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 38c3f717..f4d7de10 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -96,11 +96,11 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, wd754 set 0, [hl] xor a - ld [wMuseumPriceTemp], a - ld [wMuseumPriceTemp + 1], a + ld [wPriceTemp], a + ld [wPriceTemp + 1], a ld a, $50 - ld [wMuseumPriceTemp + 2], a - ld hl, wMuseumPriceTemp + 2 + ld [wPriceTemp + 2], a + ld hl, wPriceTemp + 2 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 5463b879..226c2d2d 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -307,7 +307,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $d ld [hSpriteIndexOrTextID], a call DisplayTextID - ld a, [wTrainerEngageDistance] + ld a, [wRivalStarterBallSpriteIndex] cp $2 jr nz, .asm_1cd28 ld a, HS_STARTER_BALL_1 @@ -323,7 +323,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld [wcc4d], a predef HideObject call Delay3 - ld a, [wWhichTrade] + ld a, [wRivalStarterTemp] ld [W_RIVALSTARTER], a ld [wcf91], a ld [wd11e], a @@ -806,9 +806,9 @@ OaksLabText29: ; 1d102 (7:5102) OaksLabText2: ; 1d102 (7:5102) TX_ASM ld a, STARTER2 - ld [wWhichTrade], a + ld [wRivalStarterTemp], a ld a, $3 - ld [wTrainerEngageDistance], a + ld [wRivalStarterBallSpriteIndex], a ld a, STARTER1 ld b, $2 jr OaksLabScript_1d133 @@ -817,9 +817,9 @@ OaksLabText30: ; 1d113 (7:5113) OaksLabText3: ; 1d113 (7:5113) TX_ASM ld a, STARTER3 - ld [wWhichTrade], a + ld [wRivalStarterTemp], a ld a, $4 - ld [wTrainerEngageDistance], a + ld [wRivalStarterBallSpriteIndex], a ld a, STARTER2 ld b, $3 jr OaksLabScript_1d133 @@ -828,9 +828,9 @@ OaksLabText31: ; 1d124 (7:5124) OaksLabText4: ; 1d124 (7:5124) TX_ASM ld a, STARTER1 - ld [wWhichTrade], a + ld [wRivalStarterTemp], a ld a, $2 - ld [wTrainerEngageDistance], a + ld [wRivalStarterBallSpriteIndex], a ld a, STARTER3 ld b, $4 @@ -858,13 +858,13 @@ OaksLabScript_1d157: ; 1d157 (7:5157) ld a, $9 ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 - ld [hl], $0 + ld [hl], SPRITE_FACING_DOWN ld a, $1 ld [H_SPRITEINDEX], a ld a, $9 ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 - ld [hl], $c + ld [hl], SPRITE_FACING_RIGHT ld hl, wd730 set 6, [hl] predef StarterDex ; StarterDex diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 42bc3086..584878eb 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -26,39 +26,45 @@ PewterPokecenterText3: ; 5c59b (17:459b) ld c, 32 call DelayFrames ld hl, JigglypuffFacingDirections - ld de, wTrainerFacingDirection - ld bc, $0004 + ld de, wJigglypuffFacingDirections + ld bc, 4 call CopyData - ld a, [wSpriteStateData1 + $32] - ld hl, wTrainerFacingDirection -.asm_5c5c3 + + ld a, [wSpriteStateData1 + 3 * $10 + $2] + ld hl, wJigglypuffFacingDirections +.findMatchingFacingDirectionLoop cp [hl] inc hl - jr nz, .asm_5c5c3 + jr nz, .findMatchingFacingDirectionLoop dec hl push hl ld c, BANK(Music_JigglypuffSong) ld a, MUSIC_JIGGLYPUFF_SONG call PlayMusic pop hl -.asm_5c5d1 +.loop ld a, [hl] - ld [wSpriteStateData1 + $32], a + ld [wSpriteStateData1 + 3 * $10 + $2], a + +; rotate the array push hl - ld hl, wTrainerFacingDirection - ld de, wTrainerEngageDistance - ld bc, $0004 + ld hl, wJigglypuffFacingDirections + ld de, wJigglypuffFacingDirections - 1 + ld bc, 4 call CopyData - ld a, [wTrainerEngageDistance] - ld [wcd42], a + ld a, [wJigglypuffFacingDirections - 1] + ld [wJigglypuffFacingDirections + 3], a pop hl + ld c, 24 call DelayFrames + ld a, [wc026] ld b, a ld a, [wc027] or b - jr nz, .asm_5c5d1 + jr nz, .loop + ld c, 48 call DelayFrames call PlayDefaultMusic diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index e89630fc..2e5b55f7 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -26,7 +26,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld [hJoyHeld], a ld a, SPRITE_FACING_RIGHT ld [wSpriteStateData1 + 9], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr z, .asm_7520f ld a, $2 diff --git a/scripts/seafoamislands1.asm b/scripts/seafoamislands1.asm index 6a8b23ea..f71fc648 100755 --- a/scripts/seafoamislands1.asm +++ b/scripts/seafoamislands1.asm @@ -10,7 +10,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) call CheckBoulderCoords ret nc ld hl, wd7e8 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_44819 set 6, [hl] @@ -36,7 +36,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) ld a, $9f ld [wDungeonWarpDestinationMap], a ld hl, Seafoam1HolesCoords - jp Func_46981 + jp IsPlayerOnDungeonWarp Seafoam1HolesCoords: ; 44846 (11:4846) db $06,$11 diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm index 44e92bd0..a62d6bda 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/seafoamislands2.asm @@ -8,7 +8,7 @@ SeafoamIslands2Script: ; 46315 (11:6315) call CheckBoulderCoords ret nc ld hl, wd87f - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_46340 set 0, [hl] @@ -34,7 +34,7 @@ SeafoamIslands2Script: ; 46315 (11:6315) ld a, $a0 ld [wDungeonWarpDestinationMap], a ld hl, Seafoam2HolesCoords - jp Func_46981 + jp IsPlayerOnDungeonWarp Seafoam2HolesCoords: ; 4636d (11:636d) db $06,$12 diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm index 882553ab..0b650135 100755 --- a/scripts/seafoamislands3.asm +++ b/scripts/seafoamislands3.asm @@ -8,7 +8,7 @@ SeafoamIslands3Script: ; 46451 (11:6451) call CheckBoulderCoords ret nc ld hl, wd880 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_4647c set 0, [hl] @@ -34,7 +34,7 @@ SeafoamIslands3Script: ; 46451 (11:6451) ld a, $a1 ld [wDungeonWarpDestinationMap], a ld hl, Seafoam3HolesCoords - jp Func_46981 + jp IsPlayerOnDungeonWarp Seafoam3HolesCoords: ; 464a9 (11:64a9) db $06,$13 diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index 8009e221..f16ab2c6 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -8,7 +8,7 @@ SeafoamIslands4Script: ; 4658d (11:658d) call CheckBoulderCoords ret nc ld hl, wd881 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_465b8 set 0, [hl] @@ -35,7 +35,7 @@ SeafoamIslands4Script: ; 4658d (11:658d) ld a, $a2 ld [wDungeonWarpDestinationMap], a ld hl, Seafoam4HolesCoords - call Func_46981 + call IsPlayerOnDungeonWarp ld a, [wd732] bit 4, a ret nz diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 47583600..ab303728 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -34,7 +34,7 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7) ld hl, CoordsData_467fe call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr nc, .asm_467e6 ld a, $40 @@ -81,7 +81,7 @@ SeafoamIslands5Script2: ; 46816 (11:6816) call ArePlayerCoordsInArray ld a, $0 jr nc, .asm_46849 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_46837 ld de, RLEMovementData_46859 diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 8538d37f..5043b947 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -142,7 +142,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_51c7d - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wcf0d], a cp $1 jr z, .asm_51c6c diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index a8cf3b8d..adae2e91 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -57,15 +57,15 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld bc, $0078 ld a, $14 call FillMemory - ld a, $1 - ld [$ffba], a + ld a, 1 + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a - ld [$ffba], a - ld [wWhichTrade], a - ld [$ff49], a - ld a, $58 - ld [wTrainerEngageDistance], a + ld [H_AUTOBGTRANSFERENABLED], a + ld [wSSAnneSmokeDriftAmount], a + ld [rOBP1], a + ld a, 88 + ld [wSSAnneSmokeX], a ld hl, wMapViewVRAMPointer ld c, [hl] inc hl @@ -88,11 +88,11 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) push hl push de call ScheduleEastColumnRedraw - call VermilionDock_1dc59 + call VermilionDock_EmitSmokePuff pop de ld b, $10 .asm_1dc11 - call VermilionDock_1dc42 + call VermilionDock_AnimSmokePuffDriftRight ld c, $8 .asm_1dc16 call VermilionDock_1dc7c @@ -105,7 +105,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) dec e jr nz, .asm_1dbfa xor a - ld [$ff4a], a + ld [rWY], a ld [hWY], a call VermilionDock_1dc94 ld a, $90 @@ -122,33 +122,34 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) dec [hl] ret -VermilionDock_1dc42: ; 1dc42 (7:5c42) +VermilionDock_AnimSmokePuffDriftRight: ; 1dc42 (7:5c42) push bc push de ld hl, wOAMBuffer + $11 - ld a, [wWhichTrade] + ld a, [wSSAnneSmokeDriftAmount] swap a ld c, a - ld de, $0004 -.asm_1dc50 + ld de, 4 +.loop inc [hl] inc [hl] add hl, de dec c - jr nz, .asm_1dc50 + jr nz, .loop pop de pop bc ret -VermilionDock_1dc59: ; 1dc59 (7:5c59) - ld a, [wTrainerEngageDistance] - sub $10 - ld [wTrainerEngageDistance], a +VermilionDock_EmitSmokePuff: ; 1dc59 (7:5c59) +; new smoke puff above the S.S. Anne's front smokestack + ld a, [wSSAnneSmokeX] + sub 16 + ld [wSSAnneSmokeX], a ld c, a - ld b, $64 - ld a, [wWhichTrade] + ld b, 100 ; Y + ld a, [wSSAnneSmokeDriftAmount] inc a - ld [wWhichTrade], a + ld [wSSAnneSmokeDriftAmount], a ld a, $1 ld de, VermilionDockOAMBlock call WriteOAMBlock @@ -171,7 +172,7 @@ VermilionDock_1dc7c: ; 1dc7c (7:5c7c) cp l jr nz, .asm_1dc86 ld a, h - ld [$ff43], a + ld [rSCX], a .asm_1dc8e ld a, [rLY] cp h diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 51346032..fd095638 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -49,7 +49,7 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) call CheckBoulderCoords jp nc, CheckFightingMapTrainers ld hl, wd7ee - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $2 jr z, .asm_5180b bit 0, [hl] diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 9aeb1d18..14b6895d 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -34,7 +34,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld hl, .coordsData_449f9 call CheckBoulderCoords jp nc, .asm_449fe - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_449dc ld hl, wd126 @@ -60,11 +60,11 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) db $FF .asm_449fe - ld a, $c2 + ld a, VICTORY_ROAD_2 ld [wDungeonWarpDestinationMap], a ld hl, .coordsData_449f9 - call Func_46981 - ld a, [wWhichTrade] + call IsPlayerOnDungeonWarp + ld a, [wCoordIndex] cp $1 jr nz, .asm_44a1b ld hl, wd72d diff --git a/sram.asm b/sram.asm index 9d498df9..f0cf6fac 100644 --- a/sram.asm +++ b/sram.asm @@ -29,8 +29,8 @@ sBox3:: ds wBoxMonNicksEnd - W_NUMINBOX ; a8c4 sBox4:: ds wBoxMonNicksEnd - W_NUMINBOX ; ad26 sBox5:: ds wBoxMonNicksEnd - W_NUMINBOX ; b188 sBox6:: ds wBoxMonNicksEnd - W_NUMINBOX ; b5ea -sBoxes1CheckSum:: ds 1 ; ba4c -sBoxes1CheckSum2:: ds 6 ; ba4d +sBank2AllBoxesChecksum:: ds 1 ; ba4c +sBank2IndividualBoxChecksums:: ds 6 ; ba4d SECTION "Saved Boxes 2", SRAM, BANK[3] @@ -41,5 +41,5 @@ sBox9:: ds wBoxMonNicksEnd - W_NUMINBOX ; a8c4 sBox10:: ds wBoxMonNicksEnd - W_NUMINBOX ; ad26 sBox11:: ds wBoxMonNicksEnd - W_NUMINBOX ; b188 sBox12:: ds wBoxMonNicksEnd - W_NUMINBOX ; b5ea -sBoxes2CheckSum:: ds 1 ; ba4c -sBoxes2CheckSum2:: ds 6 ; ba4d +sBank3AllBoxesChecksum:: ds 1 ; ba4c +sBank3IndividualBoxChecksums:: ds 6 ; ba4d diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm index a4182351..a42e3cf2 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -1,16 +1,16 @@ -_DayCareMText_5640f:: ; 8ab95 (22:6b95) +_DayCareIntroText:: ; 8ab95 (22:6b95) text "I run a DAYCARE." line "Would you like me" cont "to raise one of" cont "your #MON?" done -_DayCareMText_56414:: ; 8abd4 (22:6bd4) +_DayCareWhichMonText:: ; 8abd4 (22:6bd4) text "Which #MON" line "should I raise?" prompt -_DayCareMText_56419:: ; 8abf0 (22:6bf0) +_DayCareWillLookAfterMonText:: ; 8abf0 (22:6bf0) text "Fine, I'll look" line "after @" TX_RAM wcd6d @@ -18,12 +18,12 @@ _DayCareMText_56419:: ; 8abf0 (22:6bf0) cont "for a while." prompt -_DayCareMText_5641e:: ; 8ac19 (22:6c19) +_DayCareComeSeeMeInAWhileText:: ; 8ac19 (22:6c19) text "Come see me in" line "a while." done -_DayCareMText_56423:: ; 8ac32 (22:6c32) +_DayCareMonHasGrownText:: ; 8ac32 (22:6c32) text "Your @" TX_RAM wcd6d db $0 @@ -31,15 +31,13 @@ _DayCareMText_56423:: ; 8ac32 (22:6c32) para "By level, it's" line "grown by @" - -DayCareMText_8ac67:: ; 8ac67 (22:6c67) - TX_NUM wTrainerEngageDistance,$1,$3 + TX_NUM wDayCareNumLevelsGrown,$1,$3 text "!" para "Aren't I great?" prompt -_DayCareMText_56428:: ; 8ac7d (22:6c7d) +_DayCareOweMoneyText:: ; 8ac7d (22:6c7d) text "You owe me ¥@" TX_BCD wcd3f, $c2 db $0 @@ -47,14 +45,14 @@ _DayCareMText_56428:: ; 8ac7d (22:6c7d) cont "of this #MON." done -_DayCareMText_5642d:: ; 8acae (22:6cae) +_DayCareGotMonBackText:: ; 8acae (22:6cae) text $52, " got" line "@" TX_RAM W_DAYCAREMONNAME text " back!" done -_DayCareMText_56432:: ; 8acc1 (22:6cc1) +_DayCareMonNeedsMoreTimeText:: ; 8acc1 (22:6cc1) text "Back already?" line "Your @" TX_RAM wcd6d diff --git a/text/maps/daycare_2.asm b/text/maps/daycare_2.asm index c6478a76..b5104e60 100644 --- a/text/maps/daycare_2.asm +++ b/text/maps/daycare_2.asm @@ -1,8 +1,8 @@ -_DayCareMText_56437:: ; 8c000 (23:4000) +_DayCareAllRightThenText:: ; 8c000 (23:4000) text "All right then," line "@@" -_DayCareMText_5643b:: ; 8c013 (23:4013) +_DayCareComeAgainText:: ; 8c013 (23:4013) IF DEF(_YELLOW) text "Come again." ELSE @@ -10,28 +10,28 @@ ELSE ENDC done -_DayCareMText_56440:: ; 8c020 (23:4020) +_DayCareNoRoomForMonText:: ; 8c020 (23:4020) text "You have no room" line "for this #MON!" done -_DayCareMText_56445:: ; 8c041 (23:4041) +_DayCareOnlyHaveOneMonText:: ; 8c041 (23:4041) text "You only have one" line "#MON with you." done -_DayCareMText_5644a:: ; 8c063 (23:4063) +_DayCareCantAcceptMonWithHMText:: ; 8c063 (23:4063) text "I can't accept a" line "#MON that" cont "knows an HM move." done -_DayCareMText_5644f:: ; 8c090 (23:4090) +_DayCareHeresYourMonText:: ; 8c090 (23:4090) text "Thank you! Here's" line "your #MON!" prompt -_DayCareMText_56454:: ; 8c0ad (23:40ad) +_DayCareNotEnoughMoneyText:: ; 8c0ad (23:40ad) text "Hey, you don't" line "have enough ¥!" done diff --git a/wram.asm b/wram.asm index 8633e732..f089352b 100755 --- a/wram.asm +++ b/wram.asm @@ -424,6 +424,10 @@ wNumStepsToTake:: ; cca1 wRLEByteCount:: ; ccd2 ds 1 +wAddedToParty:: ; ccd3 +; 0 = not added +; 1 = added + wSimulatedJoypadStatesEnd:: ; ccd3 ; this is the end of the joypad states ; the list starts above this address and extends downwards in memory until here @@ -431,7 +435,13 @@ wSimulatedJoypadStatesEnd:: ; ccd3 wParentMenuItem:: ; ccd3 -wccd3:: ds 1 ; used in battle, pokemon, PC and game corner stuff +wCanEvolveFlags:: ; ccd3 +; 1 flag for each party member indicating whether it can evolve +; The purpose of these flags is to track which mons levelled up during the +; current battle at the end of the battle when evolution occurs. +; Other methods of evolution simply set it by calling TryEvolvingMon. + ds 1 + wForceEvolution:: wccd4:: ds 1 ; has a direct reference for simulated joypad stuff in vermillion and seafoam @@ -634,9 +644,33 @@ wOverrideSimulatedJoypadStatesMask:: ; cd3b ds 1 +wHoFTeamIndex:: ; cd3d + +wSSAnneSmokeDriftAmount:: ; cd3d +; multiplied by 16 to get the number of times to go right by 2 pixels + +wRivalStarterTemp:: ; cd3d + +wBoxMonCounts:: ; cd3d +; 12 bytes +; array of the number of mons in each box + +wDexMaxSeenMon:: ; cd3d + +wPPRestoreItem:: ; cd3d + +wWereAnyMonsAsleep:: ; cd3d + +wCanPlaySlots:: ; cd3d + +wNumShakes:: ; cd3d + +wDayCareStartLevel:: ; cd3d +; the level of the mon at the time it entered day care + wWhichBadge:: ; cd3d -wMuseumPriceTemp:: ; cd3d +wPriceTemp:: ; cd3d ; 3-byte BCD number wTitleMonSpecies:: ; cd3d @@ -701,6 +735,12 @@ wWhichTrade:: ; cd3d wTrainerSpriteOffset:: ; cd3d ds 1 +wSSAnneSmokeX:: ; cd3e + +wRivalStarterBallSpriteIndex:: ; cd3e + +wDayCareNumLevelsGrown:: ; cd3e + wOptionsBattleAnimCursorX:: ; cd3e wTrainerInfoTextBoxWidth:: ; cd3e @@ -733,6 +773,8 @@ wHiddenObjectFunctionRomBank:: ; cd3e wTrainerEngageDistance:: ; cd3e ds 1 +wJigglypuffFacingDirections:: ; cd3f + wOptionsBattleStyleCursorX:: ; cd3f wTrainerInfoTextBoxNextRowOffset:: ; cd3f @@ -774,6 +816,10 @@ wHiddenObjectY:: ; cd40 wTrainerScreenY:: ; cd40 ds 1 +wHoFTeamIndex2:: ; cd41 + +wHiddenItemOrCoinsIndex:: ; cd41 + wTradedPlayerMonOT:: ; cd41 wHiddenObjectX:: ; cd41 @@ -962,16 +1008,32 @@ wTileMapBackup2:: ; cd81 ; second buffer for temporarily saving and restoring current screen's tiles (e.g. if menus are drawn on top) ds 20 * 18 +wEvoOldSpecies:: ; cee9 + wBuffer:: ; cee9 ; Temporary storage area of 30 bytes. wTownMapCoords:: ; cee9 ; lower nybble is x, upper nybble is y +wLearningMovesFromDayCare:: ; cee9 +; whether WriteMonMoves is being used to make a mon learn moves from day care +; non-zero if so + wHPBarMaxHP:: ; cee9 - ds 2 + ds 1 + +wEvoNewSpecies:: ; ceea + ds 1 + +wEvoMonTileOffset:: ; ceeb + wHPBarOldHP:: ; ceeb - ds 2 + ds 1 + +wEvoCancelled:: ; ceec + ds 1 + wHPBarNewHP:: ; ceed ds 2 wHPBarDelta:: ; ceef @@ -1453,7 +1515,10 @@ W_SUBANIMCOUNTER:: ; d087 ; counts the number of subentries left in the current subanimation ds 1 -wd088:: ds 1 ; savefile checksum (if file is corrupted) +wSaveFileStatus:: +; 1 = no save file or save file is corrupted +; 2 = save file exists and no corruption has been detected + ds 1 W_NUMFBTILES:: ; d089 ; number of tiles in current battle animation frame block @@ -1462,6 +1527,8 @@ W_NUMFBTILES:: ; d089 wTradedMonMovingRight:: ; d08a ; $01 if mon is moving from left gameboy to right gameboy; $00 if vice versa +wOptionsInitialized:: ; d08a + wd08a:: ds 1 ; used with sprites and displaying the option menu on the main menu screen? wAnimCounter:: ; d08b @@ -2079,6 +2146,8 @@ wBoxItems:: ; d53b ds 1 ; end wCurrentBoxNum:: ; d5a0 +; bits 0-6: box number +; bit 7: whether the player has changed boxes before ds 2 wNumHoFTeams:: ; d5a2 @@ -2319,8 +2388,11 @@ W_ROUTE18GATECURSCRIPT:: ; d669 ds 134 -wd6f0:: ds 14 ; flags for hidden items? -wd6fe:: ds 2 ; flags for hidden coins? +wObtainedHiddenItemsFlags:: + ds 14 + +wObtainedHiddenCoinsFlags:: + ds 2 wWalkBikeSurfState:: ; d700 ; $00 = walking -- cgit v1.3.1-sl0p From db7d941d22d89cf8d6d13cbf768208c5cf2ac2c2 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 19 Jul 2015 20:45:34 -0700 Subject: constants for flag actions --- constants/misc_constants.asm | 6 ++++++ engine/battle/core.asm | 12 ++++++------ engine/battle/experience.asm | 6 +++--- engine/evos_moves.asm | 6 +++--- engine/give_pokemon.asm | 2 +- engine/hidden_object_functions7.asm | 8 ++++---- engine/in_game_trades.asm | 4 ++-- engine/items/itemfinder.asm | 2 +- engine/items/items.asm | 14 +++++++------- engine/items/tms.asm | 2 +- engine/menu/pokedex.asm | 2 +- engine/overworld/hidden_items.asm | 8 ++++---- home.asm | 6 +++--- main.asm | 18 +++++++++--------- scripts/cinnabargym.asm | 6 +++--- scripts/route23.asm | 6 +++--- 16 files changed, 57 insertions(+), 51 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index cb167da6..68090c78 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -133,6 +133,12 @@ PLAYER_DIR_LEFT EQU (1 << PLAYER_DIR_BIT_LEFT) PLAYER_DIR_DOWN EQU (1 << PLAYER_DIR_BIT_DOWN) PLAYER_DIR_UP EQU (1 << PLAYER_DIR_BIT_UP) +; flag operations + +FLAG_RESET EQU 0 +FLAG_SET EQU 1 +FLAG_TEST EQU 2 + ; serial ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 42d7f5e6..a74e0a27 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -328,7 +328,7 @@ StartBattle: ; 3c11e (f:411e) call SaveScreenTilesToBuffer1 ld a, [wWhichPokemon] ld c, a - ld b, $1 + ld b, FLAG_SET push bc ld hl, wPartyGainExpFlags predef FlagActionPredef @@ -1081,7 +1081,7 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741) ld a, [wPlayerMonNumber] ld c, a ld hl, wPartyGainExpFlags - ld b, $0 + ld b, FLAG_RESET predef FlagActionPredef ; clear gain exp flag for fainted mon ld hl, W_ENEMYBATTSTATUS1 res 2, [hl] ; reset "attacking multiple times" flag @@ -1181,7 +1181,7 @@ ChooseNextMon: ; 3c7d8 (f:47d8) ld [wPlayerMonNumber], a ld c, a ld hl, wPartyGainExpFlags - ld b, $1 + ld b, FLAG_SET push bc predef FlagActionPredef pop bc @@ -1350,7 +1350,7 @@ EnemySendOut: ; 3c90e (f:490e) ld [hl],a ld a,[wPlayerMonNumber] ld c,a - ld b,1 + ld b,FLAG_SET push bc predef FlagActionPredef ld hl,wPartyFoughtCurrentEnemyFlags @@ -2490,7 +2490,7 @@ SwitchPlayerMon: ; 3d1ba (f:51ba) ld a, [wWhichPokemon] ld [wPlayerMonNumber], a ld c, a - ld b, $1 + ld b, FLAG_SET push bc ld hl, wPartyGainExpFlags predef FlagActionPredef @@ -6326,7 +6326,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) ld a, [wd11e] dec a ld c, a - ld b, $1 + ld b, FLAG_SET ld hl, wPokedexSeen predef FlagActionPredef ; mark this mon as seen in the pokedex ld hl, wEnemyMonLevel diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 6ec8c463..6f479ea3 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -15,7 +15,7 @@ GainExperience: ; 5524f (15:524f) ld hl, wPartyGainExpFlags ld a, [wWhichPokemon] ld c, a - ld b, $2 + ld b, FLAG_TEST predef FlagActionPredef ld a, c and a ; is mon's gain exp flag set? @@ -257,7 +257,7 @@ GainExperience: ; 5524f (15:524f) ld hl, wCanEvolveFlags ld a, [wWhichPokemon] ld c, a - ld b, $1 + ld b, FLAG_SET predef FlagActionPredef pop hl pop af @@ -281,7 +281,7 @@ GainExperience: ; 5524f (15:524f) ld [hl], a ; clear gain exp flags ld a, [wPlayerMonNumber] ld c, a - ld b, $1 + ld b, FLAG_SET push bc predef FlagActionPredef ; set the gain exp flag for the mon that is currently out ld hl, wPartyFoughtCurrentEnemyFlags diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 3129b560..2c668d63 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -5,7 +5,7 @@ TryEvolvingMon: ; 3ad0e (e:6d0e) ld [hl], a ld a, [wWhichPokemon] ld c, a - ld b, $1 + ld b, FLAG_SET call Evolution_FlagAction ; this is only called after battle @@ -36,7 +36,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wWhichPokemon] ld c, a ld hl, wCanEvolveFlags - ld b, $2 + ld b, FLAG_TEST call Evolution_FlagAction ld a, c and a ; is the mon's bit set? @@ -217,7 +217,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wd11e] dec a ld c, a - ld b, $1 + ld b, FLAG_SET ld hl, wPokedexOwned push bc call Evolution_FlagAction diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 4b45631d..02e2b743 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -60,7 +60,7 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11) dec a ld c, a ld hl, wPokedexOwned - ld b, $1 + ld b, FLAG_SET predef FlagActionPredef pop af ld [wd11e], a diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 397d2a02..8893e496 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -209,7 +209,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) call PrintText ld a, [$ffe0] ld c, a - ld b, $1 + ld b, FLAG_SET call CinnabarGymQuiz_1ea8a jp CinnabarGymQuiz_1eb0a .asm_1eab8 @@ -222,7 +222,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) ld a, [$ffdb] add $2 ld c, a - ld b, $2 + ld b, FLAG_TEST ld hl, wd79a predef FlagActionPredef ld a, c @@ -241,7 +241,7 @@ CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3) ld a, [$ffe0] ld c, a - ld b, $2 + ld b, FLAG_TEST call CinnabarGymQuiz_1ea8a ld a, c and a @@ -278,7 +278,7 @@ CinnabarGymQuiz_1eb0a: ; 1eb0a (7:6b0a) ld a, [$ffdb] ld [$ffe0], a ld c, a - ld b, $2 + ld b, FLAG_TEST call CinnabarGymQuiz_1ea8a ld a, c and a diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index fffaedcf..96c37ab0 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -38,7 +38,7 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) ld hl,wCompletedInGameTradeFlags ld a,[wWhichTrade] ld c,a - ld b,$2 + ld b,FLAG_TEST predef FlagActionPredef ld a,c and a @@ -112,7 +112,7 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) ld hl,wCompletedInGameTradeFlags ld a,[wWhichTrade] ld c,a - ld b,$1 + ld b,FLAG_SET predef FlagActionPredef ld hl, ConnectCableText call PrintText diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 51277632..5da72388 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -10,7 +10,7 @@ HiddenItemNear: ; 7481f (1d:481f) push hl ld hl, wObtainedHiddenItemsFlags ld c, b - ld b, $2 + ld b, FLAG_TEST predef FlagActionPredef ld a, c pop hl diff --git a/engine/items/items.asm b/engine/items/items.asm index 000940d2..f2c41ef6 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -400,15 +400,15 @@ ItemUseBall: ; d687 (3:5687) ld a,[wd11e] dec a ld c,a - ld b,2 - ld hl,wPokedexOwned ;Dex_own_flags (pokemon) + ld b,FLAG_TEST + ld hl,wPokedexOwned predef FlagActionPredef ld a,c push af ld a,[wd11e] dec a ld c,a - ld b,1 + ld b,FLAG_SET predef FlagActionPredef pop af and a @@ -804,7 +804,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld a,[wUsedItemOnWhichPokemon] ld c,a ld hl,wPartyFoughtCurrentEnemyFlags - ld b,$02 + ld b,FLAG_TEST predef FlagActionPredef ld a,c and a @@ -812,7 +812,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld a,[wUsedItemOnWhichPokemon] ld c,a ld hl,wPartyGainExpFlags - ld b,$01 + ld b,FLAG_SET predef FlagActionPredef .next pop bc @@ -2550,8 +2550,8 @@ IsKeyItem_: ; e764 (3:6764) dec a ld c,a ld hl,wHPBarMaxHP - ld b,$02 ; test bit - predef FlagActionPredef ; bitfield operation function + ld b,FLAG_TEST + predef FlagActionPredef ld a,c and a ret nz diff --git a/engine/items/tms.asm b/engine/items/tms.asm index 511aab5b..23912b34 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -17,7 +17,7 @@ CanLearnTM: ; 1373e (4:773e) jr .findTMloop .TMfoundLoop pop hl - ld b, $2 ; read corresponding bit from TM compatibility array + ld b, FLAG_TEST predef_jump FlagActionPredef ; converts TM/HM number in wd11e into move number diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 4e173bc0..2f22f78e 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -379,7 +379,7 @@ IsPokemonBitSet: ; 402c2 (10:42c2) ld a,[wd11e] dec a ld c,a - ld b,2 + ld b,FLAG_TEST predef FlagActionPredef ld a,c and a diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 311b38d4..fc69afc1 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -5,7 +5,7 @@ HiddenItems: ; 76688 (1d:6688) ld hl, wObtainedHiddenItemsFlags ld a, [wHiddenItemOrCoinsIndex] ld c, a - ld b, $2 + ld b, FLAG_TEST predef FlagActionPredef ld a, c and a @@ -31,7 +31,7 @@ FoundHiddenItemText: ; 7675b (1d:675b) ld hl, wObtainedHiddenItemsFlags ld a, [wTrainerScreenX] ld c, a - ld b, $1 + ld b, FLAG_SET predef FlagActionPredef ld a, SFX_GET_ITEM_2 call PlaySoundWaitForCurrent @@ -61,7 +61,7 @@ HiddenCoins: ; 76799 (1d:6799) ld hl, wObtainedHiddenCoinsFlags ld a, [wHiddenItemOrCoinsIndex] ld c, a - ld b, $2 + ld b, FLAG_TEST predef FlagActionPredef ld a, c and a @@ -102,7 +102,7 @@ HiddenCoins: ; 76799 (1d:6799) ld hl, wObtainedHiddenCoinsFlags ld a, [wTrainerScreenX] ld c, a - ld b, $1 + ld b, FLAG_SET predef FlagActionPredef call EnableAutoTextBoxDrawing ld a, [wPlayerCoins] diff --git a/home.asm b/home.asm index b5165ebf..6bb54df2 100644 --- a/home.asm +++ b/home.asm @@ -2297,7 +2297,7 @@ TalkToTrainer:: ; 31cc (0:31cc) call ReadTrainerHeaderInfo ; read flag's byte ptr ld a, [wTrainerHeaderFlagBit] ld c, a - ld b, $2 + ld b, FLAG_TEST call TrainerFlagAction ; read trainer's flag ld a, c and a @@ -2392,7 +2392,7 @@ EndTrainerBattle:: ; 3275 (0:3275) call ReadTrainerHeaderInfo ld a, [wTrainerHeaderFlagBit] ld c, a - ld b, $1 + ld b, FLAG_SET call TrainerFlagAction ; flag trainer as fought ld a, [W_ENEMYMONORTRAINERCLASS] cp $c8 @@ -2470,7 +2470,7 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) ret z ld a, $2 call ReadTrainerHeaderInfo ; read trainer flag's byte ptr - ld b, $2 + ld b, FLAG_TEST ld a, [wTrainerHeaderFlagBit] ld c, a call TrainerFlagAction ; read trainer flag diff --git a/main.asm b/main.asm index d45b8825..2261acb8 100755 --- a/main.asm +++ b/main.asm @@ -2038,7 +2038,7 @@ _DisplayPokedex: ; 7c18 (1:7c18) ld a, [wd11e] dec a ld c, a - ld b, $1 + ld b, FLAG_SET ld hl, wPokedexSeen predef FlagActionPredef ld a, $1 @@ -3235,7 +3235,7 @@ MarkTownVisitedAndLoadMissableObjects: ; f113 (3:7113) cp ROUTE_1 jr nc, .notInTown ld c, a - ld b, $1 + ld b, FLAG_SET ld hl, W_TOWNVISITEDFLAG ; mark town as visited (for flying) predef FlagActionPredef .notInTown @@ -3319,7 +3319,7 @@ InitializeMissableObjectsFlags: ; f175 (3:7175) ld hl, W_MISSABLEOBJECTFLAGS ld a, [wd048] ld c, a - ld b, $1 + ld b, FLAG_SET call MissableObjectFlagAction ; set flag iff Item is hidden .asm_f19d ld hl, wd048 @@ -3343,7 +3343,7 @@ IsObjectHidden: ; f1a6 (3:71a6) ld a, [hli] jr nz, .loop ld c, a - ld b, $2 + ld b, FLAG_TEST ld hl, W_MISSABLEOBJECTFLAGS call MissableObjectFlagAction ld a, c @@ -3362,7 +3362,7 @@ ShowObject2: ld hl, W_MISSABLEOBJECTFLAGS ld a, [wcc4d] ld c, a - ld b, $0 + ld b, FLAG_RESET call MissableObjectFlagAction ; reset "removed" flag jp UpdateSprites @@ -3372,7 +3372,7 @@ HideObject: ; f1d7 (3:71d7) ld hl, W_MISSABLEOBJECTFLAGS ld a, [wcc4d] ld c, a - ld b, $1 + ld b, FLAG_SET call MissableObjectFlagAction ; set "removed" flag jp UpdateSprites @@ -3642,7 +3642,7 @@ _AddPartyMon: ; f2e5 (3:72e5) ld a, [wd11e] dec a ld c, a - ld b, $2 + ld b, FLAG_TEST ld hl, wPokedexOwned call FlagAction ld a, c @@ -3650,7 +3650,7 @@ _AddPartyMon: ; f2e5 (3:72e5) ld a, [wd11e] dec a ld c, a - ld b, $1 + ld b, FLAG_SET push bc call FlagAction pop bc @@ -3882,7 +3882,7 @@ _AddEnemyMonToPlayerParty: ; f49d (3:749d) ld a, [wd11e] dec a ld c, a - ld b, $1 + ld b, FLAG_SET ld hl, wPokedexOwned push bc call FlagAction ; add to owned pokemon diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index fcafa83a..213568d5 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -99,7 +99,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) ld a, [wTrainerHeaderFlagBit] ld [$ffdb], a ld c, a - ld b, $2 + ld b, FLAG_TEST ld hl, wd79a call CinnabarGymScript_757f1 ld a, c @@ -113,13 +113,13 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) ld a, [wTrainerHeaderFlagBit] ld [$ffdb], a ld c, a - ld b, $1 + ld b, FLAG_SET ld hl, wd79a call CinnabarGymScript_757f1 ld a, [wTrainerHeaderFlagBit] sub $2 ld c, a - ld b, $1 + ld b, FLAG_SET ld hl, wd79c call CinnabarGymScript_757f1 call Func_3ead diff --git a/scripts/route23.asm b/scripts/route23.asm index a258b88a..cfcf41f5 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -52,7 +52,7 @@ Route23Script0: ; 51219 (14:5219) ld [hSpriteIndexOrTextID], a ld a, c ld [wWhichBadge], a - ld b, $2 + ld b, FLAG_TEST ld hl, wd7ed predef FlagActionPredef ld a, c @@ -193,7 +193,7 @@ Route23Script_51346: ; 51346 (14:5346) ld a, [wWhichBadge] inc a ld c, a - ld b, $2 + ld b, FLAG_TEST ld hl, W_OBTAINEDBADGES predef FlagActionPredef ld a, c @@ -210,7 +210,7 @@ Route23Script_51346: ; 51346 (14:5346) call PrintText ld a, [wWhichBadge] ld c, a - ld b, $1 + ld b, FLAG_SET ld hl, wd7ed predef FlagActionPredef ld a, $2 -- cgit v1.3.1-sl0p From b4081e851ac4b7ce5cf1fa7c9fc83a490a4c83ec Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 22 Jul 2015 09:57:31 -0500 Subject: Rename sound effect files --- audio.asm | 648 +++++++++++++++--------------- audio/headers/sfxheaders02.asm | 560 +++++++++++++------------- audio/headers/sfxheaders08.asm | 704 ++++++++++++++++----------------- audio/headers/sfxheaders1f.asm | 594 ++++++++++++++-------------- audio/sfx/59_1.asm | 11 + audio/sfx/59_3.asm | 11 + audio/sfx/arrow_tiles_1.asm | 6 + audio/sfx/arrow_tiles_3.asm | 6 + audio/sfx/ball_poof.asm | 11 + audio/sfx/ball_toss.asm | 11 + audio/sfx/battle_09.asm | 6 + audio/sfx/battle_0b.asm | 3 + audio/sfx/battle_0c.asm | 5 + audio/sfx/battle_0d.asm | 5 + audio/sfx/battle_0e.asm | 4 + audio/sfx/battle_0f.asm | 6 + audio/sfx/battle_12.asm | 6 + audio/sfx/battle_13.asm | 6 + audio/sfx/battle_14.asm | 6 + audio/sfx/battle_16.asm | 5 + audio/sfx/battle_17.asm | 6 + audio/sfx/battle_18.asm | 4 + audio/sfx/battle_19.asm | 5 + audio/sfx/battle_1b.asm | 4 + audio/sfx/battle_1c.asm | 5 + audio/sfx/battle_1e.asm | 16 + audio/sfx/battle_20.asm | 4 + audio/sfx/battle_21.asm | 7 + audio/sfx/battle_22.asm | 4 + audio/sfx/battle_23.asm | 7 + audio/sfx/battle_24.asm | 12 + audio/sfx/battle_25.asm | 7 + audio/sfx/battle_26.asm | 9 + audio/sfx/battle_27.asm | 27 ++ audio/sfx/battle_28.asm | 21 + audio/sfx/battle_29.asm | 18 + audio/sfx/battle_2a.asm | 28 ++ audio/sfx/battle_2b.asm | 21 + audio/sfx/battle_2c.asm | 25 ++ audio/sfx/battle_2e.asm | 27 ++ audio/sfx/battle_2f.asm | 21 + audio/sfx/battle_31.asm | 18 + audio/sfx/battle_32.asm | 12 + audio/sfx/battle_33.asm | 18 + audio/sfx/battle_34.asm | 22 ++ audio/sfx/battle_35.asm | 29 ++ audio/sfx/battle_36.asm | 47 +++ audio/sfx/caught_mon.asm | 61 +++ audio/sfx/collision_1.asm | 6 + audio/sfx/collision_3.asm | 6 + audio/sfx/cry00_1.asm | 21 + audio/sfx/cry00_2.asm | 21 + audio/sfx/cry00_3.asm | 21 + audio/sfx/cry01_1.asm | 24 ++ audio/sfx/cry01_2.asm | 24 ++ audio/sfx/cry01_3.asm | 24 ++ audio/sfx/cry02_1.asm | 17 + audio/sfx/cry02_2.asm | 17 + audio/sfx/cry02_3.asm | 17 + audio/sfx/cry03_1.asm | 30 ++ audio/sfx/cry03_2.asm | 30 ++ audio/sfx/cry03_3.asm | 30 ++ audio/sfx/cry04_1.asm | 32 ++ audio/sfx/cry04_2.asm | 32 ++ audio/sfx/cry04_3.asm | 32 ++ audio/sfx/cry05_1.asm | 19 + audio/sfx/cry05_2.asm | 19 + audio/sfx/cry05_3.asm | 19 + audio/sfx/cry06_1.asm | 22 ++ audio/sfx/cry06_2.asm | 22 ++ audio/sfx/cry06_3.asm | 22 ++ audio/sfx/cry07_1.asm | 21 + audio/sfx/cry07_2.asm | 21 + audio/sfx/cry07_3.asm | 21 + audio/sfx/cry08_1.asm | 23 ++ audio/sfx/cry08_2.asm | 23 ++ audio/sfx/cry08_3.asm | 23 ++ audio/sfx/cry09_1.asm | 35 ++ audio/sfx/cry09_2.asm | 35 ++ audio/sfx/cry09_3.asm | 35 ++ audio/sfx/cry0a_1.asm | 35 ++ audio/sfx/cry0a_2.asm | 35 ++ audio/sfx/cry0a_3.asm | 35 ++ audio/sfx/cry0b_1.asm | 37 ++ audio/sfx/cry0b_2.asm | 37 ++ audio/sfx/cry0b_3.asm | 37 ++ audio/sfx/cry0c_1.asm | 29 ++ audio/sfx/cry0c_2.asm | 29 ++ audio/sfx/cry0c_3.asm | 29 ++ audio/sfx/cry0d_1.asm | 40 ++ audio/sfx/cry0d_2.asm | 40 ++ audio/sfx/cry0d_3.asm | 40 ++ audio/sfx/cry0e_1.asm | 23 ++ audio/sfx/cry0e_2.asm | 23 ++ audio/sfx/cry0e_3.asm | 23 ++ audio/sfx/cry0f_1.asm | 29 ++ audio/sfx/cry0f_2.asm | 29 ++ audio/sfx/cry0f_3.asm | 29 ++ audio/sfx/cry10_1.asm | 31 ++ audio/sfx/cry10_2.asm | 31 ++ audio/sfx/cry10_3.asm | 31 ++ audio/sfx/cry11_1.asm | 34 ++ audio/sfx/cry11_2.asm | 34 ++ audio/sfx/cry11_3.asm | 34 ++ audio/sfx/cry12_1.asm | 24 ++ audio/sfx/cry12_2.asm | 24 ++ audio/sfx/cry12_3.asm | 24 ++ audio/sfx/cry13_1.asm | 30 ++ audio/sfx/cry13_2.asm | 30 ++ audio/sfx/cry13_3.asm | 30 ++ audio/sfx/cry14_1.asm | 21 + audio/sfx/cry14_2.asm | 21 + audio/sfx/cry14_3.asm | 21 + audio/sfx/cry15_1.asm | 30 ++ audio/sfx/cry15_2.asm | 30 ++ audio/sfx/cry15_3.asm | 30 ++ audio/sfx/cry16_1.asm | 21 + audio/sfx/cry16_2.asm | 21 + audio/sfx/cry16_3.asm | 21 + audio/sfx/cry17_1.asm | 24 ++ audio/sfx/cry17_2.asm | 24 ++ audio/sfx/cry17_3.asm | 24 ++ audio/sfx/cry18_1.asm | 34 ++ audio/sfx/cry18_2.asm | 34 ++ audio/sfx/cry18_3.asm | 34 ++ audio/sfx/cry19_1.asm | 18 + audio/sfx/cry19_2.asm | 18 + audio/sfx/cry19_3.asm | 18 + audio/sfx/cry1a_1.asm | 30 ++ audio/sfx/cry1a_2.asm | 30 ++ audio/sfx/cry1a_3.asm | 30 ++ audio/sfx/cry1b_1.asm | 26 ++ audio/sfx/cry1b_2.asm | 26 ++ audio/sfx/cry1b_3.asm | 26 ++ audio/sfx/cry1c_1.asm | 31 ++ audio/sfx/cry1c_2.asm | 31 ++ audio/sfx/cry1c_3.asm | 31 ++ audio/sfx/cry1d_1.asm | 29 ++ audio/sfx/cry1d_2.asm | 29 ++ audio/sfx/cry1d_3.asm | 29 ++ audio/sfx/cry1e_1.asm | 38 ++ audio/sfx/cry1e_2.asm | 38 ++ audio/sfx/cry1e_3.asm | 38 ++ audio/sfx/cry1f_1.asm | 24 ++ audio/sfx/cry1f_2.asm | 24 ++ audio/sfx/cry1f_3.asm | 24 ++ audio/sfx/cry20_1.asm | 24 ++ audio/sfx/cry20_2.asm | 24 ++ audio/sfx/cry20_3.asm | 24 ++ audio/sfx/cry21_1.asm | 27 ++ audio/sfx/cry21_2.asm | 27 ++ audio/sfx/cry21_3.asm | 27 ++ audio/sfx/cry22_1.asm | 24 ++ audio/sfx/cry22_2.asm | 24 ++ audio/sfx/cry22_3.asm | 24 ++ audio/sfx/cry23_1.asm | 25 ++ audio/sfx/cry23_2.asm | 25 ++ audio/sfx/cry23_3.asm | 25 ++ audio/sfx/cry24_1.asm | 33 ++ audio/sfx/cry24_2.asm | 33 ++ audio/sfx/cry24_3.asm | 33 ++ audio/sfx/cry25_1.asm | 26 ++ audio/sfx/cry25_2.asm | 26 ++ audio/sfx/cry25_3.asm | 26 ++ audio/sfx/cut_1.asm | 7 + audio/sfx/cut_3.asm | 7 + audio/sfx/cymbal1_1.asm | 3 + audio/sfx/cymbal1_2.asm | 3 + audio/sfx/cymbal1_3.asm | 3 + audio/sfx/cymbal2_1.asm | 3 + audio/sfx/cymbal2_2.asm | 3 + audio/sfx/cymbal2_3.asm | 3 + audio/sfx/cymbal3_1.asm | 3 + audio/sfx/cymbal3_2.asm | 3 + audio/sfx/cymbal3_3.asm | 3 + audio/sfx/damage.asm | 5 + audio/sfx/denied_1.asm | 18 + audio/sfx/denied_3.asm | 18 + audio/sfx/dex_page_added.asm | 15 + audio/sfx/doubleslap.asm | 4 + audio/sfx/enter_pc_1.asm | 7 + audio/sfx/enter_pc_3.asm | 7 + audio/sfx/faint_fall.asm | 6 + audio/sfx/faint_thud.asm | 11 + audio/sfx/fly_1.asm | 18 + audio/sfx/fly_3.asm | 18 + audio/sfx/get_item1_1.asm | 47 +++ audio/sfx/get_item1_3.asm | 47 +++ audio/sfx/get_item2_1.asm | 69 ++++ audio/sfx/get_item2_2.asm | 69 ++++ audio/sfx/get_item2_3.asm | 69 ++++ audio/sfx/get_key_item_1.asm | 59 +++ audio/sfx/get_key_item_3.asm | 59 +++ audio/sfx/go_inside_1.asm | 4 + audio/sfx/go_inside_3.asm | 4 + audio/sfx/go_outside_1.asm | 7 + audio/sfx/go_outside_3.asm | 7 + audio/sfx/heal_ailment_1.asm | 9 + audio/sfx/heal_ailment_2.asm | 9 + audio/sfx/heal_ailment_3.asm | 9 + audio/sfx/heal_hp_1.asm | 7 + audio/sfx/heal_hp_2.asm | 7 + audio/sfx/heal_hp_3.asm | 7 + audio/sfx/healing_machine_1.asm | 9 + audio/sfx/healing_machine_3.asm | 9 + audio/sfx/horn_drill.asm | 6 + audio/sfx/intro_crash.asm | 4 + audio/sfx/intro_hip.asm | 6 + audio/sfx/intro_hop.asm | 6 + audio/sfx/intro_lunge.asm | 10 + audio/sfx/intro_raise.asm | 5 + audio/sfx/intro_whoosh.asm | 7 + audio/sfx/ledge_1.asm | 6 + audio/sfx/ledge_3.asm | 6 + audio/sfx/level_up.asm | 63 +++ audio/sfx/muted_snare1_1.asm | 4 + audio/sfx/muted_snare1_2.asm | 4 + audio/sfx/muted_snare1_3.asm | 4 + audio/sfx/muted_snare2_1.asm | 3 + audio/sfx/muted_snare2_2.asm | 3 + audio/sfx/muted_snare2_3.asm | 3 + audio/sfx/muted_snare3_1.asm | 3 + audio/sfx/muted_snare3_2.asm | 3 + audio/sfx/muted_snare3_3.asm | 3 + audio/sfx/muted_snare4_1.asm | 3 + audio/sfx/muted_snare4_2.asm | 3 + audio/sfx/muted_snare4_3.asm | 3 + audio/sfx/not_very_effective.asm | 6 + audio/sfx/peck.asm | 3 + audio/sfx/poisoned_1.asm | 8 + audio/sfx/poisoned_3.asm | 8 + audio/sfx/pokedex_rating_1.asm | 77 ++++ audio/sfx/pokedex_rating_3.asm | 77 ++++ audio/sfx/pokeflute.asm | 21 + audio/sfx/pound.asm | 3 + audio/sfx/press_ab_1.asm | 7 + audio/sfx/press_ab_2.asm | 7 + audio/sfx/press_ab_3.asm | 7 + audio/sfx/psybeam.asm | 25 ++ audio/sfx/psychic_m.asm | 32 ++ audio/sfx/purchase_1.asm | 13 + audio/sfx/purchase_3.asm | 13 + audio/sfx/push_boulder_1.asm | 10 + audio/sfx/push_boulder_3.asm | 10 + audio/sfx/run.asm | 13 + audio/sfx/safari_zone_pa.asm | 9 + audio/sfx/save_1.asm | 23 ++ audio/sfx/save_3.asm | 36 ++ audio/sfx/sfx_02_01.asm | 3 - audio/sfx/sfx_02_02.asm | 3 - audio/sfx/sfx_02_03.asm | 3 - audio/sfx/sfx_02_04.asm | 3 - audio/sfx/sfx_02_05.asm | 8 - audio/sfx/sfx_02_06.asm | 3 - audio/sfx/sfx_02_07.asm | 4 - audio/sfx/sfx_02_08.asm | 3 - audio/sfx/sfx_02_09.asm | 3 - audio/sfx/sfx_02_0a.asm | 3 - audio/sfx/sfx_02_0b.asm | 3 - audio/sfx/sfx_02_0c.asm | 3 - audio/sfx/sfx_02_0d.asm | 3 - audio/sfx/sfx_02_0e.asm | 3 - audio/sfx/sfx_02_0f.asm | 4 - audio/sfx/sfx_02_10.asm | 4 - audio/sfx/sfx_02_11.asm | 3 - audio/sfx/sfx_02_12.asm | 3 - audio/sfx/sfx_02_13.asm | 3 - audio/sfx/sfx_02_14.asm | 21 - audio/sfx/sfx_02_15.asm | 24 -- audio/sfx/sfx_02_16.asm | 17 - audio/sfx/sfx_02_17.asm | 30 -- audio/sfx/sfx_02_18.asm | 32 -- audio/sfx/sfx_02_19.asm | 19 - audio/sfx/sfx_02_1a.asm | 22 -- audio/sfx/sfx_02_1b.asm | 21 - audio/sfx/sfx_02_1c.asm | 23 -- audio/sfx/sfx_02_1d.asm | 35 -- audio/sfx/sfx_02_1e.asm | 35 -- audio/sfx/sfx_02_1f.asm | 37 -- audio/sfx/sfx_02_20.asm | 29 -- audio/sfx/sfx_02_21.asm | 40 -- audio/sfx/sfx_02_22.asm | 23 -- audio/sfx/sfx_02_23.asm | 29 -- audio/sfx/sfx_02_24.asm | 31 -- audio/sfx/sfx_02_25.asm | 34 -- audio/sfx/sfx_02_26.asm | 24 -- audio/sfx/sfx_02_27.asm | 30 -- audio/sfx/sfx_02_28.asm | 21 - audio/sfx/sfx_02_29.asm | 30 -- audio/sfx/sfx_02_2a.asm | 21 - audio/sfx/sfx_02_2b.asm | 24 -- audio/sfx/sfx_02_2c.asm | 34 -- audio/sfx/sfx_02_2d.asm | 18 - audio/sfx/sfx_02_2e.asm | 30 -- audio/sfx/sfx_02_2f.asm | 26 -- audio/sfx/sfx_02_30.asm | 31 -- audio/sfx/sfx_02_31.asm | 29 -- audio/sfx/sfx_02_32.asm | 38 -- audio/sfx/sfx_02_33.asm | 24 -- audio/sfx/sfx_02_34.asm | 24 -- audio/sfx/sfx_02_35.asm | 27 -- audio/sfx/sfx_02_36.asm | 24 -- audio/sfx/sfx_02_37.asm | 25 -- audio/sfx/sfx_02_38.asm | 33 -- audio/sfx/sfx_02_39.asm | 26 -- audio/sfx/sfx_02_3a.asm | 47 --- audio/sfx/sfx_02_3b.asm | 69 ---- audio/sfx/sfx_02_3c.asm | 8 - audio/sfx/sfx_02_3d.asm | 7 - audio/sfx/sfx_02_3e.asm | 9 - audio/sfx/sfx_02_3f.asm | 4 - audio/sfx/sfx_02_40.asm | 7 - audio/sfx/sfx_02_41.asm | 77 ---- audio/sfx/sfx_02_42.asm | 59 --- audio/sfx/sfx_02_43.asm | 8 - audio/sfx/sfx_02_44.asm | 7 - audio/sfx/sfx_02_45.asm | 13 - audio/sfx/sfx_02_46.asm | 7 - audio/sfx/sfx_02_47.asm | 7 - audio/sfx/sfx_02_48.asm | 10 - audio/sfx/sfx_02_49.asm | 8 - audio/sfx/sfx_02_4a.asm | 9 - audio/sfx/sfx_02_4b.asm | 10 - audio/sfx/sfx_02_4c.asm | 10 - audio/sfx/sfx_02_4d.asm | 6 - audio/sfx/sfx_02_4e.asm | 6 - audio/sfx/sfx_02_4f.asm | 6 - audio/sfx/sfx_02_50.asm | 18 - audio/sfx/sfx_02_51.asm | 18 - audio/sfx/sfx_02_52.asm | 6 - audio/sfx/sfx_02_53.asm | 10 - audio/sfx/sfx_02_54.asm | 22 -- audio/sfx/sfx_02_55.asm | 12 - audio/sfx/sfx_02_56.asm | 7 - audio/sfx/sfx_02_57.asm | 4 - audio/sfx/sfx_02_58.asm | 11 - audio/sfx/sfx_02_59.asm | 11 - audio/sfx/sfx_02_5a.asm | 13 - audio/sfx/sfx_02_5b.asm | 6 - audio/sfx/sfx_02_5c.asm | 7 - audio/sfx/sfx_02_5d.asm | 23 -- audio/sfx/sfx_02_5e.asm | 21 - audio/sfx/sfx_02_5f.asm | 9 - audio/sfx/sfx_08_01.asm | 3 - audio/sfx/sfx_08_02.asm | 3 - audio/sfx/sfx_08_03.asm | 3 - audio/sfx/sfx_08_04.asm | 3 - audio/sfx/sfx_08_05.asm | 8 - audio/sfx/sfx_08_06.asm | 3 - audio/sfx/sfx_08_07.asm | 4 - audio/sfx/sfx_08_08.asm | 3 - audio/sfx/sfx_08_09.asm | 3 - audio/sfx/sfx_08_0a.asm | 3 - audio/sfx/sfx_08_0b.asm | 3 - audio/sfx/sfx_08_0c.asm | 3 - audio/sfx/sfx_08_0d.asm | 3 - audio/sfx/sfx_08_0e.asm | 3 - audio/sfx/sfx_08_0f.asm | 4 - audio/sfx/sfx_08_10.asm | 4 - audio/sfx/sfx_08_11.asm | 3 - audio/sfx/sfx_08_12.asm | 3 - audio/sfx/sfx_08_13.asm | 3 - audio/sfx/sfx_08_14.asm | 21 - audio/sfx/sfx_08_15.asm | 24 -- audio/sfx/sfx_08_16.asm | 17 - audio/sfx/sfx_08_17.asm | 30 -- audio/sfx/sfx_08_18.asm | 32 -- audio/sfx/sfx_08_19.asm | 19 - audio/sfx/sfx_08_1a.asm | 22 -- audio/sfx/sfx_08_1b.asm | 21 - audio/sfx/sfx_08_1c.asm | 23 -- audio/sfx/sfx_08_1d.asm | 35 -- audio/sfx/sfx_08_1e.asm | 35 -- audio/sfx/sfx_08_1f.asm | 37 -- audio/sfx/sfx_08_20.asm | 29 -- audio/sfx/sfx_08_21.asm | 40 -- audio/sfx/sfx_08_22.asm | 23 -- audio/sfx/sfx_08_23.asm | 29 -- audio/sfx/sfx_08_24.asm | 31 -- audio/sfx/sfx_08_25.asm | 34 -- audio/sfx/sfx_08_26.asm | 24 -- audio/sfx/sfx_08_27.asm | 30 -- audio/sfx/sfx_08_28.asm | 21 - audio/sfx/sfx_08_29.asm | 30 -- audio/sfx/sfx_08_2a.asm | 21 - audio/sfx/sfx_08_2b.asm | 24 -- audio/sfx/sfx_08_2c.asm | 34 -- audio/sfx/sfx_08_2d.asm | 18 - audio/sfx/sfx_08_2e.asm | 30 -- audio/sfx/sfx_08_2f.asm | 26 -- audio/sfx/sfx_08_30.asm | 31 -- audio/sfx/sfx_08_31.asm | 29 -- audio/sfx/sfx_08_32.asm | 38 -- audio/sfx/sfx_08_33.asm | 24 -- audio/sfx/sfx_08_34.asm | 24 -- audio/sfx/sfx_08_35.asm | 27 -- audio/sfx/sfx_08_36.asm | 24 -- audio/sfx/sfx_08_37.asm | 25 -- audio/sfx/sfx_08_38.asm | 33 -- audio/sfx/sfx_08_39.asm | 26 -- audio/sfx/sfx_08_3a.asm | 63 --- audio/sfx/sfx_08_3b.asm | 69 ---- audio/sfx/sfx_08_3c.asm | 8 - audio/sfx/sfx_08_3d.asm | 7 - audio/sfx/sfx_08_3e.asm | 9 - audio/sfx/sfx_08_3f.asm | 4 - audio/sfx/sfx_08_40.asm | 7 - audio/sfx/sfx_08_41.asm | 11 - audio/sfx/sfx_08_42.asm | 11 - audio/sfx/sfx_08_43.asm | 11 - audio/sfx/sfx_08_44.asm | 13 - audio/sfx/sfx_08_45.asm | 15 - audio/sfx/sfx_08_46.asm | 61 --- audio/sfx/sfx_08_47.asm | 3 - audio/sfx/sfx_08_48.asm | 6 - audio/sfx/sfx_08_49.asm | 6 - audio/sfx/sfx_08_4a.asm | 3 - audio/sfx/sfx_08_4b.asm | 3 - audio/sfx/sfx_08_4c.asm | 5 - audio/sfx/sfx_08_4d.asm | 5 - audio/sfx/sfx_08_4e.asm | 4 - audio/sfx/sfx_08_4f.asm | 6 - audio/sfx/sfx_08_50.asm | 5 - audio/sfx/sfx_08_51.asm | 6 - audio/sfx/sfx_08_52.asm | 6 - audio/sfx/sfx_08_53.asm | 6 - audio/sfx/sfx_08_54.asm | 6 - audio/sfx/sfx_08_55.asm | 10 - audio/sfx/sfx_08_56.asm | 5 - audio/sfx/sfx_08_57.asm | 6 - audio/sfx/sfx_08_58.asm | 4 - audio/sfx/sfx_08_59.asm | 5 - audio/sfx/sfx_08_5a.asm | 4 - audio/sfx/sfx_08_5b.asm | 4 - audio/sfx/sfx_08_5c.asm | 5 - audio/sfx/sfx_08_5d.asm | 4 - audio/sfx/sfx_08_5e.asm | 16 - audio/sfx/sfx_08_5f.asm | 6 - audio/sfx/sfx_08_60.asm | 4 - audio/sfx/sfx_08_61.asm | 7 - audio/sfx/sfx_08_62.asm | 4 - audio/sfx/sfx_08_63.asm | 7 - audio/sfx/sfx_08_64.asm | 12 - audio/sfx/sfx_08_65.asm | 7 - audio/sfx/sfx_08_66.asm | 9 - audio/sfx/sfx_08_67.asm | 27 -- audio/sfx/sfx_08_68.asm | 21 - audio/sfx/sfx_08_69.asm | 18 - audio/sfx/sfx_08_6a.asm | 28 -- audio/sfx/sfx_08_6b.asm | 21 - audio/sfx/sfx_08_6c.asm | 25 -- audio/sfx/sfx_08_6d.asm | 25 -- audio/sfx/sfx_08_6e.asm | 27 -- audio/sfx/sfx_08_6f.asm | 21 - audio/sfx/sfx_08_70.asm | 32 -- audio/sfx/sfx_08_71.asm | 18 - audio/sfx/sfx_08_72.asm | 12 - audio/sfx/sfx_08_73.asm | 18 - audio/sfx/sfx_08_74.asm | 22 -- audio/sfx/sfx_08_75.asm | 29 -- audio/sfx/sfx_08_76.asm | 47 --- audio/sfx/sfx_08_77.asm | 9 - audio/sfx/sfx_1f_01.asm | 3 - audio/sfx/sfx_1f_02.asm | 3 - audio/sfx/sfx_1f_03.asm | 3 - audio/sfx/sfx_1f_04.asm | 3 - audio/sfx/sfx_1f_05.asm | 8 - audio/sfx/sfx_1f_06.asm | 3 - audio/sfx/sfx_1f_07.asm | 4 - audio/sfx/sfx_1f_08.asm | 3 - audio/sfx/sfx_1f_09.asm | 3 - audio/sfx/sfx_1f_0a.asm | 3 - audio/sfx/sfx_1f_0b.asm | 3 - audio/sfx/sfx_1f_0c.asm | 3 - audio/sfx/sfx_1f_0d.asm | 3 - audio/sfx/sfx_1f_0e.asm | 3 - audio/sfx/sfx_1f_0f.asm | 4 - audio/sfx/sfx_1f_10.asm | 4 - audio/sfx/sfx_1f_11.asm | 3 - audio/sfx/sfx_1f_12.asm | 3 - audio/sfx/sfx_1f_13.asm | 3 - audio/sfx/sfx_1f_14.asm | 21 - audio/sfx/sfx_1f_15.asm | 24 -- audio/sfx/sfx_1f_16.asm | 17 - audio/sfx/sfx_1f_17.asm | 30 -- audio/sfx/sfx_1f_18.asm | 32 -- audio/sfx/sfx_1f_19.asm | 19 - audio/sfx/sfx_1f_1a.asm | 22 -- audio/sfx/sfx_1f_1b.asm | 21 - audio/sfx/sfx_1f_1c.asm | 23 -- audio/sfx/sfx_1f_1d.asm | 35 -- audio/sfx/sfx_1f_1e.asm | 35 -- audio/sfx/sfx_1f_1f.asm | 37 -- audio/sfx/sfx_1f_20.asm | 29 -- audio/sfx/sfx_1f_21.asm | 40 -- audio/sfx/sfx_1f_22.asm | 23 -- audio/sfx/sfx_1f_23.asm | 29 -- audio/sfx/sfx_1f_24.asm | 31 -- audio/sfx/sfx_1f_25.asm | 34 -- audio/sfx/sfx_1f_26.asm | 24 -- audio/sfx/sfx_1f_27.asm | 30 -- audio/sfx/sfx_1f_28.asm | 21 - audio/sfx/sfx_1f_29.asm | 30 -- audio/sfx/sfx_1f_2a.asm | 21 - audio/sfx/sfx_1f_2b.asm | 24 -- audio/sfx/sfx_1f_2c.asm | 34 -- audio/sfx/sfx_1f_2d.asm | 18 - audio/sfx/sfx_1f_2e.asm | 30 -- audio/sfx/sfx_1f_2f.asm | 26 -- audio/sfx/sfx_1f_30.asm | 31 -- audio/sfx/sfx_1f_31.asm | 29 -- audio/sfx/sfx_1f_32.asm | 38 -- audio/sfx/sfx_1f_33.asm | 24 -- audio/sfx/sfx_1f_34.asm | 24 -- audio/sfx/sfx_1f_35.asm | 27 -- audio/sfx/sfx_1f_36.asm | 24 -- audio/sfx/sfx_1f_37.asm | 25 -- audio/sfx/sfx_1f_38.asm | 33 -- audio/sfx/sfx_1f_39.asm | 26 -- audio/sfx/sfx_1f_3a.asm | 47 --- audio/sfx/sfx_1f_3b.asm | 69 ---- audio/sfx/sfx_1f_3c.asm | 8 - audio/sfx/sfx_1f_3d.asm | 7 - audio/sfx/sfx_1f_3e.asm | 9 - audio/sfx/sfx_1f_3f.asm | 4 - audio/sfx/sfx_1f_40.asm | 7 - audio/sfx/sfx_1f_41.asm | 77 ---- audio/sfx/sfx_1f_42.asm | 59 --- audio/sfx/sfx_1f_43.asm | 8 - audio/sfx/sfx_1f_44.asm | 7 - audio/sfx/sfx_1f_45.asm | 14 - audio/sfx/sfx_1f_46.asm | 7 - audio/sfx/sfx_1f_47.asm | 7 - audio/sfx/sfx_1f_48.asm | 10 - audio/sfx/sfx_1f_49.asm | 8 - audio/sfx/sfx_1f_4a.asm | 9 - audio/sfx/sfx_1f_4b.asm | 10 - audio/sfx/sfx_1f_4c.asm | 10 - audio/sfx/sfx_1f_4d.asm | 6 - audio/sfx/sfx_1f_4e.asm | 6 - audio/sfx/sfx_1f_4f.asm | 6 - audio/sfx/sfx_1f_50.asm | 18 - audio/sfx/sfx_1f_51.asm | 18 - audio/sfx/sfx_1f_52.asm | 6 - audio/sfx/sfx_1f_53.asm | 10 - audio/sfx/sfx_1f_54.asm | 22 -- audio/sfx/sfx_1f_55.asm | 12 - audio/sfx/sfx_1f_56.asm | 7 - audio/sfx/sfx_1f_57.asm | 4 - audio/sfx/sfx_1f_58.asm | 11 - audio/sfx/sfx_1f_59.asm | 11 - audio/sfx/sfx_1f_5a.asm | 13 - audio/sfx/sfx_1f_5b.asm | 6 - audio/sfx/sfx_1f_5c.asm | 7 - audio/sfx/sfx_1f_5d.asm | 36 -- audio/sfx/sfx_1f_5e.asm | 10 - audio/sfx/sfx_1f_5f.asm | 6 - audio/sfx/sfx_1f_60.asm | 6 - audio/sfx/sfx_1f_61.asm | 5 - audio/sfx/sfx_1f_62.asm | 4 - audio/sfx/sfx_1f_63.asm | 7 - audio/sfx/sfx_1f_64.asm | 6 - audio/sfx/sfx_1f_65.asm | 5 - audio/sfx/sfx_1f_66.asm | 14 - audio/sfx/sfx_1f_67.asm | 14 - audio/sfx/shooting_star.asm | 14 + audio/sfx/shrink_1.asm | 10 + audio/sfx/shrink_3.asm | 10 + audio/sfx/silph_scope.asm | 9 + audio/sfx/slots_new_spin.asm | 14 + audio/sfx/slots_reward.asm | 5 + audio/sfx/slots_stop_wheel.asm | 6 + audio/sfx/snare1_1.asm | 3 + audio/sfx/snare1_2.asm | 3 + audio/sfx/snare1_3.asm | 3 + audio/sfx/snare2_1.asm | 3 + audio/sfx/snare2_2.asm | 3 + audio/sfx/snare2_3.asm | 3 + audio/sfx/snare3_1.asm | 3 + audio/sfx/snare3_2.asm | 3 + audio/sfx/snare3_3.asm | 3 + audio/sfx/snare4_1.asm | 3 + audio/sfx/snare4_2.asm | 3 + audio/sfx/snare4_3.asm | 3 + audio/sfx/snare5_1.asm | 8 + audio/sfx/snare5_2.asm | 8 + audio/sfx/snare5_3.asm | 8 + audio/sfx/snare6_1.asm | 3 + audio/sfx/snare6_2.asm | 3 + audio/sfx/snare6_3.asm | 3 + audio/sfx/snare7_1.asm | 3 + audio/sfx/snare7_2.asm | 3 + audio/sfx/snare7_3.asm | 3 + audio/sfx/snare8_1.asm | 3 + audio/sfx/snare8_2.asm | 3 + audio/sfx/snare8_3.asm | 3 + audio/sfx/snare9_1.asm | 3 + audio/sfx/snare9_2.asm | 3 + audio/sfx/snare9_3.asm | 3 + audio/sfx/ss_anne_horn_1.asm | 22 ++ audio/sfx/ss_anne_horn_3.asm | 22 ++ audio/sfx/start_menu_1.asm | 4 + audio/sfx/start_menu_2.asm | 4 + audio/sfx/start_menu_3.asm | 4 + audio/sfx/super_effective.asm | 4 + audio/sfx/swap_1.asm | 11 + audio/sfx/swap_3.asm | 11 + audio/sfx/switch_1.asm | 8 + audio/sfx/switch_3.asm | 8 + audio/sfx/teleport_enter1_1.asm | 10 + audio/sfx/teleport_enter1_3.asm | 10 + audio/sfx/teleport_enter2_1.asm | 6 + audio/sfx/teleport_enter2_3.asm | 6 + audio/sfx/teleport_exit1_1.asm | 10 + audio/sfx/teleport_exit1_3.asm | 10 + audio/sfx/teleport_exit2_1.asm | 6 + audio/sfx/teleport_exit2_3.asm | 6 + audio/sfx/tink_1.asm | 8 + audio/sfx/tink_2.asm | 8 + audio/sfx/tink_3.asm | 8 + audio/sfx/trade_machine_1.asm | 7 + audio/sfx/trade_machine_3.asm | 7 + audio/sfx/triangle1_1.asm | 3 + audio/sfx/triangle1_2.asm | 3 + audio/sfx/triangle1_3.asm | 3 + audio/sfx/triangle2_1.asm | 4 + audio/sfx/triangle2_2.asm | 4 + audio/sfx/triangle2_3.asm | 4 + audio/sfx/triangle3_1.asm | 4 + audio/sfx/triangle3_2.asm | 4 + audio/sfx/triangle3_3.asm | 4 + audio/sfx/turn_off_pc_1.asm | 7 + audio/sfx/turn_off_pc_3.asm | 7 + audio/sfx/turn_on_pc_1.asm | 13 + audio/sfx/turn_on_pc_3.asm | 14 + audio/sfx/vine_whip.asm | 10 + audio/sfx/withdraw_deposit_1.asm | 12 + audio/sfx/withdraw_deposit_3.asm | 12 + constants/music_constants.asm | 322 +++++++-------- engine/hidden_object_functions7.asm | 2 +- engine/items/items.asm | 2 +- engine/menu/pokedex.asm | 2 +- engine/overworld/elevator.asm | 4 +- engine/overworld/player_animations.asm | 12 +- home/init.asm | 2 +- 645 files changed, 6867 insertions(+), 6867 deletions(-) mode change 100755 => 100644 audio/headers/sfxheaders02.asm mode change 100755 => 100644 audio/headers/sfxheaders08.asm mode change 100755 => 100644 audio/headers/sfxheaders1f.asm create mode 100644 audio/sfx/59_1.asm create mode 100644 audio/sfx/59_3.asm create mode 100644 audio/sfx/arrow_tiles_1.asm create mode 100644 audio/sfx/arrow_tiles_3.asm create mode 100644 audio/sfx/ball_poof.asm create mode 100644 audio/sfx/ball_toss.asm create mode 100644 audio/sfx/battle_09.asm create mode 100644 audio/sfx/battle_0b.asm create mode 100644 audio/sfx/battle_0c.asm create mode 100644 audio/sfx/battle_0d.asm create mode 100644 audio/sfx/battle_0e.asm create mode 100644 audio/sfx/battle_0f.asm create mode 100644 audio/sfx/battle_12.asm create mode 100644 audio/sfx/battle_13.asm create mode 100644 audio/sfx/battle_14.asm create mode 100644 audio/sfx/battle_16.asm create mode 100644 audio/sfx/battle_17.asm create mode 100644 audio/sfx/battle_18.asm create mode 100644 audio/sfx/battle_19.asm create mode 100644 audio/sfx/battle_1b.asm create mode 100644 audio/sfx/battle_1c.asm create mode 100644 audio/sfx/battle_1e.asm create mode 100644 audio/sfx/battle_20.asm create mode 100644 audio/sfx/battle_21.asm create mode 100644 audio/sfx/battle_22.asm create mode 100644 audio/sfx/battle_23.asm create mode 100644 audio/sfx/battle_24.asm create mode 100644 audio/sfx/battle_25.asm create mode 100644 audio/sfx/battle_26.asm create mode 100644 audio/sfx/battle_27.asm create mode 100644 audio/sfx/battle_28.asm create mode 100644 audio/sfx/battle_29.asm create mode 100644 audio/sfx/battle_2a.asm create mode 100644 audio/sfx/battle_2b.asm create mode 100644 audio/sfx/battle_2c.asm create mode 100644 audio/sfx/battle_2e.asm create mode 100644 audio/sfx/battle_2f.asm create mode 100644 audio/sfx/battle_31.asm create mode 100644 audio/sfx/battle_32.asm create mode 100644 audio/sfx/battle_33.asm create mode 100644 audio/sfx/battle_34.asm create mode 100644 audio/sfx/battle_35.asm create mode 100644 audio/sfx/battle_36.asm create mode 100644 audio/sfx/caught_mon.asm create mode 100644 audio/sfx/collision_1.asm create mode 100644 audio/sfx/collision_3.asm create mode 100644 audio/sfx/cry00_1.asm create mode 100644 audio/sfx/cry00_2.asm create mode 100644 audio/sfx/cry00_3.asm create mode 100644 audio/sfx/cry01_1.asm create mode 100644 audio/sfx/cry01_2.asm create mode 100644 audio/sfx/cry01_3.asm create mode 100644 audio/sfx/cry02_1.asm create mode 100644 audio/sfx/cry02_2.asm create mode 100644 audio/sfx/cry02_3.asm create mode 100644 audio/sfx/cry03_1.asm create mode 100644 audio/sfx/cry03_2.asm create mode 100644 audio/sfx/cry03_3.asm create mode 100644 audio/sfx/cry04_1.asm create mode 100644 audio/sfx/cry04_2.asm create mode 100644 audio/sfx/cry04_3.asm create mode 100644 audio/sfx/cry05_1.asm create mode 100644 audio/sfx/cry05_2.asm create mode 100644 audio/sfx/cry05_3.asm create mode 100644 audio/sfx/cry06_1.asm create mode 100644 audio/sfx/cry06_2.asm create mode 100644 audio/sfx/cry06_3.asm create mode 100644 audio/sfx/cry07_1.asm create mode 100644 audio/sfx/cry07_2.asm create mode 100644 audio/sfx/cry07_3.asm create mode 100644 audio/sfx/cry08_1.asm create mode 100644 audio/sfx/cry08_2.asm create mode 100644 audio/sfx/cry08_3.asm create mode 100644 audio/sfx/cry09_1.asm create mode 100644 audio/sfx/cry09_2.asm create mode 100644 audio/sfx/cry09_3.asm create mode 100644 audio/sfx/cry0a_1.asm create mode 100644 audio/sfx/cry0a_2.asm create mode 100644 audio/sfx/cry0a_3.asm create mode 100644 audio/sfx/cry0b_1.asm create mode 100644 audio/sfx/cry0b_2.asm create mode 100644 audio/sfx/cry0b_3.asm create mode 100644 audio/sfx/cry0c_1.asm create mode 100644 audio/sfx/cry0c_2.asm create mode 100644 audio/sfx/cry0c_3.asm create mode 100644 audio/sfx/cry0d_1.asm create mode 100644 audio/sfx/cry0d_2.asm create mode 100644 audio/sfx/cry0d_3.asm create mode 100644 audio/sfx/cry0e_1.asm create mode 100644 audio/sfx/cry0e_2.asm create mode 100644 audio/sfx/cry0e_3.asm create mode 100644 audio/sfx/cry0f_1.asm create mode 100644 audio/sfx/cry0f_2.asm create mode 100644 audio/sfx/cry0f_3.asm create mode 100644 audio/sfx/cry10_1.asm create mode 100644 audio/sfx/cry10_2.asm create mode 100644 audio/sfx/cry10_3.asm create mode 100644 audio/sfx/cry11_1.asm create mode 100644 audio/sfx/cry11_2.asm create mode 100644 audio/sfx/cry11_3.asm create mode 100644 audio/sfx/cry12_1.asm create mode 100644 audio/sfx/cry12_2.asm create mode 100644 audio/sfx/cry12_3.asm create mode 100644 audio/sfx/cry13_1.asm create mode 100644 audio/sfx/cry13_2.asm create mode 100644 audio/sfx/cry13_3.asm create mode 100644 audio/sfx/cry14_1.asm create mode 100644 audio/sfx/cry14_2.asm create mode 100644 audio/sfx/cry14_3.asm create mode 100644 audio/sfx/cry15_1.asm create mode 100644 audio/sfx/cry15_2.asm create mode 100644 audio/sfx/cry15_3.asm create mode 100644 audio/sfx/cry16_1.asm create mode 100644 audio/sfx/cry16_2.asm create mode 100644 audio/sfx/cry16_3.asm create mode 100644 audio/sfx/cry17_1.asm create mode 100644 audio/sfx/cry17_2.asm create mode 100644 audio/sfx/cry17_3.asm create mode 100644 audio/sfx/cry18_1.asm create mode 100644 audio/sfx/cry18_2.asm create mode 100644 audio/sfx/cry18_3.asm create mode 100644 audio/sfx/cry19_1.asm create mode 100644 audio/sfx/cry19_2.asm create mode 100644 audio/sfx/cry19_3.asm create mode 100644 audio/sfx/cry1a_1.asm create mode 100644 audio/sfx/cry1a_2.asm create mode 100644 audio/sfx/cry1a_3.asm create mode 100644 audio/sfx/cry1b_1.asm create mode 100644 audio/sfx/cry1b_2.asm create mode 100644 audio/sfx/cry1b_3.asm create mode 100644 audio/sfx/cry1c_1.asm create mode 100644 audio/sfx/cry1c_2.asm create mode 100644 audio/sfx/cry1c_3.asm create mode 100644 audio/sfx/cry1d_1.asm create mode 100644 audio/sfx/cry1d_2.asm create mode 100644 audio/sfx/cry1d_3.asm create mode 100644 audio/sfx/cry1e_1.asm create mode 100644 audio/sfx/cry1e_2.asm create mode 100644 audio/sfx/cry1e_3.asm create mode 100644 audio/sfx/cry1f_1.asm create mode 100644 audio/sfx/cry1f_2.asm create mode 100644 audio/sfx/cry1f_3.asm create mode 100644 audio/sfx/cry20_1.asm create mode 100644 audio/sfx/cry20_2.asm create mode 100644 audio/sfx/cry20_3.asm create mode 100644 audio/sfx/cry21_1.asm create mode 100644 audio/sfx/cry21_2.asm create mode 100644 audio/sfx/cry21_3.asm create mode 100644 audio/sfx/cry22_1.asm create mode 100644 audio/sfx/cry22_2.asm create mode 100644 audio/sfx/cry22_3.asm create mode 100644 audio/sfx/cry23_1.asm create mode 100644 audio/sfx/cry23_2.asm create mode 100644 audio/sfx/cry23_3.asm create mode 100644 audio/sfx/cry24_1.asm create mode 100644 audio/sfx/cry24_2.asm create mode 100644 audio/sfx/cry24_3.asm create mode 100644 audio/sfx/cry25_1.asm create mode 100644 audio/sfx/cry25_2.asm create mode 100644 audio/sfx/cry25_3.asm create mode 100644 audio/sfx/cut_1.asm create mode 100644 audio/sfx/cut_3.asm create mode 100644 audio/sfx/cymbal1_1.asm create mode 100644 audio/sfx/cymbal1_2.asm create mode 100644 audio/sfx/cymbal1_3.asm create mode 100644 audio/sfx/cymbal2_1.asm create mode 100644 audio/sfx/cymbal2_2.asm create mode 100644 audio/sfx/cymbal2_3.asm create mode 100644 audio/sfx/cymbal3_1.asm create mode 100644 audio/sfx/cymbal3_2.asm create mode 100644 audio/sfx/cymbal3_3.asm create mode 100644 audio/sfx/damage.asm create mode 100644 audio/sfx/denied_1.asm create mode 100644 audio/sfx/denied_3.asm create mode 100644 audio/sfx/dex_page_added.asm create mode 100644 audio/sfx/doubleslap.asm create mode 100644 audio/sfx/enter_pc_1.asm create mode 100644 audio/sfx/enter_pc_3.asm create mode 100644 audio/sfx/faint_fall.asm create mode 100644 audio/sfx/faint_thud.asm create mode 100644 audio/sfx/fly_1.asm create mode 100644 audio/sfx/fly_3.asm create mode 100644 audio/sfx/get_item1_1.asm create mode 100644 audio/sfx/get_item1_3.asm create mode 100644 audio/sfx/get_item2_1.asm create mode 100644 audio/sfx/get_item2_2.asm create mode 100644 audio/sfx/get_item2_3.asm create mode 100644 audio/sfx/get_key_item_1.asm create mode 100644 audio/sfx/get_key_item_3.asm create mode 100644 audio/sfx/go_inside_1.asm create mode 100644 audio/sfx/go_inside_3.asm create mode 100644 audio/sfx/go_outside_1.asm create mode 100644 audio/sfx/go_outside_3.asm create mode 100644 audio/sfx/heal_ailment_1.asm create mode 100644 audio/sfx/heal_ailment_2.asm create mode 100644 audio/sfx/heal_ailment_3.asm create mode 100644 audio/sfx/heal_hp_1.asm create mode 100644 audio/sfx/heal_hp_2.asm create mode 100644 audio/sfx/heal_hp_3.asm create mode 100644 audio/sfx/healing_machine_1.asm create mode 100644 audio/sfx/healing_machine_3.asm create mode 100644 audio/sfx/horn_drill.asm create mode 100644 audio/sfx/intro_crash.asm create mode 100644 audio/sfx/intro_hip.asm create mode 100644 audio/sfx/intro_hop.asm create mode 100644 audio/sfx/intro_lunge.asm create mode 100644 audio/sfx/intro_raise.asm create mode 100644 audio/sfx/intro_whoosh.asm create mode 100644 audio/sfx/ledge_1.asm create mode 100644 audio/sfx/ledge_3.asm create mode 100644 audio/sfx/level_up.asm create mode 100644 audio/sfx/muted_snare1_1.asm create mode 100644 audio/sfx/muted_snare1_2.asm create mode 100644 audio/sfx/muted_snare1_3.asm create mode 100644 audio/sfx/muted_snare2_1.asm create mode 100644 audio/sfx/muted_snare2_2.asm create mode 100644 audio/sfx/muted_snare2_3.asm create mode 100644 audio/sfx/muted_snare3_1.asm create mode 100644 audio/sfx/muted_snare3_2.asm create mode 100644 audio/sfx/muted_snare3_3.asm create mode 100644 audio/sfx/muted_snare4_1.asm create mode 100644 audio/sfx/muted_snare4_2.asm create mode 100644 audio/sfx/muted_snare4_3.asm create mode 100644 audio/sfx/not_very_effective.asm create mode 100644 audio/sfx/peck.asm create mode 100644 audio/sfx/poisoned_1.asm create mode 100644 audio/sfx/poisoned_3.asm create mode 100644 audio/sfx/pokedex_rating_1.asm create mode 100644 audio/sfx/pokedex_rating_3.asm create mode 100644 audio/sfx/pokeflute.asm create mode 100644 audio/sfx/pound.asm create mode 100644 audio/sfx/press_ab_1.asm create mode 100644 audio/sfx/press_ab_2.asm create mode 100644 audio/sfx/press_ab_3.asm create mode 100644 audio/sfx/psybeam.asm create mode 100644 audio/sfx/psychic_m.asm create mode 100644 audio/sfx/purchase_1.asm create mode 100644 audio/sfx/purchase_3.asm create mode 100644 audio/sfx/push_boulder_1.asm create mode 100644 audio/sfx/push_boulder_3.asm create mode 100644 audio/sfx/run.asm create mode 100644 audio/sfx/safari_zone_pa.asm create mode 100644 audio/sfx/save_1.asm create mode 100644 audio/sfx/save_3.asm delete mode 100755 audio/sfx/sfx_02_01.asm delete mode 100755 audio/sfx/sfx_02_02.asm delete mode 100755 audio/sfx/sfx_02_03.asm delete mode 100755 audio/sfx/sfx_02_04.asm delete mode 100755 audio/sfx/sfx_02_05.asm delete mode 100755 audio/sfx/sfx_02_06.asm delete mode 100755 audio/sfx/sfx_02_07.asm delete mode 100755 audio/sfx/sfx_02_08.asm delete mode 100755 audio/sfx/sfx_02_09.asm delete mode 100755 audio/sfx/sfx_02_0a.asm delete mode 100755 audio/sfx/sfx_02_0b.asm delete mode 100755 audio/sfx/sfx_02_0c.asm delete mode 100755 audio/sfx/sfx_02_0d.asm delete mode 100755 audio/sfx/sfx_02_0e.asm delete mode 100755 audio/sfx/sfx_02_0f.asm delete mode 100755 audio/sfx/sfx_02_10.asm delete mode 100755 audio/sfx/sfx_02_11.asm delete mode 100755 audio/sfx/sfx_02_12.asm delete mode 100755 audio/sfx/sfx_02_13.asm delete mode 100755 audio/sfx/sfx_02_14.asm delete mode 100755 audio/sfx/sfx_02_15.asm delete mode 100755 audio/sfx/sfx_02_16.asm delete mode 100755 audio/sfx/sfx_02_17.asm delete mode 100755 audio/sfx/sfx_02_18.asm delete mode 100755 audio/sfx/sfx_02_19.asm delete mode 100755 audio/sfx/sfx_02_1a.asm delete mode 100755 audio/sfx/sfx_02_1b.asm delete mode 100755 audio/sfx/sfx_02_1c.asm delete mode 100755 audio/sfx/sfx_02_1d.asm delete mode 100755 audio/sfx/sfx_02_1e.asm delete mode 100755 audio/sfx/sfx_02_1f.asm delete mode 100755 audio/sfx/sfx_02_20.asm delete mode 100755 audio/sfx/sfx_02_21.asm delete mode 100755 audio/sfx/sfx_02_22.asm delete mode 100755 audio/sfx/sfx_02_23.asm delete mode 100755 audio/sfx/sfx_02_24.asm delete mode 100755 audio/sfx/sfx_02_25.asm delete mode 100755 audio/sfx/sfx_02_26.asm delete mode 100755 audio/sfx/sfx_02_27.asm delete mode 100755 audio/sfx/sfx_02_28.asm delete mode 100755 audio/sfx/sfx_02_29.asm delete mode 100755 audio/sfx/sfx_02_2a.asm delete mode 100755 audio/sfx/sfx_02_2b.asm delete mode 100755 audio/sfx/sfx_02_2c.asm delete mode 100755 audio/sfx/sfx_02_2d.asm delete mode 100755 audio/sfx/sfx_02_2e.asm delete mode 100755 audio/sfx/sfx_02_2f.asm delete mode 100755 audio/sfx/sfx_02_30.asm delete mode 100755 audio/sfx/sfx_02_31.asm delete mode 100755 audio/sfx/sfx_02_32.asm delete mode 100755 audio/sfx/sfx_02_33.asm delete mode 100755 audio/sfx/sfx_02_34.asm delete mode 100755 audio/sfx/sfx_02_35.asm delete mode 100755 audio/sfx/sfx_02_36.asm delete mode 100755 audio/sfx/sfx_02_37.asm delete mode 100755 audio/sfx/sfx_02_38.asm delete mode 100755 audio/sfx/sfx_02_39.asm delete mode 100755 audio/sfx/sfx_02_3a.asm delete mode 100755 audio/sfx/sfx_02_3b.asm delete mode 100755 audio/sfx/sfx_02_3c.asm delete mode 100755 audio/sfx/sfx_02_3d.asm delete mode 100755 audio/sfx/sfx_02_3e.asm delete mode 100755 audio/sfx/sfx_02_3f.asm delete mode 100755 audio/sfx/sfx_02_40.asm delete mode 100755 audio/sfx/sfx_02_41.asm delete mode 100755 audio/sfx/sfx_02_42.asm delete mode 100755 audio/sfx/sfx_02_43.asm delete mode 100755 audio/sfx/sfx_02_44.asm delete mode 100755 audio/sfx/sfx_02_45.asm delete mode 100755 audio/sfx/sfx_02_46.asm delete mode 100755 audio/sfx/sfx_02_47.asm delete mode 100755 audio/sfx/sfx_02_48.asm delete mode 100755 audio/sfx/sfx_02_49.asm delete mode 100755 audio/sfx/sfx_02_4a.asm delete mode 100755 audio/sfx/sfx_02_4b.asm delete mode 100755 audio/sfx/sfx_02_4c.asm delete mode 100755 audio/sfx/sfx_02_4d.asm delete mode 100755 audio/sfx/sfx_02_4e.asm delete mode 100755 audio/sfx/sfx_02_4f.asm delete mode 100755 audio/sfx/sfx_02_50.asm delete mode 100755 audio/sfx/sfx_02_51.asm delete mode 100755 audio/sfx/sfx_02_52.asm delete mode 100755 audio/sfx/sfx_02_53.asm delete mode 100755 audio/sfx/sfx_02_54.asm delete mode 100755 audio/sfx/sfx_02_55.asm delete mode 100755 audio/sfx/sfx_02_56.asm delete mode 100755 audio/sfx/sfx_02_57.asm delete mode 100755 audio/sfx/sfx_02_58.asm delete mode 100755 audio/sfx/sfx_02_59.asm delete mode 100755 audio/sfx/sfx_02_5a.asm delete mode 100755 audio/sfx/sfx_02_5b.asm delete mode 100755 audio/sfx/sfx_02_5c.asm delete mode 100755 audio/sfx/sfx_02_5d.asm delete mode 100755 audio/sfx/sfx_02_5e.asm delete mode 100755 audio/sfx/sfx_02_5f.asm delete mode 100755 audio/sfx/sfx_08_01.asm delete mode 100755 audio/sfx/sfx_08_02.asm delete mode 100755 audio/sfx/sfx_08_03.asm delete mode 100755 audio/sfx/sfx_08_04.asm delete mode 100755 audio/sfx/sfx_08_05.asm delete mode 100755 audio/sfx/sfx_08_06.asm delete mode 100755 audio/sfx/sfx_08_07.asm delete mode 100755 audio/sfx/sfx_08_08.asm delete mode 100755 audio/sfx/sfx_08_09.asm delete mode 100755 audio/sfx/sfx_08_0a.asm delete mode 100755 audio/sfx/sfx_08_0b.asm delete mode 100755 audio/sfx/sfx_08_0c.asm delete mode 100755 audio/sfx/sfx_08_0d.asm delete mode 100755 audio/sfx/sfx_08_0e.asm delete mode 100755 audio/sfx/sfx_08_0f.asm delete mode 100755 audio/sfx/sfx_08_10.asm delete mode 100755 audio/sfx/sfx_08_11.asm delete mode 100755 audio/sfx/sfx_08_12.asm delete mode 100755 audio/sfx/sfx_08_13.asm delete mode 100755 audio/sfx/sfx_08_14.asm delete mode 100755 audio/sfx/sfx_08_15.asm delete mode 100755 audio/sfx/sfx_08_16.asm delete mode 100755 audio/sfx/sfx_08_17.asm delete mode 100755 audio/sfx/sfx_08_18.asm delete mode 100755 audio/sfx/sfx_08_19.asm delete mode 100755 audio/sfx/sfx_08_1a.asm delete mode 100755 audio/sfx/sfx_08_1b.asm delete mode 100755 audio/sfx/sfx_08_1c.asm delete mode 100755 audio/sfx/sfx_08_1d.asm delete mode 100755 audio/sfx/sfx_08_1e.asm delete mode 100755 audio/sfx/sfx_08_1f.asm delete mode 100755 audio/sfx/sfx_08_20.asm delete mode 100755 audio/sfx/sfx_08_21.asm delete mode 100755 audio/sfx/sfx_08_22.asm delete mode 100755 audio/sfx/sfx_08_23.asm delete mode 100755 audio/sfx/sfx_08_24.asm delete mode 100755 audio/sfx/sfx_08_25.asm delete mode 100755 audio/sfx/sfx_08_26.asm delete mode 100755 audio/sfx/sfx_08_27.asm delete mode 100755 audio/sfx/sfx_08_28.asm delete mode 100755 audio/sfx/sfx_08_29.asm delete mode 100755 audio/sfx/sfx_08_2a.asm delete mode 100755 audio/sfx/sfx_08_2b.asm delete mode 100755 audio/sfx/sfx_08_2c.asm delete mode 100755 audio/sfx/sfx_08_2d.asm delete mode 100755 audio/sfx/sfx_08_2e.asm delete mode 100755 audio/sfx/sfx_08_2f.asm delete mode 100755 audio/sfx/sfx_08_30.asm delete mode 100755 audio/sfx/sfx_08_31.asm delete mode 100755 audio/sfx/sfx_08_32.asm delete mode 100755 audio/sfx/sfx_08_33.asm delete mode 100755 audio/sfx/sfx_08_34.asm delete mode 100755 audio/sfx/sfx_08_35.asm delete mode 100755 audio/sfx/sfx_08_36.asm delete mode 100755 audio/sfx/sfx_08_37.asm delete mode 100755 audio/sfx/sfx_08_38.asm delete mode 100755 audio/sfx/sfx_08_39.asm delete mode 100755 audio/sfx/sfx_08_3a.asm delete mode 100755 audio/sfx/sfx_08_3b.asm delete mode 100755 audio/sfx/sfx_08_3c.asm delete mode 100755 audio/sfx/sfx_08_3d.asm delete mode 100755 audio/sfx/sfx_08_3e.asm delete mode 100755 audio/sfx/sfx_08_3f.asm delete mode 100755 audio/sfx/sfx_08_40.asm delete mode 100755 audio/sfx/sfx_08_41.asm delete mode 100755 audio/sfx/sfx_08_42.asm delete mode 100755 audio/sfx/sfx_08_43.asm delete mode 100755 audio/sfx/sfx_08_44.asm delete mode 100755 audio/sfx/sfx_08_45.asm delete mode 100755 audio/sfx/sfx_08_46.asm delete mode 100755 audio/sfx/sfx_08_47.asm delete mode 100755 audio/sfx/sfx_08_48.asm delete mode 100755 audio/sfx/sfx_08_49.asm delete mode 100755 audio/sfx/sfx_08_4a.asm delete mode 100755 audio/sfx/sfx_08_4b.asm delete mode 100755 audio/sfx/sfx_08_4c.asm delete mode 100755 audio/sfx/sfx_08_4d.asm delete mode 100755 audio/sfx/sfx_08_4e.asm delete mode 100755 audio/sfx/sfx_08_4f.asm delete mode 100755 audio/sfx/sfx_08_50.asm delete mode 100755 audio/sfx/sfx_08_51.asm delete mode 100755 audio/sfx/sfx_08_52.asm delete mode 100755 audio/sfx/sfx_08_53.asm delete mode 100755 audio/sfx/sfx_08_54.asm delete mode 100755 audio/sfx/sfx_08_55.asm delete mode 100755 audio/sfx/sfx_08_56.asm delete mode 100755 audio/sfx/sfx_08_57.asm delete mode 100755 audio/sfx/sfx_08_58.asm delete mode 100755 audio/sfx/sfx_08_59.asm delete mode 100755 audio/sfx/sfx_08_5a.asm delete mode 100755 audio/sfx/sfx_08_5b.asm delete mode 100755 audio/sfx/sfx_08_5c.asm delete mode 100755 audio/sfx/sfx_08_5d.asm delete mode 100755 audio/sfx/sfx_08_5e.asm delete mode 100755 audio/sfx/sfx_08_5f.asm delete mode 100755 audio/sfx/sfx_08_60.asm delete mode 100755 audio/sfx/sfx_08_61.asm delete mode 100755 audio/sfx/sfx_08_62.asm delete mode 100755 audio/sfx/sfx_08_63.asm delete mode 100755 audio/sfx/sfx_08_64.asm delete mode 100755 audio/sfx/sfx_08_65.asm delete mode 100755 audio/sfx/sfx_08_66.asm delete mode 100755 audio/sfx/sfx_08_67.asm delete mode 100755 audio/sfx/sfx_08_68.asm delete mode 100755 audio/sfx/sfx_08_69.asm delete mode 100755 audio/sfx/sfx_08_6a.asm delete mode 100755 audio/sfx/sfx_08_6b.asm delete mode 100755 audio/sfx/sfx_08_6c.asm delete mode 100755 audio/sfx/sfx_08_6d.asm delete mode 100755 audio/sfx/sfx_08_6e.asm delete mode 100755 audio/sfx/sfx_08_6f.asm delete mode 100755 audio/sfx/sfx_08_70.asm delete mode 100755 audio/sfx/sfx_08_71.asm delete mode 100755 audio/sfx/sfx_08_72.asm delete mode 100755 audio/sfx/sfx_08_73.asm delete mode 100755 audio/sfx/sfx_08_74.asm delete mode 100755 audio/sfx/sfx_08_75.asm delete mode 100755 audio/sfx/sfx_08_76.asm delete mode 100755 audio/sfx/sfx_08_77.asm delete mode 100755 audio/sfx/sfx_1f_01.asm delete mode 100755 audio/sfx/sfx_1f_02.asm delete mode 100755 audio/sfx/sfx_1f_03.asm delete mode 100755 audio/sfx/sfx_1f_04.asm delete mode 100755 audio/sfx/sfx_1f_05.asm delete mode 100755 audio/sfx/sfx_1f_06.asm delete mode 100755 audio/sfx/sfx_1f_07.asm delete mode 100755 audio/sfx/sfx_1f_08.asm delete mode 100755 audio/sfx/sfx_1f_09.asm delete mode 100755 audio/sfx/sfx_1f_0a.asm delete mode 100755 audio/sfx/sfx_1f_0b.asm delete mode 100755 audio/sfx/sfx_1f_0c.asm delete mode 100755 audio/sfx/sfx_1f_0d.asm delete mode 100755 audio/sfx/sfx_1f_0e.asm delete mode 100755 audio/sfx/sfx_1f_0f.asm delete mode 100755 audio/sfx/sfx_1f_10.asm delete mode 100755 audio/sfx/sfx_1f_11.asm delete mode 100755 audio/sfx/sfx_1f_12.asm delete mode 100755 audio/sfx/sfx_1f_13.asm delete mode 100755 audio/sfx/sfx_1f_14.asm delete mode 100755 audio/sfx/sfx_1f_15.asm delete mode 100755 audio/sfx/sfx_1f_16.asm delete mode 100755 audio/sfx/sfx_1f_17.asm delete mode 100755 audio/sfx/sfx_1f_18.asm delete mode 100755 audio/sfx/sfx_1f_19.asm delete mode 100755 audio/sfx/sfx_1f_1a.asm delete mode 100755 audio/sfx/sfx_1f_1b.asm delete mode 100755 audio/sfx/sfx_1f_1c.asm delete mode 100755 audio/sfx/sfx_1f_1d.asm delete mode 100755 audio/sfx/sfx_1f_1e.asm delete mode 100755 audio/sfx/sfx_1f_1f.asm delete mode 100755 audio/sfx/sfx_1f_20.asm delete mode 100755 audio/sfx/sfx_1f_21.asm delete mode 100755 audio/sfx/sfx_1f_22.asm delete mode 100755 audio/sfx/sfx_1f_23.asm delete mode 100755 audio/sfx/sfx_1f_24.asm delete mode 100755 audio/sfx/sfx_1f_25.asm delete mode 100755 audio/sfx/sfx_1f_26.asm delete mode 100755 audio/sfx/sfx_1f_27.asm delete mode 100755 audio/sfx/sfx_1f_28.asm delete mode 100755 audio/sfx/sfx_1f_29.asm delete mode 100755 audio/sfx/sfx_1f_2a.asm delete mode 100755 audio/sfx/sfx_1f_2b.asm delete mode 100755 audio/sfx/sfx_1f_2c.asm delete mode 100755 audio/sfx/sfx_1f_2d.asm delete mode 100755 audio/sfx/sfx_1f_2e.asm delete mode 100755 audio/sfx/sfx_1f_2f.asm delete mode 100755 audio/sfx/sfx_1f_30.asm delete mode 100755 audio/sfx/sfx_1f_31.asm delete mode 100755 audio/sfx/sfx_1f_32.asm delete mode 100755 audio/sfx/sfx_1f_33.asm delete mode 100755 audio/sfx/sfx_1f_34.asm delete mode 100755 audio/sfx/sfx_1f_35.asm delete mode 100755 audio/sfx/sfx_1f_36.asm delete mode 100755 audio/sfx/sfx_1f_37.asm delete mode 100755 audio/sfx/sfx_1f_38.asm delete mode 100755 audio/sfx/sfx_1f_39.asm delete mode 100755 audio/sfx/sfx_1f_3a.asm delete mode 100755 audio/sfx/sfx_1f_3b.asm delete mode 100755 audio/sfx/sfx_1f_3c.asm delete mode 100755 audio/sfx/sfx_1f_3d.asm delete mode 100755 audio/sfx/sfx_1f_3e.asm delete mode 100755 audio/sfx/sfx_1f_3f.asm delete mode 100755 audio/sfx/sfx_1f_40.asm delete mode 100755 audio/sfx/sfx_1f_41.asm delete mode 100755 audio/sfx/sfx_1f_42.asm delete mode 100755 audio/sfx/sfx_1f_43.asm delete mode 100755 audio/sfx/sfx_1f_44.asm delete mode 100755 audio/sfx/sfx_1f_45.asm delete mode 100755 audio/sfx/sfx_1f_46.asm delete mode 100755 audio/sfx/sfx_1f_47.asm delete mode 100755 audio/sfx/sfx_1f_48.asm delete mode 100755 audio/sfx/sfx_1f_49.asm delete mode 100755 audio/sfx/sfx_1f_4a.asm delete mode 100755 audio/sfx/sfx_1f_4b.asm delete mode 100755 audio/sfx/sfx_1f_4c.asm delete mode 100755 audio/sfx/sfx_1f_4d.asm delete mode 100755 audio/sfx/sfx_1f_4e.asm delete mode 100755 audio/sfx/sfx_1f_4f.asm delete mode 100755 audio/sfx/sfx_1f_50.asm delete mode 100755 audio/sfx/sfx_1f_51.asm delete mode 100755 audio/sfx/sfx_1f_52.asm delete mode 100755 audio/sfx/sfx_1f_53.asm delete mode 100755 audio/sfx/sfx_1f_54.asm delete mode 100755 audio/sfx/sfx_1f_55.asm delete mode 100755 audio/sfx/sfx_1f_56.asm delete mode 100755 audio/sfx/sfx_1f_57.asm delete mode 100755 audio/sfx/sfx_1f_58.asm delete mode 100755 audio/sfx/sfx_1f_59.asm delete mode 100755 audio/sfx/sfx_1f_5a.asm delete mode 100755 audio/sfx/sfx_1f_5b.asm delete mode 100755 audio/sfx/sfx_1f_5c.asm delete mode 100755 audio/sfx/sfx_1f_5d.asm delete mode 100755 audio/sfx/sfx_1f_5e.asm delete mode 100755 audio/sfx/sfx_1f_5f.asm delete mode 100755 audio/sfx/sfx_1f_60.asm delete mode 100755 audio/sfx/sfx_1f_61.asm delete mode 100755 audio/sfx/sfx_1f_62.asm delete mode 100755 audio/sfx/sfx_1f_63.asm delete mode 100755 audio/sfx/sfx_1f_64.asm delete mode 100755 audio/sfx/sfx_1f_65.asm delete mode 100755 audio/sfx/sfx_1f_66.asm delete mode 100755 audio/sfx/sfx_1f_67.asm create mode 100644 audio/sfx/shooting_star.asm create mode 100644 audio/sfx/shrink_1.asm create mode 100644 audio/sfx/shrink_3.asm create mode 100644 audio/sfx/silph_scope.asm create mode 100644 audio/sfx/slots_new_spin.asm create mode 100644 audio/sfx/slots_reward.asm create mode 100644 audio/sfx/slots_stop_wheel.asm create mode 100644 audio/sfx/snare1_1.asm create mode 100644 audio/sfx/snare1_2.asm create mode 100644 audio/sfx/snare1_3.asm create mode 100644 audio/sfx/snare2_1.asm create mode 100644 audio/sfx/snare2_2.asm create mode 100644 audio/sfx/snare2_3.asm create mode 100644 audio/sfx/snare3_1.asm create mode 100644 audio/sfx/snare3_2.asm create mode 100644 audio/sfx/snare3_3.asm create mode 100644 audio/sfx/snare4_1.asm create mode 100644 audio/sfx/snare4_2.asm create mode 100644 audio/sfx/snare4_3.asm create mode 100644 audio/sfx/snare5_1.asm create mode 100644 audio/sfx/snare5_2.asm create mode 100644 audio/sfx/snare5_3.asm create mode 100644 audio/sfx/snare6_1.asm create mode 100644 audio/sfx/snare6_2.asm create mode 100644 audio/sfx/snare6_3.asm create mode 100644 audio/sfx/snare7_1.asm create mode 100644 audio/sfx/snare7_2.asm create mode 100644 audio/sfx/snare7_3.asm create mode 100644 audio/sfx/snare8_1.asm create mode 100644 audio/sfx/snare8_2.asm create mode 100644 audio/sfx/snare8_3.asm create mode 100644 audio/sfx/snare9_1.asm create mode 100644 audio/sfx/snare9_2.asm create mode 100644 audio/sfx/snare9_3.asm create mode 100644 audio/sfx/ss_anne_horn_1.asm create mode 100644 audio/sfx/ss_anne_horn_3.asm create mode 100644 audio/sfx/start_menu_1.asm create mode 100644 audio/sfx/start_menu_2.asm create mode 100644 audio/sfx/start_menu_3.asm create mode 100644 audio/sfx/super_effective.asm create mode 100644 audio/sfx/swap_1.asm create mode 100644 audio/sfx/swap_3.asm create mode 100644 audio/sfx/switch_1.asm create mode 100644 audio/sfx/switch_3.asm create mode 100644 audio/sfx/teleport_enter1_1.asm create mode 100644 audio/sfx/teleport_enter1_3.asm create mode 100644 audio/sfx/teleport_enter2_1.asm create mode 100644 audio/sfx/teleport_enter2_3.asm create mode 100644 audio/sfx/teleport_exit1_1.asm create mode 100644 audio/sfx/teleport_exit1_3.asm create mode 100644 audio/sfx/teleport_exit2_1.asm create mode 100644 audio/sfx/teleport_exit2_3.asm create mode 100644 audio/sfx/tink_1.asm create mode 100644 audio/sfx/tink_2.asm create mode 100644 audio/sfx/tink_3.asm create mode 100644 audio/sfx/trade_machine_1.asm create mode 100644 audio/sfx/trade_machine_3.asm create mode 100644 audio/sfx/triangle1_1.asm create mode 100644 audio/sfx/triangle1_2.asm create mode 100644 audio/sfx/triangle1_3.asm create mode 100644 audio/sfx/triangle2_1.asm create mode 100644 audio/sfx/triangle2_2.asm create mode 100644 audio/sfx/triangle2_3.asm create mode 100644 audio/sfx/triangle3_1.asm create mode 100644 audio/sfx/triangle3_2.asm create mode 100644 audio/sfx/triangle3_3.asm create mode 100644 audio/sfx/turn_off_pc_1.asm create mode 100644 audio/sfx/turn_off_pc_3.asm create mode 100644 audio/sfx/turn_on_pc_1.asm create mode 100644 audio/sfx/turn_on_pc_3.asm create mode 100644 audio/sfx/vine_whip.asm create mode 100644 audio/sfx/withdraw_deposit_1.asm create mode 100644 audio/sfx/withdraw_deposit_3.asm (limited to 'engine/menu/pokedex.asm') diff --git a/audio.asm b/audio.asm index 563aee14..8b83fcaf 100644 --- a/audio.asm +++ b/audio.asm @@ -30,333 +30,333 @@ INCLUDE "audio/headers/musicheaders1f.asm" SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/sfx/sfx_02_01.asm" -INCLUDE "audio/sfx/sfx_02_02.asm" -INCLUDE "audio/sfx/sfx_02_03.asm" -INCLUDE "audio/sfx/sfx_02_04.asm" -INCLUDE "audio/sfx/sfx_02_05.asm" -INCLUDE "audio/sfx/sfx_02_06.asm" -INCLUDE "audio/sfx/sfx_02_07.asm" -INCLUDE "audio/sfx/sfx_02_08.asm" -INCLUDE "audio/sfx/sfx_02_09.asm" -INCLUDE "audio/sfx/sfx_02_0a.asm" -INCLUDE "audio/sfx/sfx_02_0b.asm" -INCLUDE "audio/sfx/sfx_02_0c.asm" -INCLUDE "audio/sfx/sfx_02_0d.asm" -INCLUDE "audio/sfx/sfx_02_0e.asm" -INCLUDE "audio/sfx/sfx_02_0f.asm" -INCLUDE "audio/sfx/sfx_02_10.asm" -INCLUDE "audio/sfx/sfx_02_11.asm" -INCLUDE "audio/sfx/sfx_02_12.asm" -INCLUDE "audio/sfx/sfx_02_13.asm" +INCLUDE "audio/sfx/snare1_1.asm" +INCLUDE "audio/sfx/snare2_1.asm" +INCLUDE "audio/sfx/snare3_1.asm" +INCLUDE "audio/sfx/snare4_1.asm" +INCLUDE "audio/sfx/snare5_1.asm" +INCLUDE "audio/sfx/triangle1_1.asm" +INCLUDE "audio/sfx/triangle2_1.asm" +INCLUDE "audio/sfx/snare6_1.asm" +INCLUDE "audio/sfx/snare7_1.asm" +INCLUDE "audio/sfx/snare8_1.asm" +INCLUDE "audio/sfx/snare9_1.asm" +INCLUDE "audio/sfx/cymbal1_1.asm" +INCLUDE "audio/sfx/cymbal2_1.asm" +INCLUDE "audio/sfx/cymbal3_1.asm" +INCLUDE "audio/sfx/muted_snare1_1.asm" +INCLUDE "audio/sfx/triangle3_1.asm" +INCLUDE "audio/sfx/muted_snare2_1.asm" +INCLUDE "audio/sfx/muted_snare3_1.asm" +INCLUDE "audio/sfx/muted_snare4_1.asm" Music2_WavePointers: INCLUDE "audio/wave_instruments.asm" -INCLUDE "audio/sfx/sfx_02_3f.asm" -INCLUDE "audio/sfx/sfx_02_5e.asm" -INCLUDE "audio/sfx/sfx_02_56.asm" -INCLUDE "audio/sfx/sfx_02_57.asm" -INCLUDE "audio/sfx/sfx_02_58.asm" -INCLUDE "audio/sfx/sfx_02_3c.asm" -INCLUDE "audio/sfx/sfx_02_59.asm" -INCLUDE "audio/sfx/sfx_02_5a.asm" -INCLUDE "audio/sfx/sfx_02_5b.asm" -INCLUDE "audio/sfx/sfx_02_5c.asm" -INCLUDE "audio/sfx/sfx_02_40.asm" -INCLUDE "audio/sfx/sfx_02_5d.asm" -INCLUDE "audio/sfx/sfx_02_3d.asm" -INCLUDE "audio/sfx/sfx_02_43.asm" -INCLUDE "audio/sfx/sfx_02_3e.asm" -INCLUDE "audio/sfx/sfx_02_44.asm" -INCLUDE "audio/sfx/sfx_02_45.asm" -INCLUDE "audio/sfx/sfx_02_46.asm" -INCLUDE "audio/sfx/sfx_02_47.asm" -INCLUDE "audio/sfx/sfx_02_48.asm" -INCLUDE "audio/sfx/sfx_02_49.asm" -INCLUDE "audio/sfx/sfx_02_4a.asm" -INCLUDE "audio/sfx/sfx_02_4b.asm" -INCLUDE "audio/sfx/sfx_02_4c.asm" -INCLUDE "audio/sfx/sfx_02_4d.asm" -INCLUDE "audio/sfx/sfx_02_4e.asm" -INCLUDE "audio/sfx/sfx_02_4f.asm" -INCLUDE "audio/sfx/sfx_02_50.asm" -INCLUDE "audio/sfx/sfx_02_51.asm" -INCLUDE "audio/sfx/sfx_02_52.asm" -INCLUDE "audio/sfx/sfx_02_53.asm" -INCLUDE "audio/sfx/sfx_02_54.asm" -INCLUDE "audio/sfx/sfx_02_55.asm" -INCLUDE "audio/sfx/sfx_02_5f.asm" +INCLUDE "audio/sfx/start_menu_1.asm" +INCLUDE "audio/sfx/pokeflute.asm" +INCLUDE "audio/sfx/cut_1.asm" +INCLUDE "audio/sfx/go_inside_1.asm" +INCLUDE "audio/sfx/swap_1.asm" +INCLUDE "audio/sfx/tink_1.asm" +INCLUDE "audio/sfx/59_1.asm" +INCLUDE "audio/sfx/purchase_1.asm" +INCLUDE "audio/sfx/collision_1.asm" +INCLUDE "audio/sfx/go_outside_1.asm" +INCLUDE "audio/sfx/press_ab_1.asm" +INCLUDE "audio/sfx/save_1.asm" +INCLUDE "audio/sfx/heal_hp_1.asm" +INCLUDE "audio/sfx/poisoned_1.asm" +INCLUDE "audio/sfx/heal_ailment_1.asm" +INCLUDE "audio/sfx/trade_machine_1.asm" +INCLUDE "audio/sfx/turn_on_pc_1.asm" +INCLUDE "audio/sfx/turn_off_pc_1.asm" +INCLUDE "audio/sfx/enter_pc_1.asm" +INCLUDE "audio/sfx/shrink_1.asm" +INCLUDE "audio/sfx/switch_1.asm" +INCLUDE "audio/sfx/healing_machine_1.asm" +INCLUDE "audio/sfx/teleport_exit1_1.asm" +INCLUDE "audio/sfx/teleport_enter1_1.asm" +INCLUDE "audio/sfx/teleport_exit2_1.asm" +INCLUDE "audio/sfx/ledge_1.asm" +INCLUDE "audio/sfx/teleport_enter2_1.asm" +INCLUDE "audio/sfx/fly_1.asm" +INCLUDE "audio/sfx/denied_1.asm" +INCLUDE "audio/sfx/arrow_tiles_1.asm" +INCLUDE "audio/sfx/push_boulder_1.asm" +INCLUDE "audio/sfx/ss_anne_horn_1.asm" +INCLUDE "audio/sfx/withdraw_deposit_1.asm" +INCLUDE "audio/sfx/safari_zone_pa.asm" INCLUDE "audio/sfx/sfx_02_unused.asm" -INCLUDE "audio/sfx/sfx_02_1d.asm" -INCLUDE "audio/sfx/sfx_02_37.asm" -INCLUDE "audio/sfx/sfx_02_38.asm" -INCLUDE "audio/sfx/sfx_02_25.asm" -INCLUDE "audio/sfx/sfx_02_39.asm" -INCLUDE "audio/sfx/sfx_02_17.asm" -INCLUDE "audio/sfx/sfx_02_23.asm" -INCLUDE "audio/sfx/sfx_02_24.asm" -INCLUDE "audio/sfx/sfx_02_14.asm" -INCLUDE "audio/sfx/sfx_02_22.asm" -INCLUDE "audio/sfx/sfx_02_1a.asm" -INCLUDE "audio/sfx/sfx_02_1b.asm" -INCLUDE "audio/sfx/sfx_02_19.asm" -INCLUDE "audio/sfx/sfx_02_1f.asm" -INCLUDE "audio/sfx/sfx_02_20.asm" -INCLUDE "audio/sfx/sfx_02_16.asm" -INCLUDE "audio/sfx/sfx_02_21.asm" -INCLUDE "audio/sfx/sfx_02_15.asm" -INCLUDE "audio/sfx/sfx_02_1e.asm" -INCLUDE "audio/sfx/sfx_02_1c.asm" -INCLUDE "audio/sfx/sfx_02_18.asm" -INCLUDE "audio/sfx/sfx_02_2d.asm" -INCLUDE "audio/sfx/sfx_02_2a.asm" -INCLUDE "audio/sfx/sfx_02_2f.asm" -INCLUDE "audio/sfx/sfx_02_26.asm" -INCLUDE "audio/sfx/sfx_02_27.asm" -INCLUDE "audio/sfx/sfx_02_28.asm" -INCLUDE "audio/sfx/sfx_02_32.asm" -INCLUDE "audio/sfx/sfx_02_29.asm" -INCLUDE "audio/sfx/sfx_02_2b.asm" -INCLUDE "audio/sfx/sfx_02_30.asm" -INCLUDE "audio/sfx/sfx_02_2e.asm" -INCLUDE "audio/sfx/sfx_02_31.asm" -INCLUDE "audio/sfx/sfx_02_2c.asm" -INCLUDE "audio/sfx/sfx_02_33.asm" -INCLUDE "audio/sfx/sfx_02_34.asm" -INCLUDE "audio/sfx/sfx_02_35.asm" -INCLUDE "audio/sfx/sfx_02_36.asm" +INCLUDE "audio/sfx/cry09_1.asm" +INCLUDE "audio/sfx/cry23_1.asm" +INCLUDE "audio/sfx/cry24_1.asm" +INCLUDE "audio/sfx/cry11_1.asm" +INCLUDE "audio/sfx/cry25_1.asm" +INCLUDE "audio/sfx/cry03_1.asm" +INCLUDE "audio/sfx/cry0f_1.asm" +INCLUDE "audio/sfx/cry10_1.asm" +INCLUDE "audio/sfx/cry00_1.asm" +INCLUDE "audio/sfx/cry0e_1.asm" +INCLUDE "audio/sfx/cry06_1.asm" +INCLUDE "audio/sfx/cry07_1.asm" +INCLUDE "audio/sfx/cry05_1.asm" +INCLUDE "audio/sfx/cry0b_1.asm" +INCLUDE "audio/sfx/cry0c_1.asm" +INCLUDE "audio/sfx/cry02_1.asm" +INCLUDE "audio/sfx/cry0d_1.asm" +INCLUDE "audio/sfx/cry01_1.asm" +INCLUDE "audio/sfx/cry0a_1.asm" +INCLUDE "audio/sfx/cry08_1.asm" +INCLUDE "audio/sfx/cry04_1.asm" +INCLUDE "audio/sfx/cry19_1.asm" +INCLUDE "audio/sfx/cry16_1.asm" +INCLUDE "audio/sfx/cry1b_1.asm" +INCLUDE "audio/sfx/cry12_1.asm" +INCLUDE "audio/sfx/cry13_1.asm" +INCLUDE "audio/sfx/cry14_1.asm" +INCLUDE "audio/sfx/cry1e_1.asm" +INCLUDE "audio/sfx/cry15_1.asm" +INCLUDE "audio/sfx/cry17_1.asm" +INCLUDE "audio/sfx/cry1c_1.asm" +INCLUDE "audio/sfx/cry1a_1.asm" +INCLUDE "audio/sfx/cry1d_1.asm" +INCLUDE "audio/sfx/cry18_1.asm" +INCLUDE "audio/sfx/cry1f_1.asm" +INCLUDE "audio/sfx/cry20_1.asm" +INCLUDE "audio/sfx/cry21_1.asm" +INCLUDE "audio/sfx/cry22_1.asm" SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/sfx_08_01.asm" -INCLUDE "audio/sfx/sfx_08_02.asm" -INCLUDE "audio/sfx/sfx_08_03.asm" -INCLUDE "audio/sfx/sfx_08_04.asm" -INCLUDE "audio/sfx/sfx_08_05.asm" -INCLUDE "audio/sfx/sfx_08_06.asm" -INCLUDE "audio/sfx/sfx_08_07.asm" -INCLUDE "audio/sfx/sfx_08_08.asm" -INCLUDE "audio/sfx/sfx_08_09.asm" -INCLUDE "audio/sfx/sfx_08_0a.asm" -INCLUDE "audio/sfx/sfx_08_0b.asm" -INCLUDE "audio/sfx/sfx_08_0c.asm" -INCLUDE "audio/sfx/sfx_08_0d.asm" -INCLUDE "audio/sfx/sfx_08_0e.asm" -INCLUDE "audio/sfx/sfx_08_0f.asm" -INCLUDE "audio/sfx/sfx_08_10.asm" -INCLUDE "audio/sfx/sfx_08_11.asm" -INCLUDE "audio/sfx/sfx_08_12.asm" -INCLUDE "audio/sfx/sfx_08_13.asm" +INCLUDE "audio/sfx/snare1_2.asm" +INCLUDE "audio/sfx/snare2_2.asm" +INCLUDE "audio/sfx/snare3_2.asm" +INCLUDE "audio/sfx/snare4_2.asm" +INCLUDE "audio/sfx/snare5_2.asm" +INCLUDE "audio/sfx/triangle1_2.asm" +INCLUDE "audio/sfx/triangle2_2.asm" +INCLUDE "audio/sfx/snare6_2.asm" +INCLUDE "audio/sfx/snare7_2.asm" +INCLUDE "audio/sfx/snare8_2.asm" +INCLUDE "audio/sfx/snare9_2.asm" +INCLUDE "audio/sfx/cymbal1_2.asm" +INCLUDE "audio/sfx/cymbal2_2.asm" +INCLUDE "audio/sfx/cymbal3_2.asm" +INCLUDE "audio/sfx/muted_snare1_2.asm" +INCLUDE "audio/sfx/triangle3_2.asm" +INCLUDE "audio/sfx/muted_snare2_2.asm" +INCLUDE "audio/sfx/muted_snare3_2.asm" +INCLUDE "audio/sfx/muted_snare4_2.asm" Music8_WavePointers: INCLUDE "audio/wave_instruments.asm" -INCLUDE "audio/sfx/sfx_08_40.asm" -INCLUDE "audio/sfx/sfx_08_3f.asm" -INCLUDE "audio/sfx/sfx_08_3c.asm" -INCLUDE "audio/sfx/sfx_08_3d.asm" -INCLUDE "audio/sfx/sfx_08_3e.asm" -INCLUDE "audio/sfx/sfx_08_77.asm" -INCLUDE "audio/sfx/sfx_08_41.asm" -INCLUDE "audio/sfx/sfx_08_42.asm" -INCLUDE "audio/sfx/sfx_08_43.asm" -INCLUDE "audio/sfx/sfx_08_44.asm" -INCLUDE "audio/sfx/sfx_08_45.asm" +INCLUDE "audio/sfx/press_ab_2.asm" +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/ball_toss.asm" +INCLUDE "audio/sfx/ball_poof.asm" +INCLUDE "audio/sfx/faint_thud.asm" +INCLUDE "audio/sfx/run.asm" +INCLUDE "audio/sfx/dex_page_added.asm" INCLUDE "audio/sfx/sfx_08_pokeflute_ch3.asm" -INCLUDE "audio/sfx/sfx_08_47.asm" -INCLUDE "audio/sfx/sfx_08_48.asm" -INCLUDE "audio/sfx/sfx_08_49.asm" -INCLUDE "audio/sfx/sfx_08_4a.asm" -INCLUDE "audio/sfx/sfx_08_4b.asm" -INCLUDE "audio/sfx/sfx_08_4c.asm" -INCLUDE "audio/sfx/sfx_08_4d.asm" -INCLUDE "audio/sfx/sfx_08_4e.asm" -INCLUDE "audio/sfx/sfx_08_4f.asm" -INCLUDE "audio/sfx/sfx_08_50.asm" -INCLUDE "audio/sfx/sfx_08_51.asm" -INCLUDE "audio/sfx/sfx_08_52.asm" -INCLUDE "audio/sfx/sfx_08_53.asm" -INCLUDE "audio/sfx/sfx_08_54.asm" -INCLUDE "audio/sfx/sfx_08_55.asm" -INCLUDE "audio/sfx/sfx_08_56.asm" -INCLUDE "audio/sfx/sfx_08_57.asm" -INCLUDE "audio/sfx/sfx_08_58.asm" -INCLUDE "audio/sfx/sfx_08_59.asm" -INCLUDE "audio/sfx/sfx_08_5a.asm" -INCLUDE "audio/sfx/sfx_08_5b.asm" -INCLUDE "audio/sfx/sfx_08_5c.asm" -INCLUDE "audio/sfx/sfx_08_5d.asm" -INCLUDE "audio/sfx/sfx_08_5e.asm" -INCLUDE "audio/sfx/sfx_08_5f.asm" -INCLUDE "audio/sfx/sfx_08_60.asm" -INCLUDE "audio/sfx/sfx_08_61.asm" -INCLUDE "audio/sfx/sfx_08_62.asm" -INCLUDE "audio/sfx/sfx_08_63.asm" -INCLUDE "audio/sfx/sfx_08_64.asm" -INCLUDE "audio/sfx/sfx_08_65.asm" -INCLUDE "audio/sfx/sfx_08_66.asm" -INCLUDE "audio/sfx/sfx_08_67.asm" -INCLUDE "audio/sfx/sfx_08_68.asm" -INCLUDE "audio/sfx/sfx_08_69.asm" -INCLUDE "audio/sfx/sfx_08_6a.asm" -INCLUDE "audio/sfx/sfx_08_6b.asm" -INCLUDE "audio/sfx/sfx_08_6c.asm" -INCLUDE "audio/sfx/sfx_08_6d.asm" -INCLUDE "audio/sfx/sfx_08_6e.asm" -INCLUDE "audio/sfx/sfx_08_6f.asm" -INCLUDE "audio/sfx/sfx_08_70.asm" -INCLUDE "audio/sfx/sfx_08_71.asm" -INCLUDE "audio/sfx/sfx_08_72.asm" -INCLUDE "audio/sfx/sfx_08_73.asm" -INCLUDE "audio/sfx/sfx_08_74.asm" -INCLUDE "audio/sfx/sfx_08_75.asm" -INCLUDE "audio/sfx/sfx_08_76.asm" +INCLUDE "audio/sfx/peck.asm" +INCLUDE "audio/sfx/faint_fall.asm" +INCLUDE "audio/sfx/battle_09.asm" +INCLUDE "audio/sfx/pound.asm" +INCLUDE "audio/sfx/battle_0b.asm" +INCLUDE "audio/sfx/battle_0c.asm" +INCLUDE "audio/sfx/battle_0d.asm" +INCLUDE "audio/sfx/battle_0e.asm" +INCLUDE "audio/sfx/battle_0f.asm" +INCLUDE "audio/sfx/damage.asm" +INCLUDE "audio/sfx/not_very_effective.asm" +INCLUDE "audio/sfx/battle_12.asm" +INCLUDE "audio/sfx/battle_13.asm" +INCLUDE "audio/sfx/battle_14.asm" +INCLUDE "audio/sfx/vine_whip.asm" +INCLUDE "audio/sfx/battle_16.asm" +INCLUDE "audio/sfx/battle_17.asm" +INCLUDE "audio/sfx/battle_18.asm" +INCLUDE "audio/sfx/battle_19.asm" +INCLUDE "audio/sfx/super_effective.asm" +INCLUDE "audio/sfx/battle_1b.asm" +INCLUDE "audio/sfx/battle_1c.asm" +INCLUDE "audio/sfx/doubleslap.asm" +INCLUDE "audio/sfx/battle_1e.asm" +INCLUDE "audio/sfx/horn_drill.asm" +INCLUDE "audio/sfx/battle_20.asm" +INCLUDE "audio/sfx/battle_21.asm" +INCLUDE "audio/sfx/battle_22.asm" +INCLUDE "audio/sfx/battle_23.asm" +INCLUDE "audio/sfx/battle_24.asm" +INCLUDE "audio/sfx/battle_25.asm" +INCLUDE "audio/sfx/battle_26.asm" +INCLUDE "audio/sfx/battle_27.asm" +INCLUDE "audio/sfx/battle_28.asm" +INCLUDE "audio/sfx/battle_29.asm" +INCLUDE "audio/sfx/battle_2a.asm" +INCLUDE "audio/sfx/battle_2b.asm" +INCLUDE "audio/sfx/battle_2c.asm" +INCLUDE "audio/sfx/psybeam.asm" +INCLUDE "audio/sfx/battle_2e.asm" +INCLUDE "audio/sfx/battle_2f.asm" +INCLUDE "audio/sfx/psychic_m.asm" +INCLUDE "audio/sfx/battle_31.asm" +INCLUDE "audio/sfx/battle_32.asm" +INCLUDE "audio/sfx/battle_33.asm" +INCLUDE "audio/sfx/battle_34.asm" +INCLUDE "audio/sfx/battle_35.asm" +INCLUDE "audio/sfx/battle_36.asm" INCLUDE "audio/sfx/sfx_08_unused.asm" -INCLUDE "audio/sfx/sfx_08_1d.asm" -INCLUDE "audio/sfx/sfx_08_37.asm" -INCLUDE "audio/sfx/sfx_08_38.asm" -INCLUDE "audio/sfx/sfx_08_25.asm" -INCLUDE "audio/sfx/sfx_08_39.asm" -INCLUDE "audio/sfx/sfx_08_17.asm" -INCLUDE "audio/sfx/sfx_08_23.asm" -INCLUDE "audio/sfx/sfx_08_24.asm" -INCLUDE "audio/sfx/sfx_08_14.asm" -INCLUDE "audio/sfx/sfx_08_22.asm" -INCLUDE "audio/sfx/sfx_08_1a.asm" -INCLUDE "audio/sfx/sfx_08_1b.asm" -INCLUDE "audio/sfx/sfx_08_19.asm" -INCLUDE "audio/sfx/sfx_08_1f.asm" -INCLUDE "audio/sfx/sfx_08_20.asm" -INCLUDE "audio/sfx/sfx_08_16.asm" -INCLUDE "audio/sfx/sfx_08_21.asm" -INCLUDE "audio/sfx/sfx_08_15.asm" -INCLUDE "audio/sfx/sfx_08_1e.asm" -INCLUDE "audio/sfx/sfx_08_1c.asm" -INCLUDE "audio/sfx/sfx_08_18.asm" -INCLUDE "audio/sfx/sfx_08_2d.asm" -INCLUDE "audio/sfx/sfx_08_2a.asm" -INCLUDE "audio/sfx/sfx_08_2f.asm" -INCLUDE "audio/sfx/sfx_08_26.asm" -INCLUDE "audio/sfx/sfx_08_27.asm" -INCLUDE "audio/sfx/sfx_08_28.asm" -INCLUDE "audio/sfx/sfx_08_32.asm" -INCLUDE "audio/sfx/sfx_08_29.asm" -INCLUDE "audio/sfx/sfx_08_2b.asm" -INCLUDE "audio/sfx/sfx_08_30.asm" -INCLUDE "audio/sfx/sfx_08_2e.asm" -INCLUDE "audio/sfx/sfx_08_31.asm" -INCLUDE "audio/sfx/sfx_08_2c.asm" -INCLUDE "audio/sfx/sfx_08_33.asm" -INCLUDE "audio/sfx/sfx_08_34.asm" -INCLUDE "audio/sfx/sfx_08_35.asm" -INCLUDE "audio/sfx/sfx_08_36.asm" +INCLUDE "audio/sfx/cry09_2.asm" +INCLUDE "audio/sfx/cry23_2.asm" +INCLUDE "audio/sfx/cry24_2.asm" +INCLUDE "audio/sfx/cry11_2.asm" +INCLUDE "audio/sfx/cry25_2.asm" +INCLUDE "audio/sfx/cry03_2.asm" +INCLUDE "audio/sfx/cry0f_2.asm" +INCLUDE "audio/sfx/cry10_2.asm" +INCLUDE "audio/sfx/cry00_2.asm" +INCLUDE "audio/sfx/cry0e_2.asm" +INCLUDE "audio/sfx/cry06_2.asm" +INCLUDE "audio/sfx/cry07_2.asm" +INCLUDE "audio/sfx/cry05_2.asm" +INCLUDE "audio/sfx/cry0b_2.asm" +INCLUDE "audio/sfx/cry0c_2.asm" +INCLUDE "audio/sfx/cry02_2.asm" +INCLUDE "audio/sfx/cry0d_2.asm" +INCLUDE "audio/sfx/cry01_2.asm" +INCLUDE "audio/sfx/cry0a_2.asm" +INCLUDE "audio/sfx/cry08_2.asm" +INCLUDE "audio/sfx/cry04_2.asm" +INCLUDE "audio/sfx/cry19_2.asm" +INCLUDE "audio/sfx/cry16_2.asm" +INCLUDE "audio/sfx/cry1b_2.asm" +INCLUDE "audio/sfx/cry12_2.asm" +INCLUDE "audio/sfx/cry13_2.asm" +INCLUDE "audio/sfx/cry14_2.asm" +INCLUDE "audio/sfx/cry1e_2.asm" +INCLUDE "audio/sfx/cry15_2.asm" +INCLUDE "audio/sfx/cry17_2.asm" +INCLUDE "audio/sfx/cry1c_2.asm" +INCLUDE "audio/sfx/cry1a_2.asm" +INCLUDE "audio/sfx/cry1d_2.asm" +INCLUDE "audio/sfx/cry18_2.asm" +INCLUDE "audio/sfx/cry1f_2.asm" +INCLUDE "audio/sfx/cry20_2.asm" +INCLUDE "audio/sfx/cry21_2.asm" +INCLUDE "audio/sfx/cry22_2.asm" SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] -INCLUDE "audio/sfx/sfx_1f_01.asm" -INCLUDE "audio/sfx/sfx_1f_02.asm" -INCLUDE "audio/sfx/sfx_1f_03.asm" -INCLUDE "audio/sfx/sfx_1f_04.asm" -INCLUDE "audio/sfx/sfx_1f_05.asm" -INCLUDE "audio/sfx/sfx_1f_06.asm" -INCLUDE "audio/sfx/sfx_1f_07.asm" -INCLUDE "audio/sfx/sfx_1f_08.asm" -INCLUDE "audio/sfx/sfx_1f_09.asm" -INCLUDE "audio/sfx/sfx_1f_0a.asm" -INCLUDE "audio/sfx/sfx_1f_0b.asm" -INCLUDE "audio/sfx/sfx_1f_0c.asm" -INCLUDE "audio/sfx/sfx_1f_0d.asm" -INCLUDE "audio/sfx/sfx_1f_0e.asm" -INCLUDE "audio/sfx/sfx_1f_0f.asm" -INCLUDE "audio/sfx/sfx_1f_10.asm" -INCLUDE "audio/sfx/sfx_1f_11.asm" -INCLUDE "audio/sfx/sfx_1f_12.asm" -INCLUDE "audio/sfx/sfx_1f_13.asm" +INCLUDE "audio/sfx/snare1_3.asm" +INCLUDE "audio/sfx/snare2_3.asm" +INCLUDE "audio/sfx/snare3_3.asm" +INCLUDE "audio/sfx/snare4_3.asm" +INCLUDE "audio/sfx/snare5_3.asm" +INCLUDE "audio/sfx/triangle1_3.asm" +INCLUDE "audio/sfx/triangle2_3.asm" +INCLUDE "audio/sfx/snare6_3.asm" +INCLUDE "audio/sfx/snare7_3.asm" +INCLUDE "audio/sfx/snare8_3.asm" +INCLUDE "audio/sfx/snare9_3.asm" +INCLUDE "audio/sfx/cymbal1_3.asm" +INCLUDE "audio/sfx/cymbal2_3.asm" +INCLUDE "audio/sfx/cymbal3_3.asm" +INCLUDE "audio/sfx/muted_snare1_3.asm" +INCLUDE "audio/sfx/triangle3_3.asm" +INCLUDE "audio/sfx/muted_snare2_3.asm" +INCLUDE "audio/sfx/muted_snare3_3.asm" +INCLUDE "audio/sfx/muted_snare4_3.asm" Music1f_WavePointers: INCLUDE "audio/wave_instruments.asm" -INCLUDE "audio/sfx/sfx_1f_3f.asm" -INCLUDE "audio/sfx/sfx_1f_56.asm" -INCLUDE "audio/sfx/sfx_1f_57.asm" -INCLUDE "audio/sfx/sfx_1f_58.asm" -INCLUDE "audio/sfx/sfx_1f_3c.asm" -INCLUDE "audio/sfx/sfx_1f_59.asm" -INCLUDE "audio/sfx/sfx_1f_5a.asm" -INCLUDE "audio/sfx/sfx_1f_5b.asm" -INCLUDE "audio/sfx/sfx_1f_5c.asm" -INCLUDE "audio/sfx/sfx_1f_40.asm" -INCLUDE "audio/sfx/sfx_1f_5d.asm" -INCLUDE "audio/sfx/sfx_1f_3d.asm" -INCLUDE "audio/sfx/sfx_1f_43.asm" -INCLUDE "audio/sfx/sfx_1f_3e.asm" -INCLUDE "audio/sfx/sfx_1f_44.asm" -INCLUDE "audio/sfx/sfx_1f_45.asm" -INCLUDE "audio/sfx/sfx_1f_46.asm" -INCLUDE "audio/sfx/sfx_1f_47.asm" -INCLUDE "audio/sfx/sfx_1f_48.asm" -INCLUDE "audio/sfx/sfx_1f_49.asm" -INCLUDE "audio/sfx/sfx_1f_4a.asm" -INCLUDE "audio/sfx/sfx_1f_4b.asm" -INCLUDE "audio/sfx/sfx_1f_4c.asm" -INCLUDE "audio/sfx/sfx_1f_4d.asm" -INCLUDE "audio/sfx/sfx_1f_4e.asm" -INCLUDE "audio/sfx/sfx_1f_4f.asm" -INCLUDE "audio/sfx/sfx_1f_50.asm" -INCLUDE "audio/sfx/sfx_1f_51.asm" -INCLUDE "audio/sfx/sfx_1f_52.asm" -INCLUDE "audio/sfx/sfx_1f_53.asm" -INCLUDE "audio/sfx/sfx_1f_54.asm" -INCLUDE "audio/sfx/sfx_1f_55.asm" -INCLUDE "audio/sfx/sfx_1f_5e.asm" -INCLUDE "audio/sfx/sfx_1f_5f.asm" -INCLUDE "audio/sfx/sfx_1f_60.asm" -INCLUDE "audio/sfx/sfx_1f_61.asm" -INCLUDE "audio/sfx/sfx_1f_62.asm" -INCLUDE "audio/sfx/sfx_1f_63.asm" -INCLUDE "audio/sfx/sfx_1f_64.asm" -INCLUDE "audio/sfx/sfx_1f_65.asm" -INCLUDE "audio/sfx/sfx_1f_66.asm" -INCLUDE "audio/sfx/sfx_1f_67.asm" +INCLUDE "audio/sfx/start_menu_3.asm" +INCLUDE "audio/sfx/cut_3.asm" +INCLUDE "audio/sfx/go_inside_3.asm" +INCLUDE "audio/sfx/swap_3.asm" +INCLUDE "audio/sfx/tink_3.asm" +INCLUDE "audio/sfx/59_3.asm" +INCLUDE "audio/sfx/purchase_3.asm" +INCLUDE "audio/sfx/collision_3.asm" +INCLUDE "audio/sfx/go_outside_3.asm" +INCLUDE "audio/sfx/press_ab_3.asm" +INCLUDE "audio/sfx/save_3.asm" +INCLUDE "audio/sfx/heal_hp_3.asm" +INCLUDE "audio/sfx/poisoned_3.asm" +INCLUDE "audio/sfx/heal_ailment_3.asm" +INCLUDE "audio/sfx/trade_machine_3.asm" +INCLUDE "audio/sfx/turn_on_pc_3.asm" +INCLUDE "audio/sfx/turn_off_pc_3.asm" +INCLUDE "audio/sfx/enter_pc_3.asm" +INCLUDE "audio/sfx/shrink_3.asm" +INCLUDE "audio/sfx/switch_3.asm" +INCLUDE "audio/sfx/healing_machine_3.asm" +INCLUDE "audio/sfx/teleport_exit1_3.asm" +INCLUDE "audio/sfx/teleport_enter1_3.asm" +INCLUDE "audio/sfx/teleport_exit2_3.asm" +INCLUDE "audio/sfx/ledge_3.asm" +INCLUDE "audio/sfx/teleport_enter2_3.asm" +INCLUDE "audio/sfx/fly_3.asm" +INCLUDE "audio/sfx/denied_3.asm" +INCLUDE "audio/sfx/arrow_tiles_3.asm" +INCLUDE "audio/sfx/push_boulder_3.asm" +INCLUDE "audio/sfx/ss_anne_horn_3.asm" +INCLUDE "audio/sfx/withdraw_deposit_3.asm" +INCLUDE "audio/sfx/intro_lunge.asm" +INCLUDE "audio/sfx/intro_hip.asm" +INCLUDE "audio/sfx/intro_hop.asm" +INCLUDE "audio/sfx/intro_raise.asm" +INCLUDE "audio/sfx/intro_crash.asm" +INCLUDE "audio/sfx/intro_whoosh.asm" +INCLUDE "audio/sfx/slots_stop_wheel.asm" +INCLUDE "audio/sfx/slots_reward.asm" +INCLUDE "audio/sfx/slots_new_spin.asm" +INCLUDE "audio/sfx/shooting_star.asm" INCLUDE "audio/sfx/sfx_1f_unused.asm" -INCLUDE "audio/sfx/sfx_1f_1d.asm" -INCLUDE "audio/sfx/sfx_1f_37.asm" -INCLUDE "audio/sfx/sfx_1f_38.asm" -INCLUDE "audio/sfx/sfx_1f_25.asm" -INCLUDE "audio/sfx/sfx_1f_39.asm" -INCLUDE "audio/sfx/sfx_1f_17.asm" -INCLUDE "audio/sfx/sfx_1f_23.asm" -INCLUDE "audio/sfx/sfx_1f_24.asm" -INCLUDE "audio/sfx/sfx_1f_14.asm" -INCLUDE "audio/sfx/sfx_1f_22.asm" -INCLUDE "audio/sfx/sfx_1f_1a.asm" -INCLUDE "audio/sfx/sfx_1f_1b.asm" -INCLUDE "audio/sfx/sfx_1f_19.asm" -INCLUDE "audio/sfx/sfx_1f_1f.asm" -INCLUDE "audio/sfx/sfx_1f_20.asm" -INCLUDE "audio/sfx/sfx_1f_16.asm" -INCLUDE "audio/sfx/sfx_1f_21.asm" -INCLUDE "audio/sfx/sfx_1f_15.asm" -INCLUDE "audio/sfx/sfx_1f_1e.asm" -INCLUDE "audio/sfx/sfx_1f_1c.asm" -INCLUDE "audio/sfx/sfx_1f_18.asm" -INCLUDE "audio/sfx/sfx_1f_2d.asm" -INCLUDE "audio/sfx/sfx_1f_2a.asm" -INCLUDE "audio/sfx/sfx_1f_2f.asm" -INCLUDE "audio/sfx/sfx_1f_26.asm" -INCLUDE "audio/sfx/sfx_1f_27.asm" -INCLUDE "audio/sfx/sfx_1f_28.asm" -INCLUDE "audio/sfx/sfx_1f_32.asm" -INCLUDE "audio/sfx/sfx_1f_29.asm" -INCLUDE "audio/sfx/sfx_1f_2b.asm" -INCLUDE "audio/sfx/sfx_1f_30.asm" -INCLUDE "audio/sfx/sfx_1f_2e.asm" -INCLUDE "audio/sfx/sfx_1f_31.asm" -INCLUDE "audio/sfx/sfx_1f_2c.asm" -INCLUDE "audio/sfx/sfx_1f_33.asm" -INCLUDE "audio/sfx/sfx_1f_34.asm" -INCLUDE "audio/sfx/sfx_1f_35.asm" -INCLUDE "audio/sfx/sfx_1f_36.asm" +INCLUDE "audio/sfx/cry09_3.asm" +INCLUDE "audio/sfx/cry23_3.asm" +INCLUDE "audio/sfx/cry24_3.asm" +INCLUDE "audio/sfx/cry11_3.asm" +INCLUDE "audio/sfx/cry25_3.asm" +INCLUDE "audio/sfx/cry03_3.asm" +INCLUDE "audio/sfx/cry0f_3.asm" +INCLUDE "audio/sfx/cry10_3.asm" +INCLUDE "audio/sfx/cry00_3.asm" +INCLUDE "audio/sfx/cry0e_3.asm" +INCLUDE "audio/sfx/cry06_3.asm" +INCLUDE "audio/sfx/cry07_3.asm" +INCLUDE "audio/sfx/cry05_3.asm" +INCLUDE "audio/sfx/cry0b_3.asm" +INCLUDE "audio/sfx/cry0c_3.asm" +INCLUDE "audio/sfx/cry02_3.asm" +INCLUDE "audio/sfx/cry0d_3.asm" +INCLUDE "audio/sfx/cry01_3.asm" +INCLUDE "audio/sfx/cry0a_3.asm" +INCLUDE "audio/sfx/cry08_3.asm" +INCLUDE "audio/sfx/cry04_3.asm" +INCLUDE "audio/sfx/cry19_3.asm" +INCLUDE "audio/sfx/cry16_3.asm" +INCLUDE "audio/sfx/cry1b_3.asm" +INCLUDE "audio/sfx/cry12_3.asm" +INCLUDE "audio/sfx/cry13_3.asm" +INCLUDE "audio/sfx/cry14_3.asm" +INCLUDE "audio/sfx/cry1e_3.asm" +INCLUDE "audio/sfx/cry15_3.asm" +INCLUDE "audio/sfx/cry17_3.asm" +INCLUDE "audio/sfx/cry1c_3.asm" +INCLUDE "audio/sfx/cry1a_3.asm" +INCLUDE "audio/sfx/cry1d_3.asm" +INCLUDE "audio/sfx/cry18_3.asm" +INCLUDE "audio/sfx/cry1f_3.asm" +INCLUDE "audio/sfx/cry20_3.asm" +INCLUDE "audio/sfx/cry21_3.asm" +INCLUDE "audio/sfx/cry22_3.asm" @@ -585,13 +585,13 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) jp PlayDefaultMusic PokedexRatingSfxPointers: ; 7d162 (1f:5162) - db SFX_DENIED, BANK(SFX_1f_51) - db SFX_POKEDEX_RATING, BANK(SFX_02_41) - db SFX_GET_ITEM_1, BANK(SFX_02_3a) - db SFX_CAUGHT_MON, BANK(SFX_08_46) - db SFX_LEVEL_UP, BANK(SFX_08_3a) - db SFX_GET_KEY_ITEM, BANK(SFX_02_42) - db SFX_GET_ITEM_2, BANK(SFX_02_3b) + db SFX_DENIED, BANK(SFX_Denied_3) + db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) + db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) + db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon) + db SFX_LEVEL_UP, BANK(SFX_Level_Up) + db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) + db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) OwnedMonValues: ; 7d170 (1f:5170) db 10, 40, 60, 90, 120, 150, $ff @@ -612,13 +612,13 @@ INCLUDE "audio/music/indigoplateau.asm" INCLUDE "audio/music/pallettown.asm" INCLUDE "audio/music/unusedsong.asm" INCLUDE "audio/music/cities1.asm" -INCLUDE "audio/sfx/sfx_02_3a.asm" +INCLUDE "audio/sfx/get_item1_1.asm" INCLUDE "audio/music/museumguy.asm" INCLUDE "audio/music/meetprofoak.asm" INCLUDE "audio/music/meetrival.asm" -INCLUDE "audio/sfx/sfx_02_41.asm" -INCLUDE "audio/sfx/sfx_02_3b.asm" -INCLUDE "audio/sfx/sfx_02_42.asm" +INCLUDE "audio/sfx/pokedex_rating_1.asm" +INCLUDE "audio/sfx/get_item2_1.asm" +INCLUDE "audio/sfx/get_key_item_1.asm" INCLUDE "audio/music/ssanne.asm" INCLUDE "audio/music/cities2.asm" INCLUDE "audio/music/celadon.asm" @@ -638,9 +638,9 @@ INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" INCLUDE "audio/music/wildbattle.asm" INCLUDE "audio/music/finalbattle.asm" -INCLUDE "audio/sfx/sfx_08_3a.asm" -INCLUDE "audio/sfx/sfx_08_3b.asm" -INCLUDE "audio/sfx/sfx_08_46.asm" +INCLUDE "audio/sfx/level_up.asm" +INCLUDE "audio/sfx/get_item2_2.asm" +INCLUDE "audio/sfx/caught_mon.asm" INCLUDE "audio/music/defeatedtrainer.asm" INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" @@ -652,13 +652,13 @@ INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" INCLUDE "audio/music/gamecorner.asm" INCLUDE "audio/music/titlescreen.asm" -INCLUDE "audio/sfx/sfx_1f_3a.asm" +INCLUDE "audio/sfx/get_item1_3.asm" INCLUDE "audio/music/dungeon2.asm" INCLUDE "audio/music/dungeon3.asm" INCLUDE "audio/music/cinnabarmansion.asm" -INCLUDE "audio/sfx/sfx_1f_41.asm" -INCLUDE "audio/sfx/sfx_1f_3b.asm" -INCLUDE "audio/sfx/sfx_1f_42.asm" +INCLUDE "audio/sfx/pokedex_rating_3.asm" +INCLUDE "audio/sfx/get_item2_3.asm" +INCLUDE "audio/sfx/get_key_item_3.asm" INCLUDE "audio/music/oakslab.asm" INCLUDE "audio/music/pokemontower.asm" INCLUDE "audio/music/silphco.asm" diff --git a/audio/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm old mode 100755 new mode 100644 index b5cff17a..86fca297 --- a/audio/headers/sfxheaders02.asm +++ b/audio/headers/sfxheaders02.asm @@ -1,562 +1,562 @@ SFX_Headers_02:: db $ff, $ff, $ff ; padding -SFX_02_01:: ; 8003 (2:4003) +SFX_Snare1_1:: ; 8003 (2:4003) db CH7 - dw SFX_02_01_Ch1 + dw SFX_Snare1_1_Ch1 -SFX_02_02:: ; 8006 (2:4006) +SFX_Snare2_1:: ; 8006 (2:4006) db CH7 - dw SFX_02_02_Ch1 + dw SFX_Snare2_1_Ch1 -SFX_02_03:: ; 8009 (2:4009) +SFX_Snare3_1:: ; 8009 (2:4009) db CH7 - dw SFX_02_03_Ch1 + dw SFX_Snare3_1_Ch1 -SFX_02_04:: ; 800c (2:400c) +SFX_Snare4_1:: ; 800c (2:400c) db CH7 - dw SFX_02_04_Ch1 + dw SFX_Snare4_1_Ch1 -SFX_02_05:: ; 800f (2:400f) +SFX_Snare5_1:: ; 800f (2:400f) db CH7 - dw SFX_02_05_Ch1 + dw SFX_Snare5_1_Ch1 -SFX_02_06:: ; 8012 (2:4012) +SFX_Triangle1_1:: ; 8012 (2:4012) db CH7 - dw SFX_02_06_Ch1 + dw SFX_Triangle1_1_Ch1 -SFX_02_07:: ; 8015 (2:4015) +SFX_Triangle2_1:: ; 8015 (2:4015) db CH7 - dw SFX_02_07_Ch1 + dw SFX_Triangle2_1_Ch1 -SFX_02_08:: ; 8018 (2:4018) +SFX_Snare6_1:: ; 8018 (2:4018) db CH7 - dw SFX_02_08_Ch1 + dw SFX_Snare6_1_Ch1 -SFX_02_09:: ; 801b (2:401b) +SFX_Snare7_1:: ; 801b (2:401b) db CH7 - dw SFX_02_09_Ch1 + dw SFX_Snare7_1_Ch1 -SFX_02_0a:: ; 801e (2:401e) +SFX_Snare8_1:: ; 801e (2:401e) db CH7 - dw SFX_02_0a_Ch1 + dw SFX_Snare8_1_Ch1 -SFX_02_0b:: ; 8021 (2:4021) +SFX_Snare9_1:: ; 8021 (2:4021) db CH7 - dw SFX_02_0b_Ch1 + dw SFX_Snare9_1_Ch1 -SFX_02_0c:: ; 8024 (2:4024) +SFX_Cymbal1_1:: ; 8024 (2:4024) db CH7 - dw SFX_02_0c_Ch1 + dw SFX_Cymbal1_1_Ch1 -SFX_02_0d:: ; 8027 (2:4027) +SFX_Cymbal2_1:: ; 8027 (2:4027) db CH7 - dw SFX_02_0d_Ch1 + dw SFX_Cymbal2_1_Ch1 -SFX_02_0e:: ; 802a (2:402a) +SFX_Cymbal3_1:: ; 802a (2:402a) db CH7 - dw SFX_02_0e_Ch1 + dw SFX_Cymbal3_1_Ch1 -SFX_02_0f:: ; 802d (2:402d) +SFX_Muted_Snare1_1:: ; 802d (2:402d) db CH7 - dw SFX_02_0f_Ch1 + dw SFX_Muted_Snare1_1_Ch1 -SFX_02_10:: ; 8030 (2:4030) +SFX_Triangle3_1:: ; 8030 (2:4030) db CH7 - dw SFX_02_10_Ch1 + dw SFX_Triangle3_1_Ch1 -SFX_02_11:: ; 8033 (2:4033) +SFX_Muted_Snare2_1:: ; 8033 (2:4033) db CH7 - dw SFX_02_11_Ch1 + dw SFX_Muted_Snare2_1_Ch1 -SFX_02_12:: ; 8036 (2:4036) +SFX_Muted_Snare3_1:: ; 8036 (2:4036) db CH7 - dw SFX_02_12_Ch1 + dw SFX_Muted_Snare3_1_Ch1 -SFX_02_13:: ; 8039 (2:4039) +SFX_Muted_Snare4_1:: ; 8039 (2:4039) db CH7 - dw SFX_02_13_Ch1 + dw SFX_Muted_Snare4_1_Ch1 -SFX_02_14:: ; 803c (2:403c) +SFX_Cry00_1:: ; 803c (2:403c) db ( $80 | CH4 ) - dw SFX_02_14_Ch1 + dw SFX_Cry00_1_Ch1 db CH5 - dw SFX_02_14_Ch2 + dw SFX_Cry00_1_Ch2 db CH7 - dw SFX_02_14_Ch3 + dw SFX_Cry00_1_Ch3 -SFX_02_15:: ; 8045 (2:4045) +SFX_Cry01_1:: ; 8045 (2:4045) db ( $80 | CH4 ) - dw SFX_02_15_Ch1 + dw SFX_Cry01_1_Ch1 db CH5 - dw SFX_02_15_Ch2 + dw SFX_Cry01_1_Ch2 db CH7 - dw SFX_02_15_Ch3 + dw SFX_Cry01_1_Ch3 -SFX_02_16:: ; 804e (2:404e) +SFX_Cry02_1:: ; 804e (2:404e) db ( $80 | CH4 ) - dw SFX_02_16_Ch1 + dw SFX_Cry02_1_Ch1 db CH5 - dw SFX_02_16_Ch2 + dw SFX_Cry02_1_Ch2 db CH7 - dw SFX_02_16_Ch3 + dw SFX_Cry02_1_Ch3 -SFX_02_17:: ; 8057 (2:4057) +SFX_Cry03_1:: ; 8057 (2:4057) db ( $80 | CH4 ) - dw SFX_02_17_Ch1 + dw SFX_Cry03_1_Ch1 db CH5 - dw SFX_02_17_Ch2 + dw SFX_Cry03_1_Ch2 db CH7 - dw SFX_02_17_Ch3 + dw SFX_Cry03_1_Ch3 -SFX_02_18:: ; 8060 (2:4060) +SFX_Cry04_1:: ; 8060 (2:4060) db ( $80 | CH4 ) - dw SFX_02_18_Ch1 + dw SFX_Cry04_1_Ch1 db CH5 - dw SFX_02_18_Ch2 + dw SFX_Cry04_1_Ch2 db CH7 - dw SFX_02_18_Ch3 + dw SFX_Cry04_1_Ch3 -SFX_02_19:: ; 8069 (2:4069) +SFX_Cry05_1:: ; 8069 (2:4069) db ( $80 | CH4 ) - dw SFX_02_19_Ch1 + dw SFX_Cry05_1_Ch1 db CH5 - dw SFX_02_19_Ch2 + dw SFX_Cry05_1_Ch2 db CH7 - dw SFX_02_19_Ch3 + dw SFX_Cry05_1_Ch3 -SFX_02_1a:: ; 8072 (2:4072) +SFX_Cry06_1:: ; 8072 (2:4072) db ( $80 | CH4 ) - dw SFX_02_1a_Ch1 + dw SFX_Cry06_1_Ch1 db CH5 - dw SFX_02_1a_Ch2 + dw SFX_Cry06_1_Ch2 db CH7 - dw SFX_02_1a_Ch3 + dw SFX_Cry06_1_Ch3 -SFX_02_1b:: ; 807b (2:407b) +SFX_Cry07_1:: ; 807b (2:407b) db ( $80 | CH4 ) - dw SFX_02_1b_Ch1 + dw SFX_Cry07_1_Ch1 db CH5 - dw SFX_02_1b_Ch2 + dw SFX_Cry07_1_Ch2 db CH7 - dw SFX_02_1b_Ch3 + dw SFX_Cry07_1_Ch3 -SFX_02_1c:: ; 8084 (2:4084) +SFX_Cry08_1:: ; 8084 (2:4084) db ( $80 | CH4 ) - dw SFX_02_1c_Ch1 + dw SFX_Cry08_1_Ch1 db CH5 - dw SFX_02_1c_Ch2 + dw SFX_Cry08_1_Ch2 db CH7 - dw SFX_02_1c_Ch3 + dw SFX_Cry08_1_Ch3 -SFX_02_1d:: ; 808d (2:408d) +SFX_Cry09_1:: ; 808d (2:408d) db ( $80 | CH4 ) - dw SFX_02_1d_Ch1 + dw SFX_Cry09_1_Ch1 db CH5 - dw SFX_02_1d_Ch2 + dw SFX_Cry09_1_Ch2 db CH7 - dw SFX_02_1d_Ch3 + dw SFX_Cry09_1_Ch3 -SFX_02_1e:: ; 8096 (2:4096) +SFX_Cry0A_1:: ; 8096 (2:4096) db ( $80 | CH4 ) - dw SFX_02_1e_Ch1 + dw SFX_Cry0A_1_Ch1 db CH5 - dw SFX_02_1e_Ch2 + dw SFX_Cry0A_1_Ch2 db CH7 - dw SFX_02_1e_Ch3 + dw SFX_Cry0A_1_Ch3 -SFX_02_1f:: ; 809f (2:409f) +SFX_Cry0B_1:: ; 809f (2:409f) db ( $80 | CH4 ) - dw SFX_02_1f_Ch1 + dw SFX_Cry0B_1_Ch1 db CH5 - dw SFX_02_1f_Ch2 + dw SFX_Cry0B_1_Ch2 db CH7 - dw SFX_02_1f_Ch3 + dw SFX_Cry0B_1_Ch3 -SFX_02_20:: ; 80a8 (2:40a8) +SFX_Cry0C_1:: ; 80a8 (2:40a8) db ( $80 | CH4 ) - dw SFX_02_20_Ch1 + dw SFX_Cry0C_1_Ch1 db CH5 - dw SFX_02_20_Ch2 + dw SFX_Cry0C_1_Ch2 db CH7 - dw SFX_02_20_Ch3 + dw SFX_Cry0C_1_Ch3 -SFX_02_21:: ; 80b1 (2:40b1) +SFX_Cry0D_1:: ; 80b1 (2:40b1) db ( $80 | CH4 ) - dw SFX_02_21_Ch1 + dw SFX_Cry0D_1_Ch1 db CH5 - dw SFX_02_21_Ch2 + dw SFX_Cry0D_1_Ch2 db CH7 - dw SFX_02_21_Ch3 + dw SFX_Cry0D_1_Ch3 -SFX_02_22:: ; 80ba (2:40ba) +SFX_Cry0E_1:: ; 80ba (2:40ba) db ( $80 | CH4 ) - dw SFX_02_22_Ch1 + dw SFX_Cry0E_1_Ch1 db CH5 - dw SFX_02_22_Ch2 + dw SFX_Cry0E_1_Ch2 db CH7 - dw SFX_02_22_Ch3 + dw SFX_Cry0E_1_Ch3 -SFX_02_23:: ; 80c3 (2:40c3) +SFX_Cry0F_1:: ; 80c3 (2:40c3) db ( $80 | CH4 ) - dw SFX_02_23_Ch1 + dw SFX_Cry0F_1_Ch1 db CH5 - dw SFX_02_23_Ch2 + dw SFX_Cry0F_1_Ch2 db CH7 - dw SFX_02_23_Ch3 + dw SFX_Cry0F_1_Ch3 -SFX_02_24:: ; 80cc (2:40cc) +SFX_Cry10_1:: ; 80cc (2:40cc) db ( $80 | CH4 ) - dw SFX_02_24_Ch1 + dw SFX_Cry10_1_Ch1 db CH5 - dw SFX_02_24_Ch2 + dw SFX_Cry10_1_Ch2 db CH7 - dw SFX_02_24_Ch3 + dw SFX_Cry10_1_Ch3 -SFX_02_25:: ; 80d5 (2:40d5) +SFX_Cry11_1:: ; 80d5 (2:40d5) db ( $80 | CH4 ) - dw SFX_02_25_Ch1 + dw SFX_Cry11_1_Ch1 db CH5 - dw SFX_02_25_Ch2 + dw SFX_Cry11_1_Ch2 db CH7 - dw SFX_02_25_Ch3 + dw SFX_Cry11_1_Ch3 -SFX_02_26:: ; 80de (2:40de) +SFX_Cry12_1:: ; 80de (2:40de) db ( $80 | CH4 ) - dw SFX_02_26_Ch1 + dw SFX_Cry12_1_Ch1 db CH5 - dw SFX_02_26_Ch2 + dw SFX_Cry12_1_Ch2 db CH7 - dw SFX_02_26_Ch3 + dw SFX_Cry12_1_Ch3 -SFX_02_27:: ; 80e7 (2:40e7) +SFX_Cry13_1:: ; 80e7 (2:40e7) db ( $80 | CH4 ) - dw SFX_02_27_Ch1 + dw SFX_Cry13_1_Ch1 db CH5 - dw SFX_02_27_Ch2 + dw SFX_Cry13_1_Ch2 db CH7 - dw SFX_02_27_Ch3 + dw SFX_Cry13_1_Ch3 -SFX_02_28:: ; 80f0 (2:40f0) +SFX_Cry14_1:: ; 80f0 (2:40f0) db ( $80 | CH4 ) - dw SFX_02_28_Ch1 + dw SFX_Cry14_1_Ch1 db CH5 - dw SFX_02_28_Ch2 + dw SFX_Cry14_1_Ch2 db CH7 - dw SFX_02_28_Ch3 + dw SFX_Cry14_1_Ch3 -SFX_02_29:: ; 80f9 (2:40f9) +SFX_Cry15_1:: ; 80f9 (2:40f9) db ( $80 | CH4 ) - dw SFX_02_29_Ch1 + dw SFX_Cry15_1_Ch1 db CH5 - dw SFX_02_29_Ch2 + dw SFX_Cry15_1_Ch2 db CH7 - dw SFX_02_29_Ch3 + dw SFX_Cry15_1_Ch3 -SFX_02_2a:: ; 8102 (2:4102) +SFX_Cry16_1:: ; 8102 (2:4102) db ( $80 | CH4 ) - dw SFX_02_2a_Ch1 + dw SFX_Cry16_1_Ch1 db CH5 - dw SFX_02_2a_Ch2 + dw SFX_Cry16_1_Ch2 db CH7 - dw SFX_02_2a_Ch3 + dw SFX_Cry16_1_Ch3 -SFX_02_2b:: ; 810b (2:410b) +SFX_Cry17_1:: ; 810b (2:410b) db ( $80 | CH4 ) - dw SFX_02_2b_Ch1 + dw SFX_Cry17_1_Ch1 db CH5 - dw SFX_02_2b_Ch2 + dw SFX_Cry17_1_Ch2 db CH7 - dw SFX_02_2b_Ch3 + dw SFX_Cry17_1_Ch3 -SFX_02_2c:: ; 8114 (2:4114) +SFX_Cry18_1:: ; 8114 (2:4114) db ( $80 | CH4 ) - dw SFX_02_2c_Ch1 + dw SFX_Cry18_1_Ch1 db CH5 - dw SFX_02_2c_Ch2 + dw SFX_Cry18_1_Ch2 db CH7 - dw SFX_02_2c_Ch3 + dw SFX_Cry18_1_Ch3 -SFX_02_2d:: ; 811d (2:411d) +SFX_Cry19_1:: ; 811d (2:411d) db ( $80 | CH4 ) - dw SFX_02_2d_Ch1 + dw SFX_Cry19_1_Ch1 db CH5 - dw SFX_02_2d_Ch2 + dw SFX_Cry19_1_Ch2 db CH7 - dw SFX_02_2d_Ch3 + dw SFX_Cry19_1_Ch3 -SFX_02_2e:: ; 8126 (2:4126) +SFX_Cry1A_1:: ; 8126 (2:4126) db ( $80 | CH4 ) - dw SFX_02_2e_Ch1 + dw SFX_Cry1A_1_Ch1 db CH5 - dw SFX_02_2e_Ch2 + dw SFX_Cry1A_1_Ch2 db CH7 - dw SFX_02_2e_Ch3 + dw SFX_Cry1A_1_Ch3 -SFX_02_2f:: ; 812f (2:412f) +SFX_Cry1B_1:: ; 812f (2:412f) db ( $80 | CH4 ) - dw SFX_02_2f_Ch1 + dw SFX_Cry1B_1_Ch1 db CH5 - dw SFX_02_2f_Ch2 + dw SFX_Cry1B_1_Ch2 db CH7 - dw SFX_02_2f_Ch3 + dw SFX_Cry1B_1_Ch3 -SFX_02_30:: ; 8138 (2:4138) +SFX_Cry1C_1:: ; 8138 (2:4138) db ( $80 | CH4 ) - dw SFX_02_30_Ch1 + dw SFX_Cry1C_1_Ch1 db CH5 - dw SFX_02_30_Ch2 + dw SFX_Cry1C_1_Ch2 db CH7 - dw SFX_02_30_Ch3 + dw SFX_Cry1C_1_Ch3 -SFX_02_31:: ; 8141 (2:4141) +SFX_Cry1D_1:: ; 8141 (2:4141) db ( $80 | CH4 ) - dw SFX_02_31_Ch1 + dw SFX_Cry1D_1_Ch1 db CH5 - dw SFX_02_31_Ch2 + dw SFX_Cry1D_1_Ch2 db CH7 - dw SFX_02_31_Ch3 + dw SFX_Cry1D_1_Ch3 -SFX_02_32:: ; 814a (2:414a) +SFX_Cry1E_1:: ; 814a (2:414a) db ( $80 | CH4 ) - dw SFX_02_32_Ch1 + dw SFX_Cry1E_1_Ch1 db CH5 - dw SFX_02_32_Ch2 + dw SFX_Cry1E_1_Ch2 db CH7 - dw SFX_02_32_Ch3 + dw SFX_Cry1E_1_Ch3 -SFX_02_33:: ; 8153 (2:4153) +SFX_Cry1F_1:: ; 8153 (2:4153) db ( $80 | CH4 ) - dw SFX_02_33_Ch1 + dw SFX_Cry1F_1_Ch1 db CH5 - dw SFX_02_33_Ch2 + dw SFX_Cry1F_1_Ch2 db CH7 - dw SFX_02_33_Ch3 + dw SFX_Cry1F_1_Ch3 -SFX_02_34:: ; 815c (2:415c) +SFX_Cry20_1:: ; 815c (2:415c) db ( $80 | CH4 ) - dw SFX_02_34_Ch1 + dw SFX_Cry20_1_Ch1 db CH5 - dw SFX_02_34_Ch2 + dw SFX_Cry20_1_Ch2 db CH7 - dw SFX_02_34_Ch3 + dw SFX_Cry20_1_Ch3 -SFX_02_35:: ; 8165 (2:4165) +SFX_Cry21_1:: ; 8165 (2:4165) db ( $80 | CH4 ) - dw SFX_02_35_Ch1 + dw SFX_Cry21_1_Ch1 db CH5 - dw SFX_02_35_Ch2 + dw SFX_Cry21_1_Ch2 db CH7 - dw SFX_02_35_Ch3 + dw SFX_Cry21_1_Ch3 -SFX_02_36:: ; 816e (2:416e) +SFX_Cry22_1:: ; 816e (2:416e) db ( $80 | CH4 ) - dw SFX_02_36_Ch1 + dw SFX_Cry22_1_Ch1 db CH5 - dw SFX_02_36_Ch2 + dw SFX_Cry22_1_Ch2 db CH7 - dw SFX_02_36_Ch3 + dw SFX_Cry22_1_Ch3 -SFX_02_37:: ; 8177 (2:4177) +SFX_Cry23_1:: ; 8177 (2:4177) db ( $80 | CH4 ) - dw SFX_02_37_Ch1 + dw SFX_Cry23_1_Ch1 db CH5 - dw SFX_02_37_Ch2 + dw SFX_Cry23_1_Ch2 db CH7 - dw SFX_02_37_Ch3 + dw SFX_Cry23_1_Ch3 -SFX_02_38:: ; 8180 (2:4180) +SFX_Cry24_1:: ; 8180 (2:4180) db ( $80 | CH4 ) - dw SFX_02_38_Ch1 + dw SFX_Cry24_1_Ch1 db CH5 - dw SFX_02_38_Ch2 + dw SFX_Cry24_1_Ch2 db CH7 - dw SFX_02_38_Ch3 + dw SFX_Cry24_1_Ch3 -SFX_02_39:: ; 8189 (2:4189) +SFX_Cry25_1:: ; 8189 (2:4189) db ( $80 | CH4 ) - dw SFX_02_39_Ch1 + dw SFX_Cry25_1_Ch1 db CH5 - dw SFX_02_39_Ch2 + dw SFX_Cry25_1_Ch2 db CH7 - dw SFX_02_39_Ch3 + dw SFX_Cry25_1_Ch3 -SFX_02_3a:: ; 8192 (2:4192) +SFX_Get_Item1_1:: ; 8192 (2:4192) db ( $80 | CH4 ) - dw SFX_02_3a_Ch1 + dw SFX_Get_Item1_1_Ch1 db CH5 - dw SFX_02_3a_Ch2 + dw SFX_Get_Item1_1_Ch2 db CH6 - dw SFX_02_3a_Ch3 + dw SFX_Get_Item1_1_Ch3 -SFX_02_3b:: ; 819b (2:419b) +SFX_Get_Item2_1:: ; 819b (2:419b) db ( $80 | CH4 ) - dw SFX_02_3b_Ch1 + dw SFX_Get_Item2_1_Ch1 db CH5 - dw SFX_02_3b_Ch2 + dw SFX_Get_Item2_1_Ch2 db CH6 - dw SFX_02_3b_Ch3 + dw SFX_Get_Item2_1_Ch3 -SFX_02_3c:: ; 81a4 (2:41a4) +SFX_Tink_1:: ; 81a4 (2:41a4) db CH4 - dw SFX_02_3c_Ch1 + dw SFX_Tink_1_Ch1 -SFX_02_3d:: ; 81a7 (2:41a7) +SFX_Heal_HP_1:: ; 81a7 (2:41a7) db CH4 - dw SFX_02_3d_Ch1 + dw SFX_Heal_HP_1_Ch1 -SFX_02_3e:: ; 81aa (2:41aa) +SFX_Heal_Ailment_1:: ; 81aa (2:41aa) db CH4 - dw SFX_02_3e_Ch1 + dw SFX_Heal_Ailment_1_Ch1 -SFX_02_3f:: ; 81ad (2:41ad) +SFX_Start_Menu_1:: ; 81ad (2:41ad) db CH7 - dw SFX_02_3f_Ch1 + dw SFX_Start_Menu_1_Ch1 -SFX_02_40:: ; 81b0 (2:41b0) +SFX_Press_AB_1:: ; 81b0 (2:41b0) db CH4 - dw SFX_02_40_Ch1 + dw SFX_Press_AB_1_Ch1 -SFX_02_41:: ; 81b3 (2:41b3) +SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) db ( $80 | CH4 ) - dw SFX_02_41_Ch1 + dw SFX_Pokedex_Rating_1_Ch1 db CH5 - dw SFX_02_41_Ch2 + dw SFX_Pokedex_Rating_1_Ch2 db CH6 - dw SFX_02_41_Ch3 + dw SFX_Pokedex_Rating_1_Ch3 -SFX_02_42:: ; 81bc (2:41bc) +SFX_Get_Key_Item_1:: ; 81bc (2:41bc) db ( $80 | CH4 ) - dw SFX_02_42_Ch1 + dw SFX_Get_Key_Item_1_Ch1 db CH5 - dw SFX_02_42_Ch2 + dw SFX_Get_Key_Item_1_Ch2 db CH6 - dw SFX_02_42_Ch3 + dw SFX_Get_Key_Item_1_Ch3 -SFX_02_43:: ; 81c5 (2:41c5) +SFX_Poisoned_1:: ; 81c5 (2:41c5) db CH4 - dw SFX_02_43_Ch1 + dw SFX_Poisoned_1_Ch1 -SFX_02_44:: ; 81c8 (2:41c8) +SFX_Trade_Machine_1:: ; 81c8 (2:41c8) db CH4 - dw SFX_02_44_Ch1 + dw SFX_Trade_Machine_1_Ch1 -SFX_02_45:: ; 81cb (2:41cb) +SFX_Turn_On_PC_1:: ; 81cb (2:41cb) db CH4 - dw SFX_02_45_Ch1 + dw SFX_Turn_On_PC_1_Ch1 -SFX_02_46:: ; 81ce (2:41ce) +SFX_Turn_Off_PC_1:: ; 81ce (2:41ce) db CH4 - dw SFX_02_46_Ch1 + dw SFX_Turn_Off_PC_1_Ch1 -SFX_02_47:: ; 81d1 (2:41d1) +SFX_Enter_PC_1:: ; 81d1 (2:41d1) db CH4 - dw SFX_02_47_Ch1 + dw SFX_Enter_PC_1_Ch1 -SFX_02_48:: ; 81d4 (2:41d4) +SFX_Shrink_1:: ; 81d4 (2:41d4) db CH4 - dw SFX_02_48_Ch1 + dw SFX_Shrink_1_Ch1 -SFX_02_49:: ; 81d7 (2:41d7) +SFX_Switch_1:: ; 81d7 (2:41d7) db CH4 - dw SFX_02_49_Ch1 + dw SFX_Switch_1_Ch1 -SFX_02_4a:: ; 81da (2:41da) +SFX_Healing_Machine_1:: ; 81da (2:41da) db CH4 - dw SFX_02_4a_Ch1 + dw SFX_Healing_Machine_1_Ch1 -SFX_02_4b:: ; 81dd (2:41dd) +SFX_Teleport_Exit1_1:: ; 81dd (2:41dd) db CH4 - dw SFX_02_4b_Ch1 + dw SFX_Teleport_Exit1_1_Ch1 -SFX_02_4c:: ; 81e0 (2:41e0) +SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0) db CH4 - dw SFX_02_4c_Ch1 + dw SFX_Teleport_Enter1_1_Ch1 -SFX_02_4d:: ; 81e3 (2:41e3) +SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3) db CH4 - dw SFX_02_4d_Ch1 + dw SFX_Teleport_Exit2_1_Ch1 -SFX_02_4e:: ; 81e6 (2:41e6) +SFX_Ledge_1:: ; 81e6 (2:41e6) db CH4 - dw SFX_02_4e_Ch1 + dw SFX_Ledge_1_Ch1 -SFX_02_4f:: ; 81e9 (2:41e9) +SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9) db CH7 - dw SFX_02_4f_Ch1 + dw SFX_Teleport_Enter2_1_Ch1 -SFX_02_50:: ; 81ec (2:41ec) +SFX_Fly_1:: ; 81ec (2:41ec) db CH7 - dw SFX_02_50_Ch1 + dw SFX_Fly_1_Ch1 -SFX_02_51:: ; 81ef (2:41ef) +SFX_Denied_1:: ; 81ef (2:41ef) db ( $40 | CH4 ) - dw SFX_02_51_Ch1 + dw SFX_Denied_1_Ch1 db CH5 - dw SFX_02_51_Ch2 + dw SFX_Denied_1_Ch2 -SFX_02_52:: ; 81f5 (2:41f5) +SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5) db CH4 - dw SFX_02_52_Ch1 + dw SFX_Arrow_Tiles_1_Ch1 -SFX_02_53:: ; 81f8 (2:41f8) +SFX_Push_Boulder_1:: ; 81f8 (2:41f8) db CH7 - dw SFX_02_53_Ch1 + dw SFX_Push_Boulder_1_Ch1 -SFX_02_54:: ; 81fb (2:41fb) +SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb) db ( $40 | CH4 ) - dw SFX_02_54_Ch1 + dw SFX_SS_Anne_Horn_1_Ch1 db CH5 - dw SFX_02_54_Ch2 + dw SFX_SS_Anne_Horn_1_Ch2 -SFX_02_55:: ; 8201 (2:4201) +SFX_Withdraw_Deposit_1:: ; 8201 (2:4201) db CH4 - dw SFX_02_55_Ch1 + dw SFX_Withdraw_Deposit_1_Ch1 -SFX_02_56:: ; 8204 (2:4204) +SFX_Cut_1:: ; 8204 (2:4204) db CH7 - dw SFX_02_56_Ch1 + dw SFX_Cut_1_Ch1 -SFX_02_57:: ; 8207 (2:4207) +SFX_Go_Inside_1:: ; 8207 (2:4207) db CH7 - dw SFX_02_57_Ch1 + dw SFX_Go_Inside_1_Ch1 -SFX_02_58:: ; 820a (2:420a) +SFX_Swap_1:: ; 820a (2:420a) db ( $40 | CH4 ) - dw SFX_02_58_Ch1 + dw SFX_Swap_1_Ch1 db CH5 - dw SFX_02_58_Ch2 + dw SFX_Swap_1_Ch2 -SFX_02_59:: ; 8210 (2:4210) +SFX_59_1:: ; 8210 (2:4210) db ( $40 | CH4 ) - dw SFX_02_59_Ch1 + dw SFX_59_1_Ch1 db CH5 - dw SFX_02_59_Ch2 + dw SFX_59_1_Ch2 -SFX_02_5a:: ; 8216 (2:4216) +SFX_Purchase_1:: ; 8216 (2:4216) db ( $40 | CH4 ) - dw SFX_02_5a_Ch1 + dw SFX_Purchase_1_Ch1 db CH5 - dw SFX_02_5a_Ch2 + dw SFX_Purchase_1_Ch2 -SFX_02_5b:: ; 821c (2:421c) +SFX_Collision_1:: ; 821c (2:421c) db CH4 - dw SFX_02_5b_Ch1 + dw SFX_Collision_1_Ch1 -SFX_02_5c:: ; 821f (2:421f) +SFX_Go_Outside_1:: ; 821f (2:421f) db CH7 - dw SFX_02_5c_Ch1 + dw SFX_Go_Outside_1_Ch1 -SFX_02_5d:: ; 8222 (2:4222) +SFX_Save_1:: ; 8222 (2:4222) db ( $40 | CH4 ) - dw SFX_02_5d_Ch1 + dw SFX_Save_1_Ch1 db CH5 - dw SFX_02_5d_Ch2 + dw SFX_Save_1_Ch2 -SFX_02_5e:: ; 8228 (2:4228) +SFX_Pokeflute:: ; 8228 (2:4228) db CH2 - dw SFX_02_5e_Ch1 + dw SFX_Pokeflute_Ch1 -SFX_02_5f:: ; 822b (2:422b) +SFX_Safari_Zone_PA:: ; 822b (2:422b) db CH4 - dw SFX_02_5f_Ch1 + dw SFX_Safari_Zone_PA_Ch1 diff --git a/audio/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm old mode 100755 new mode 100644 index 311c2877..46491e67 --- a/audio/headers/sfxheaders08.asm +++ b/audio/headers/sfxheaders08.asm @@ -1,706 +1,706 @@ SFX_Headers_08:: db $ff, $ff, $ff ; padding -SFX_08_01:: ; 20003 (8:4003) +SFX_Snare1_2:: ; 20003 (8:4003) db CH7 - dw SFX_08_01_Ch1 + dw SFX_Snare1_2_Ch1 -SFX_08_02:: ; 20006 (8:4006) +SFX_Snare2_2:: ; 20006 (8:4006) db CH7 - dw SFX_08_02_Ch1 + dw SFX_Snare2_2_Ch1 -SFX_08_03:: ; 20009 (8:4009) +SFX_Snare3_2:: ; 20009 (8:4009) db CH7 - dw SFX_08_03_Ch1 + dw SFX_Snare3_2_Ch1 -SFX_08_04:: ; 2000c (8:400c) +SFX_Snare4_2:: ; 2000c (8:400c) db CH7 - dw SFX_08_04_Ch1 + dw SFX_Snare4_2_Ch1 -SFX_08_05:: ; 2000f (8:400f) +SFX_Snare5_2:: ; 2000f (8:400f) db CH7 - dw SFX_08_05_Ch1 + dw SFX_Snare5_2_Ch1 -SFX_08_06:: ; 20012 (8:4012) +SFX_Triangle1_2:: ; 20012 (8:4012) db CH7 - dw SFX_08_06_Ch1 + dw SFX_Triangle1_2_Ch1 -SFX_08_07:: ; 20015 (8:4015) +SFX_Triangle2_2:: ; 20015 (8:4015) db CH7 - dw SFX_08_07_Ch1 + dw SFX_Triangle2_2_Ch1 -SFX_08_08:: ; 20018 (8:4018) +SFX_Snare6_2:: ; 20018 (8:4018) db CH7 - dw SFX_08_08_Ch1 + dw SFX_Snare6_2_Ch1 -SFX_08_09:: ; 2001b (8:401b) +SFX_Snare7_2:: ; 2001b (8:401b) db CH7 - dw SFX_08_09_Ch1 + dw SFX_Snare7_2_Ch1 -SFX_08_0a:: ; 2001e (8:401e) +SFX_Snare8_2:: ; 2001e (8:401e) db CH7 - dw SFX_08_0a_Ch1 + dw SFX_Snare8_2_Ch1 -SFX_08_0b:: ; 20021 (8:4021) +SFX_Snare9_2:: ; 20021 (8:4021) db CH7 - dw SFX_08_0b_Ch1 + dw SFX_Snare9_2_Ch1 -SFX_08_0c:: ; 20024 (8:4024) +SFX_Cymbal1_2:: ; 20024 (8:4024) db CH7 - dw SFX_08_0c_Ch1 + dw SFX_Cymbal1_2_Ch1 -SFX_08_0d:: ; 20027 (8:4027) +SFX_Cymbal2_2:: ; 20027 (8:4027) db CH7 - dw SFX_08_0d_Ch1 + dw SFX_Cymbal2_2_Ch1 -SFX_08_0e:: ; 2002a (8:402a) +SFX_Cymbal3_2:: ; 2002a (8:402a) db CH7 - dw SFX_08_0e_Ch1 + dw SFX_Cymbal3_2_Ch1 -SFX_08_0f:: ; 2002d (8:402d) +SFX_Muted_Snare1_2:: ; 2002d (8:402d) db CH7 - dw SFX_08_0f_Ch1 + dw SFX_Muted_Snare1_2_Ch1 -SFX_08_10:: ; 20030 (8:4030) +SFX_Triangle3_2:: ; 20030 (8:4030) db CH7 - dw SFX_08_10_Ch1 + dw SFX_Triangle3_2_Ch1 -SFX_08_11:: ; 20033 (8:4033) +SFX_Muted_Snare2_2:: ; 20033 (8:4033) db CH7 - dw SFX_08_11_Ch1 + dw SFX_Muted_Snare2_2_Ch1 -SFX_08_12:: ; 20036 (8:4036) +SFX_Muted_Snare3_2:: ; 20036 (8:4036) db CH7 - dw SFX_08_12_Ch1 + dw SFX_Muted_Snare3_2_Ch1 -SFX_08_13:: ; 20039 (8:4039) +SFX_Muted_Snare4_2:: ; 20039 (8:4039) db CH7 - dw SFX_08_13_Ch1 + dw SFX_Muted_Snare4_2_Ch1 -SFX_08_14:: ; 2003c (8:403c) +SFX_Cry00_2:: ; 2003c (8:403c) db ( $80 | CH4 ) - dw SFX_08_14_Ch1 + dw SFX_Cry00_2_Ch1 db CH5 - dw SFX_08_14_Ch2 + dw SFX_Cry00_2_Ch2 db CH7 - dw SFX_08_14_Ch3 + dw SFX_Cry00_2_Ch3 -SFX_08_15:: ; 20045 (8:4045) +SFX_Cry01_2:: ; 20045 (8:4045) db ( $80 | CH4 ) - dw SFX_08_15_Ch1 + dw SFX_Cry01_2_Ch1 db CH5 - dw SFX_08_15_Ch2 + dw SFX_Cry01_2_Ch2 db CH7 - dw SFX_08_15_Ch3 + dw SFX_Cry01_2_Ch3 -SFX_08_16:: ; 2004e (8:404e) +SFX_Cry02_2:: ; 2004e (8:404e) db ( $80 | CH4 ) - dw SFX_08_16_Ch1 + dw SFX_Cry02_2_Ch1 db CH5 - dw SFX_08_16_Ch2 + dw SFX_Cry02_2_Ch2 db CH7 - dw SFX_08_16_Ch3 + dw SFX_Cry02_2_Ch3 -SFX_08_17:: ; 20057 (8:4057) +SFX_Cry03_2:: ; 20057 (8:4057) db ( $80 | CH4 ) - dw SFX_08_17_Ch1 + dw SFX_Cry03_2_Ch1 db CH5 - dw SFX_08_17_Ch2 + dw SFX_Cry03_2_Ch2 db CH7 - dw SFX_08_17_Ch3 + dw SFX_Cry03_2_Ch3 -SFX_08_18:: ; 20060 (8:4060) +SFX_Cry04_2:: ; 20060 (8:4060) db ( $80 | CH4 ) - dw SFX_08_18_Ch1 + dw SFX_Cry04_2_Ch1 db CH5 - dw SFX_08_18_Ch2 + dw SFX_Cry04_2_Ch2 db CH7 - dw SFX_08_18_Ch3 + dw SFX_Cry04_2_Ch3 -SFX_08_19:: ; 20069 (8:4069) +SFX_Cry05_2:: ; 20069 (8:4069) db ( $80 | CH4 ) - dw SFX_08_19_Ch1 + dw SFX_Cry05_2_Ch1 db CH5 - dw SFX_08_19_Ch2 + dw SFX_Cry05_2_Ch2 db CH7 - dw SFX_08_19_Ch3 + dw SFX_Cry05_2_Ch3 -SFX_08_1a:: ; 20072 (8:4072) +SFX_Cry06_2:: ; 20072 (8:4072) db ( $80 | CH4 ) - dw SFX_08_1a_Ch1 + dw SFX_Cry06_2_Ch1 db CH5 - dw SFX_08_1a_Ch2 + dw SFX_Cry06_2_Ch2 db CH7 - dw SFX_08_1a_Ch3 + dw SFX_Cry06_2_Ch3 -SFX_08_1b:: ; 2007b (8:407b) +SFX_Cry07_2:: ; 2007b (8:407b) db ( $80 | CH4 ) - dw SFX_08_1b_Ch1 + dw SFX_Cry07_2_Ch1 db CH5 - dw SFX_08_1b_Ch2 + dw SFX_Cry07_2_Ch2 db CH7 - dw SFX_08_1b_Ch3 + dw SFX_Cry07_2_Ch3 -SFX_08_1c:: ; 20084 (8:4084) +SFX_Cry08_2:: ; 20084 (8:4084) db ( $80 | CH4 ) - dw SFX_08_1c_Ch1 + dw SFX_Cry08_2_Ch1 db CH5 - dw SFX_08_1c_Ch2 + dw SFX_Cry08_2_Ch2 db CH7 - dw SFX_08_1c_Ch3 + dw SFX_Cry08_2_Ch3 -SFX_08_1d:: ; 2008d (8:408d) +SFX_Cry09_2:: ; 2008d (8:408d) db ( $80 | CH4 ) - dw SFX_08_1d_Ch1 + dw SFX_Cry09_2_Ch1 db CH5 - dw SFX_08_1d_Ch2 + dw SFX_Cry09_2_Ch2 db CH7 - dw SFX_08_1d_Ch3 + dw SFX_Cry09_2_Ch3 -SFX_08_1e:: ; 20096 (8:4096) +SFX_Cry0A_2:: ; 20096 (8:4096) db ( $80 | CH4 ) - dw SFX_08_1e_Ch1 + dw SFX_Cry0A_2_Ch1 db CH5 - dw SFX_08_1e_Ch2 + dw SFX_Cry0A_2_Ch2 db CH7 - dw SFX_08_1e_Ch3 + dw SFX_Cry0A_2_Ch3 -SFX_08_1f:: ; 2009f (8:409f) +SFX_Cry0B_2:: ; 2009f (8:409f) db ( $80 | CH4 ) - dw SFX_08_1f_Ch1 + dw SFX_Cry0B_2_Ch1 db CH5 - dw SFX_08_1f_Ch2 + dw SFX_Cry0B_2_Ch2 db CH7 - dw SFX_08_1f_Ch3 + dw SFX_Cry0B_2_Ch3 -SFX_08_20:: ; 200a8 (8:40a8) +SFX_Cry0C_2:: ; 200a8 (8:40a8) db ( $80 | CH4 ) - dw SFX_08_20_Ch1 + dw SFX_Cry0C_2_Ch1 db CH5 - dw SFX_08_20_Ch2 + dw SFX_Cry0C_2_Ch2 db CH7 - dw SFX_08_20_Ch3 + dw SFX_Cry0C_2_Ch3 -SFX_08_21:: ; 200b1 (8:40b1) +SFX_Cry0D_2:: ; 200b1 (8:40b1) db ( $80 | CH4 ) - dw SFX_08_21_Ch1 + dw SFX_Cry0D_2_Ch1 db CH5 - dw SFX_08_21_Ch2 + dw SFX_Cry0D_2_Ch2 db CH7 - dw SFX_08_21_Ch3 + dw SFX_Cry0D_2_Ch3 -SFX_08_22:: ; 200ba (8:40ba) +SFX_Cry0E_2:: ; 200ba (8:40ba) db ( $80 | CH4 ) - dw SFX_08_22_Ch1 + dw SFX_Cry0E_2_Ch1 db CH5 - dw SFX_08_22_Ch2 + dw SFX_Cry0E_2_Ch2 db CH7 - dw SFX_08_22_Ch3 + dw SFX_Cry0E_2_Ch3 -SFX_08_23:: ; 200c3 (8:40c3) +SFX_Cry0F_2:: ; 200c3 (8:40c3) db ( $80 | CH4 ) - dw SFX_08_23_Ch1 + dw SFX_Cry0F_2_Ch1 db CH5 - dw SFX_08_23_Ch2 + dw SFX_Cry0F_2_Ch2 db CH7 - dw SFX_08_23_Ch3 + dw SFX_Cry0F_2_Ch3 -SFX_08_24:: ; 200cc (8:40cc) +SFX_Cry10_2:: ; 200cc (8:40cc) db ( $80 | CH4 ) - dw SFX_08_24_Ch1 + dw SFX_Cry10_2_Ch1 db CH5 - dw SFX_08_24_Ch2 + dw SFX_Cry10_2_Ch2 db CH7 - dw SFX_08_24_Ch3 + dw SFX_Cry10_2_Ch3 -SFX_08_25:: ; 200d5 (8:40d5) +SFX_Cry11_2:: ; 200d5 (8:40d5) db ( $80 | CH4 ) - dw SFX_08_25_Ch1 + dw SFX_Cry11_2_Ch1 db CH5 - dw SFX_08_25_Ch2 + dw SFX_Cry11_2_Ch2 db CH7 - dw SFX_08_25_Ch3 + dw SFX_Cry11_2_Ch3 -SFX_08_26:: ; 200de (8:40de) +SFX_Cry12_2:: ; 200de (8:40de) db ( $80 | CH4 ) - dw SFX_08_26_Ch1 + dw SFX_Cry12_2_Ch1 db CH5 - dw SFX_08_26_Ch2 + dw SFX_Cry12_2_Ch2 db CH7 - dw SFX_08_26_Ch3 + dw SFX_Cry12_2_Ch3 -SFX_08_27:: ; 200e7 (8:40e7) +SFX_Cry13_2:: ; 200e7 (8:40e7) db ( $80 | CH4 ) - dw SFX_08_27_Ch1 + dw SFX_Cry13_2_Ch1 db CH5 - dw SFX_08_27_Ch2 + dw SFX_Cry13_2_Ch2 db CH7 - dw SFX_08_27_Ch3 + dw SFX_Cry13_2_Ch3 -SFX_08_28:: ; 200f0 (8:40f0) +SFX_Cry14_2:: ; 200f0 (8:40f0) db ( $80 | CH4 ) - dw SFX_08_28_Ch1 + dw SFX_Cry14_2_Ch1 db CH5 - dw SFX_08_28_Ch2 + dw SFX_Cry14_2_Ch2 db CH7 - dw SFX_08_28_Ch3 + dw SFX_Cry14_2_Ch3 -SFX_08_29:: ; 200f9 (8:40f9) +SFX_Cry15_2:: ; 200f9 (8:40f9) db ( $80 | CH4 ) - dw SFX_08_29_Ch1 + dw SFX_Cry15_2_Ch1 db CH5 - dw SFX_08_29_Ch2 + dw SFX_Cry15_2_Ch2 db CH7 - dw SFX_08_29_Ch3 + dw SFX_Cry15_2_Ch3 -SFX_08_2a:: ; 20102 (8:4102) +SFX_Cry16_2:: ; 20102 (8:4102) db ( $80 | CH4 ) - dw SFX_08_2a_Ch1 + dw SFX_Cry16_2_Ch1 db CH5 - dw SFX_08_2a_Ch2 + dw SFX_Cry16_2_Ch2 db CH7 - dw SFX_08_2a_Ch3 + dw SFX_Cry16_2_Ch3 -SFX_08_2b:: ; 2010b (8:410b) +SFX_Cry17_2:: ; 2010b (8:410b) db ( $80 | CH4 ) - dw SFX_08_2b_Ch1 + dw SFX_Cry17_2_Ch1 db CH5 - dw SFX_08_2b_Ch2 + dw SFX_Cry17_2_Ch2 db CH7 - dw SFX_08_2b_Ch3 + dw SFX_Cry17_2_Ch3 -SFX_08_2c:: ; 20114 (8:4114) +SFX_Cry18_2:: ; 20114 (8:4114) db ( $80 | CH4 ) - dw SFX_08_2c_Ch1 + dw SFX_Cry18_2_Ch1 db CH5 - dw SFX_08_2c_Ch2 + dw SFX_Cry18_2_Ch2 db CH7 - dw SFX_08_2c_Ch3 + dw SFX_Cry18_2_Ch3 -SFX_08_2d:: ; 2011d (8:411d) +SFX_Cry19_2:: ; 2011d (8:411d) db ( $80 | CH4 ) - dw SFX_08_2d_Ch1 + dw SFX_Cry19_2_Ch1 db CH5 - dw SFX_08_2d_Ch2 + dw SFX_Cry19_2_Ch2 db CH7 - dw SFX_08_2d_Ch3 + dw SFX_Cry19_2_Ch3 -SFX_08_2e:: ; 20126 (8:4126) +SFX_Cry1A_2:: ; 20126 (8:4126) db ( $80 | CH4 ) - dw SFX_08_2e_Ch1 + dw SFX_Cry1A_2_Ch1 db CH5 - dw SFX_08_2e_Ch2 + dw SFX_Cry1A_2_Ch2 db CH7 - dw SFX_08_2e_Ch3 + dw SFX_Cry1A_2_Ch3 -SFX_08_2f:: ; 2012f (8:412f) +SFX_Cry1B_2:: ; 2012f (8:412f) db ( $80 | CH4 ) - dw SFX_08_2f_Ch1 + dw SFX_Cry1B_2_Ch1 db CH5 - dw SFX_08_2f_Ch2 + dw SFX_Cry1B_2_Ch2 db CH7 - dw SFX_08_2f_Ch3 + dw SFX_Cry1B_2_Ch3 -SFX_08_30:: ; 20138 (8:4138) +SFX_Cry1C_2:: ; 20138 (8:4138) db ( $80 | CH4 ) - dw SFX_08_30_Ch1 + dw SFX_Cry1C_2_Ch1 db CH5 - dw SFX_08_30_Ch2 + dw SFX_Cry1C_2_Ch2 db CH7 - dw SFX_08_30_Ch3 + dw SFX_Cry1C_2_Ch3 -SFX_08_31:: ; 20141 (8:4141) +SFX_Cry1D_2:: ; 20141 (8:4141) db ( $80 | CH4 ) - dw SFX_08_31_Ch1 + dw SFX_Cry1D_2_Ch1 db CH5 - dw SFX_08_31_Ch2 + dw SFX_Cry1D_2_Ch2 db CH7 - dw SFX_08_31_Ch3 + dw SFX_Cry1D_2_Ch3 -SFX_08_32:: ; 2014a (8:414a) +SFX_Cry1E_2:: ; 2014a (8:414a) db ( $80 | CH4 ) - dw SFX_08_32_Ch1 + dw SFX_Cry1E_2_Ch1 db CH5 - dw SFX_08_32_Ch2 + dw SFX_Cry1E_2_Ch2 db CH7 - dw SFX_08_32_Ch3 + dw SFX_Cry1E_2_Ch3 -SFX_08_33:: ; 20153 (8:4153) +SFX_Cry1F_2:: ; 20153 (8:4153) db ( $80 | CH4 ) - dw SFX_08_33_Ch1 + dw SFX_Cry1F_2_Ch1 db CH5 - dw SFX_08_33_Ch2 + dw SFX_Cry1F_2_Ch2 db CH7 - dw SFX_08_33_Ch3 + dw SFX_Cry1F_2_Ch3 -SFX_08_34:: ; 2015c (8:415c) +SFX_Cry20_2:: ; 2015c (8:415c) db ( $80 | CH4 ) - dw SFX_08_34_Ch1 + dw SFX_Cry20_2_Ch1 db CH5 - dw SFX_08_34_Ch2 + dw SFX_Cry20_2_Ch2 db CH7 - dw SFX_08_34_Ch3 + dw SFX_Cry20_2_Ch3 -SFX_08_35:: ; 20165 (8:4165) +SFX_Cry21_2:: ; 20165 (8:4165) db ( $80 | CH4 ) - dw SFX_08_35_Ch1 + dw SFX_Cry21_2_Ch1 db CH5 - dw SFX_08_35_Ch2 + dw SFX_Cry21_2_Ch2 db CH7 - dw SFX_08_35_Ch3 + dw SFX_Cry21_2_Ch3 -SFX_08_36:: ; 2016e (8:416e) +SFX_Cry22_2:: ; 2016e (8:416e) db ( $80 | CH4 ) - dw SFX_08_36_Ch1 + dw SFX_Cry22_2_Ch1 db CH5 - dw SFX_08_36_Ch2 + dw SFX_Cry22_2_Ch2 db CH7 - dw SFX_08_36_Ch3 + dw SFX_Cry22_2_Ch3 -SFX_08_37:: ; 20177 (8:4177) +SFX_Cry23_2:: ; 20177 (8:4177) db ( $80 | CH4 ) - dw SFX_08_37_Ch1 + dw SFX_Cry23_2_Ch1 db CH5 - dw SFX_08_37_Ch2 + dw SFX_Cry23_2_Ch2 db CH7 - dw SFX_08_37_Ch3 + dw SFX_Cry23_2_Ch3 -SFX_08_38:: ; 20180 (8:4180) +SFX_Cry24_2:: ; 20180 (8:4180) db ( $80 | CH4 ) - dw SFX_08_38_Ch1 + dw SFX_Cry24_2_Ch1 db CH5 - dw SFX_08_38_Ch2 + dw SFX_Cry24_2_Ch2 db CH7 - dw SFX_08_38_Ch3 + dw SFX_Cry24_2_Ch3 -SFX_08_39:: ; 20189 (8:4189) +SFX_Cry25_2:: ; 20189 (8:4189) db ( $80 | CH4 ) - dw SFX_08_39_Ch1 + dw SFX_Cry25_2_Ch1 db CH5 - dw SFX_08_39_Ch2 + dw SFX_Cry25_2_Ch2 db CH7 - dw SFX_08_39_Ch3 + dw SFX_Cry25_2_Ch3 -SFX_08_3a:: ; 20192 (8:4192) +SFX_Level_Up:: ; 20192 (8:4192) db ( $80 | CH4 ) - dw SFX_08_3a_Ch1 + dw SFX_Level_Up_Ch1 db CH5 - dw SFX_08_3a_Ch2 + dw SFX_Level_Up_Ch2 db CH6 - dw SFX_08_3a_Ch3 + dw SFX_Level_Up_Ch3 -SFX_08_3b:: ; 2019b (8:419b) +SFX_Get_Item2_2:: ; 2019b (8:419b) db ( $80 | CH4 ) - dw SFX_08_3b_Ch1 + dw SFX_Get_Item2_2_Ch1 db CH5 - dw SFX_08_3b_Ch2 + dw SFX_Get_Item2_2_Ch2 db CH6 - dw SFX_08_3b_Ch3 + dw SFX_Get_Item2_2_Ch3 -SFX_08_3c:: ; 201a4 (8:41a4) +SFX_Tink_2:: ; 201a4 (8:41a4) db CH4 - dw SFX_08_3c_Ch1 + dw SFX_Tink_2_Ch1 -SFX_08_3d:: ; 201a7 (8:41a7) +SFX_Heal_HP_2:: ; 201a7 (8:41a7) db CH4 - dw SFX_08_3d_Ch1 + dw SFX_Heal_HP_2_Ch1 -SFX_08_3e:: ; 201aa (8:41aa) +SFX_Heal_Ailment_2:: ; 201aa (8:41aa) db CH4 - dw SFX_08_3e_Ch1 + dw SFX_Heal_Ailment_2_Ch1 -SFX_08_3f:: ; 201ad (8:41ad) +SFX_Start_Menu_2:: ; 201ad (8:41ad) db CH7 - dw SFX_08_3f_Ch1 + dw SFX_Start_Menu_2_Ch1 -SFX_08_40:: ; 201b0 (8:41b0) +SFX_Press_AB_2:: ; 201b0 (8:41b0) db CH4 - dw SFX_08_40_Ch1 + dw SFX_Press_AB_2_Ch1 -SFX_08_41:: ; 201b3 (8:41b3) +SFX_Ball_Toss:: ; 201b3 (8:41b3) db ( $40 | CH4 ) - dw SFX_08_41_Ch1 + dw SFX_Ball_Toss_Ch1 db CH5 - dw SFX_08_41_Ch2 + dw SFX_Ball_Toss_Ch2 -SFX_08_42:: ; 201b9 (8:41b9) +SFX_Ball_Poof:: ; 201b9 (8:41b9) db ( $40 | CH4 ) - dw SFX_08_42_Ch1 + dw SFX_Ball_Poof_Ch1 db CH7 - dw SFX_08_42_Ch2 + dw SFX_Ball_Poof_Ch2 -SFX_08_43:: ; 201bf (8:41bf) +SFX_Faint_Thud:: ; 201bf (8:41bf) db ( $40 | CH4 ) - dw SFX_08_43_Ch1 + dw SFX_Faint_Thud_Ch1 db CH7 - dw SFX_08_43_Ch2 + dw SFX_Faint_Thud_Ch2 -SFX_08_44:: ; 201c5 (8:41c5) +SFX_Run:: ; 201c5 (8:41c5) db CH7 - dw SFX_08_44_Ch1 + dw SFX_Run_Ch1 -SFX_08_45:: ; 201c8 (8:41c8) +SFX_Dex_Page_Added:: ; 201c8 (8:41c8) db ( $40 | CH4 ) - dw SFX_08_45_Ch1 + dw SFX_Dex_Page_Added_Ch1 db CH5 - dw SFX_08_45_Ch2 + dw SFX_Dex_Page_Added_Ch2 -SFX_08_46:: ; 201ce (8:41ce) +SFX_Caught_Mon:: ; 201ce (8:41ce) db ( $80 | CH4 ) - dw SFX_08_46_Ch1 + dw SFX_Caught_Mon_Ch1 db CH5 - dw SFX_08_46_Ch2 + dw SFX_Caught_Mon_Ch2 db CH6 - dw SFX_08_46_Ch3 + dw SFX_Caught_Mon_Ch3 -SFX_08_47:: ; 201d7 (8:41d7) +SFX_Peck:: ; 201d7 (8:41d7) db CH7 - dw SFX_08_47_Ch1 + dw SFX_Peck_Ch1 -SFX_08_48:: ; 201da (8:41da) +SFX_Faint_Fall:: ; 201da (8:41da) db CH4 - dw SFX_08_48_Ch1 + dw SFX_Faint_Fall_Ch1 -SFX_08_49:: ; 201dd (8:41dd) +SFX_Battle_09:: ; 201dd (8:41dd) db CH4 - dw SFX_08_49_Ch1 + dw SFX_Battle_09_Ch1 -SFX_08_4a:: ; 201e0 (8:41e0) +SFX_Pound:: ; 201e0 (8:41e0) db CH7 - dw SFX_08_4a_Ch1 + dw SFX_Pound_Ch1 -SFX_08_4b:: ; 201e3 (8:41e3) +SFX_Battle_0B:: ; 201e3 (8:41e3) db CH7 - dw SFX_08_4b_Ch1 + dw SFX_Battle_0B_Ch1 -SFX_08_4c:: ; 201e6 (8:41e6) +SFX_Battle_0C:: ; 201e6 (8:41e6) db CH7 - dw SFX_08_4c_Ch1 + dw SFX_Battle_0C_Ch1 -SFX_08_4d:: ; 201e9 (8:41e9) +SFX_Battle_0D:: ; 201e9 (8:41e9) db CH7 - dw SFX_08_4d_Ch1 + dw SFX_Battle_0D_Ch1 -SFX_08_4e:: ; 201ec (8:41ec) +SFX_Battle_0E:: ; 201ec (8:41ec) db CH7 - dw SFX_08_4e_Ch1 + dw SFX_Battle_0E_Ch1 -SFX_08_4f:: ; 201ef (8:41ef) +SFX_Battle_0F:: ; 201ef (8:41ef) db CH7 - dw SFX_08_4f_Ch1 + dw SFX_Battle_0F_Ch1 -SFX_08_50:: ; 201f2 (8:41f2) +SFX_Damage:: ; 201f2 (8:41f2) db CH7 - dw SFX_08_50_Ch1 + dw SFX_Damage_Ch1 -SFX_08_51:: ; 201f5 (8:41f5) +SFX_Not_Very_Effective:: ; 201f5 (8:41f5) db CH7 - dw SFX_08_51_Ch1 + dw SFX_Not_Very_Effective_Ch1 -SFX_08_52:: ; 201f8 (8:41f8) +SFX_Battle_12:: ; 201f8 (8:41f8) db CH7 - dw SFX_08_52_Ch1 + dw SFX_Battle_12_Ch1 -SFX_08_53:: ; 201fb (8:41fb) +SFX_Battle_13:: ; 201fb (8:41fb) db CH7 - dw SFX_08_53_Ch1 + dw SFX_Battle_13_Ch1 -SFX_08_54:: ; 201fe (8:41fe) +SFX_Battle_14:: ; 201fe (8:41fe) db CH7 - dw SFX_08_54_Ch1 + dw SFX_Battle_14_Ch1 -SFX_08_55:: ; 20201 (8:4201) +SFX_Vine_Whip:: ; 20201 (8:4201) db CH7 - dw SFX_08_55_Ch1 + dw SFX_Vine_Whip_Ch1 -SFX_08_56:: ; 20204 (8:4204) +SFX_Battle_16:: ; 20204 (8:4204) db CH7 - dw SFX_08_56_Ch1 + dw SFX_Battle_16_Ch1 -SFX_08_57:: ; 20207 (8:4207) +SFX_Battle_17:: ; 20207 (8:4207) db CH7 - dw SFX_08_57_Ch1 + dw SFX_Battle_17_Ch1 -SFX_08_58:: ; 2020a (8:420a) +SFX_Battle_18:: ; 2020a (8:420a) db CH7 - dw SFX_08_58_Ch1 + dw SFX_Battle_18_Ch1 -SFX_08_59:: ; 2020d (8:420d) +SFX_Battle_19:: ; 2020d (8:420d) db CH7 - dw SFX_08_59_Ch1 + dw SFX_Battle_19_Ch1 -SFX_08_5a:: ; 20210 (8:4210) +SFX_Super_Effective:: ; 20210 (8:4210) db CH7 - dw SFX_08_5a_Ch1 + dw SFX_Super_Effective_Ch1 -SFX_08_5b:: ; 20213 (8:4213) +SFX_Battle_1B:: ; 20213 (8:4213) db CH7 - dw SFX_08_5b_Ch1 + dw SFX_Battle_1B_Ch1 -SFX_08_5c:: ; 20216 (8:4216) +SFX_Battle_1C:: ; 20216 (8:4216) db CH7 - dw SFX_08_5c_Ch1 + dw SFX_Battle_1C_Ch1 -SFX_08_5d:: ; 20219 (8:4219) +SFX_Doubleslap:: ; 20219 (8:4219) db CH7 - dw SFX_08_5d_Ch1 + dw SFX_Doubleslap_Ch1 -SFX_08_5e:: ; 2021c (8:421c) +SFX_Battle_1E:: ; 2021c (8:421c) db ( $40 | CH4 ) - dw SFX_08_5e_Ch1 + dw SFX_Battle_1E_Ch1 db CH7 - dw SFX_08_5e_Ch2 + dw SFX_Battle_1E_Ch2 -SFX_08_5f:: ; 20222 (8:4222) +SFX_Horn_Drill:: ; 20222 (8:4222) db CH7 - dw SFX_08_5f_Ch1 + dw SFX_Horn_Drill_Ch1 -SFX_08_60:: ; 20225 (8:4225) +SFX_Battle_20:: ; 20225 (8:4225) db CH7 - dw SFX_08_60_Ch1 + dw SFX_Battle_20_Ch1 -SFX_08_61:: ; 20228 (8:4228) +SFX_Battle_21:: ; 20228 (8:4228) db CH7 - dw SFX_08_61_Ch1 + dw SFX_Battle_21_Ch1 -SFX_08_62:: ; 2022b (8:422b) +SFX_Battle_22:: ; 2022b (8:422b) db CH7 - dw SFX_08_62_Ch1 + dw SFX_Battle_22_Ch1 -SFX_08_63:: ; 2022e (8:422e) +SFX_Battle_23:: ; 2022e (8:422e) db CH7 - dw SFX_08_63_Ch1 + dw SFX_Battle_23_Ch1 -SFX_08_64:: ; 20231 (8:4231) +SFX_Battle_24:: ; 20231 (8:4231) db ( $40 | CH4 ) - dw SFX_08_64_Ch1 + dw SFX_Battle_24_Ch1 db CH7 - dw SFX_08_64_Ch2 + dw SFX_Battle_24_Ch2 -SFX_08_65:: ; 20237 (8:4237) +SFX_Battle_25:: ; 20237 (8:4237) db CH7 - dw SFX_08_65_Ch1 + dw SFX_Battle_25_Ch1 -SFX_08_66:: ; 2023a (8:423a) +SFX_Battle_26:: ; 2023a (8:423a) db CH7 - dw SFX_08_66_Ch1 + dw SFX_Battle_26_Ch1 -SFX_08_67:: ; 2023d (8:423d) +SFX_Battle_27:: ; 2023d (8:423d) db ( $80 | CH4 ) - dw SFX_08_67_Ch1 + dw SFX_Battle_27_Ch1 db CH5 - dw SFX_08_67_Ch2 + dw SFX_Battle_27_Ch2 db CH7 - dw SFX_08_67_Ch3 + dw SFX_Battle_27_Ch3 -SFX_08_68:: ; 20246 (8:4246) +SFX_Battle_28:: ; 20246 (8:4246) db ( $80 | CH4 ) - dw SFX_08_68_Ch1 + dw SFX_Battle_28_Ch1 db CH5 - dw SFX_08_68_Ch2 + dw SFX_Battle_28_Ch2 db CH7 - dw SFX_08_68_Ch3 + dw SFX_Battle_28_Ch3 -SFX_08_69:: ; 2024f (8:424f) +SFX_Battle_29:: ; 2024f (8:424f) db ( $40 | CH4 ) - dw SFX_08_69_Ch1 + dw SFX_Battle_29_Ch1 db CH7 - dw SFX_08_69_Ch2 + dw SFX_Battle_29_Ch2 -SFX_08_6a:: ; 20255 (8:4255) +SFX_Battle_2A:: ; 20255 (8:4255) db ( $80 | CH4 ) - dw SFX_08_6a_Ch1 + dw SFX_Battle_2A_Ch1 db CH5 - dw SFX_08_6a_Ch2 + dw SFX_Battle_2A_Ch2 db CH7 - dw SFX_08_6a_Ch3 + dw SFX_Battle_2A_Ch3 -SFX_08_6b:: ; 2025e (8:425e) +SFX_Battle_2B:: ; 2025e (8:425e) db ( $40 | CH4 ) - dw SFX_08_6b_Ch1 + dw SFX_Battle_2B_Ch1 db CH7 - dw SFX_08_6b_Ch2 + dw SFX_Battle_2B_Ch2 -SFX_08_6c:: ; 20264 (8:4264) +SFX_Battle_2C:: ; 20264 (8:4264) db ( $80 | CH4 ) - dw SFX_08_6c_Ch1 + dw SFX_Battle_2C_Ch1 db CH5 - dw SFX_08_6c_Ch2 + dw SFX_Battle_2C_Ch2 db CH7 - dw SFX_08_6c_Ch3 + dw SFX_Battle_2C_Ch3 -SFX_08_6d:: ; 2026d (8:426d) +SFX_Psybeam:: ; 2026d (8:426d) db ( $80 | CH4 ) - dw SFX_08_6d_Ch1 + dw SFX_Psybeam_Ch1 db CH5 - dw SFX_08_6d_Ch2 + dw SFX_Psybeam_Ch2 db CH7 - dw SFX_08_6d_Ch3 + dw SFX_Psybeam_Ch3 -SFX_08_6e:: ; 20276 (8:4276) +SFX_Battle_2E:: ; 20276 (8:4276) db ( $80 | CH4 ) - dw SFX_08_6e_Ch1 + dw SFX_Battle_2E_Ch1 db CH5 - dw SFX_08_6e_Ch2 + dw SFX_Battle_2E_Ch2 db CH7 - dw SFX_08_6e_Ch3 + dw SFX_Battle_2E_Ch3 -SFX_08_6f:: ; 2027f (8:427f) +SFX_Battle_2F:: ; 2027f (8:427f) db ( $80 | CH4 ) - dw SFX_08_6f_Ch1 + dw SFX_Battle_2F_Ch1 db CH5 - dw SFX_08_6f_Ch2 + dw SFX_Battle_2F_Ch2 db CH7 - dw SFX_08_6f_Ch3 + dw SFX_Battle_2F_Ch3 -SFX_08_70:: ; 20288 (8:4288) +SFX_Psychic_M:: ; 20288 (8:4288) db ( $80 | CH4 ) - dw SFX_08_70_Ch1 + dw SFX_Psychic_M_Ch1 db CH5 - dw SFX_08_70_Ch2 + dw SFX_Psychic_M_Ch2 db CH7 - dw SFX_08_70_Ch3 + dw SFX_Psychic_M_Ch3 -SFX_08_71:: ; 20291 (8:4291) +SFX_Battle_31:: ; 20291 (8:4291) db ( $40 | CH4 ) - dw SFX_08_71_Ch1 + dw SFX_Battle_31_Ch1 db CH5 - dw SFX_08_71_Ch2 + dw SFX_Battle_31_Ch2 -SFX_08_72:: ; 20297 (8:4297) +SFX_Battle_32:: ; 20297 (8:4297) db ( $40 | CH4 ) - dw SFX_08_72_Ch1 + dw SFX_Battle_32_Ch1 db CH5 - dw SFX_08_72_Ch2 + dw SFX_Battle_32_Ch2 -SFX_08_73:: ; 2029d (8:429d) +SFX_Battle_33:: ; 2029d (8:429d) db ( $40 | CH4 ) - dw SFX_08_73_Ch1 + dw SFX_Battle_33_Ch1 db CH5 - dw SFX_08_73_Ch2 + dw SFX_Battle_33_Ch2 -SFX_08_74:: ; 202a3 (8:42a3) +SFX_Battle_34:: ; 202a3 (8:42a3) db ( $80 | CH4 ) - dw SFX_08_74_Ch1 + dw SFX_Battle_34_Ch1 db CH5 - dw SFX_08_74_Ch2 + dw SFX_Battle_34_Ch2 db CH7 - dw SFX_08_74_Ch3 + dw SFX_Battle_34_Ch3 -SFX_08_75:: ; 202ac (8:42ac) +SFX_Battle_35:: ; 202ac (8:42ac) db ( $40 | CH4 ) - dw SFX_08_75_Ch1 + dw SFX_Battle_35_Ch1 db CH5 - dw SFX_08_75_Ch2 + dw SFX_Battle_35_Ch2 -SFX_08_76:: ; 202b2 (8:42b2) +SFX_Battle_36:: ; 202b2 (8:42b2) db ( $80 | CH4 ) - dw SFX_08_76_Ch1 + dw SFX_Battle_36_Ch1 db CH5 - dw SFX_08_76_Ch2 + dw SFX_Battle_36_Ch2 db CH7 - dw SFX_08_76_Ch3 + dw SFX_Battle_36_Ch3 -SFX_08_77:: ; 202bb (8:42bb) +SFX_Silph_Scope:: ; 202bb (8:42bb) db CH4 - dw SFX_08_77_Ch1 + dw SFX_Silph_Scope_Ch1 diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm old mode 100755 new mode 100644 index 52766a76..7af4755f --- a/audio/headers/sfxheaders1f.asm +++ b/audio/headers/sfxheaders1f.asm @@ -1,596 +1,596 @@ SFX_Headers_1f:: db $ff, $ff, $ff ; padding -SFX_1f_01:: ; 7c003 (1f:4003) +SFX_Snare1_3:: ; 7c003 (1f:4003) db CH7 - dw SFX_1f_01_Ch1 + dw SFX_Snare1_3_Ch1 -SFX_1f_02:: ; 7c006 (1f:4006) +SFX_Snare2_3:: ; 7c006 (1f:4006) db CH7 - dw SFX_1f_02_Ch1 + dw SFX_Snare2_3_Ch1 -SFX_1f_03:: ; 7c009 (1f:4009) +SFX_Snare3_3:: ; 7c009 (1f:4009) db CH7 - dw SFX_1f_03_Ch1 + dw SFX_Snare3_3_Ch1 -SFX_1f_04:: ; 7c00c (1f:400c) +SFX_Snare4_3:: ; 7c00c (1f:400c) db CH7 - dw SFX_1f_04_Ch1 + dw SFX_Snare4_3_Ch1 -SFX_1f_05:: ; 7c00f (1f:400f) +SFX_Snare5_3:: ; 7c00f (1f:400f) db CH7 - dw SFX_1f_05_Ch1 + dw SFX_Snare5_3_Ch1 -SFX_1f_06:: ; 7c012 (1f:4012) +SFX_Triangle1_3:: ; 7c012 (1f:4012) db CH7 - dw SFX_1f_06_Ch1 + dw SFX_Triangle1_3_Ch1 -SFX_1f_07:: ; 7c015 (1f:4015) +SFX_Triangle2_3:: ; 7c015 (1f:4015) db CH7 - dw SFX_1f_07_Ch1 + dw SFX_Triangle2_3_Ch1 -SFX_1f_08:: ; 7c018 (1f:4018) +SFX_Snare6_3:: ; 7c018 (1f:4018) db CH7 - dw SFX_1f_08_Ch1 + dw SFX_Snare6_3_Ch1 -SFX_1f_09:: ; 7c01b (1f:401b) +SFX_Snare7_3:: ; 7c01b (1f:401b) db CH7 - dw SFX_1f_09_Ch1 + dw SFX_Snare7_3_Ch1 -SFX_1f_0a:: ; 7c01e (1f:401e) +SFX_Snare8_3:: ; 7c01e (1f:401e) db CH7 - dw SFX_1f_0a_Ch1 + dw SFX_Snare8_3_Ch1 -SFX_1f_0b:: ; 7c021 (1f:4021) +SFX_Snare9_3:: ; 7c021 (1f:4021) db CH7 - dw SFX_1f_0b_Ch1 + dw SFX_Snare9_3_Ch1 -SFX_1f_0c:: ; 7c024 (1f:4024) +SFX_Cymbal1_3:: ; 7c024 (1f:4024) db CH7 - dw SFX_1f_0c_Ch1 + dw SFX_Cymbal1_3_Ch1 -SFX_1f_0d:: ; 7c027 (1f:4027) +SFX_Cymbal2_3:: ; 7c027 (1f:4027) db CH7 - dw SFX_1f_0d_Ch1 + dw SFX_Cymbal2_3_Ch1 -SFX_1f_0e:: ; 7c02a (1f:402a) +SFX_Cymbal3_3:: ; 7c02a (1f:402a) db CH7 - dw SFX_1f_0e_Ch1 + dw SFX_Cymbal3_3_Ch1 -SFX_1f_0f:: ; 7c02d (1f:402d) +SFX_Muted_Snare1_3:: ; 7c02d (1f:402d) db CH7 - dw SFX_1f_0f_Ch1 + dw SFX_Muted_Snare1_3_Ch1 -SFX_1f_10:: ; 7c030 (1f:4030) +SFX_Triangle3_3:: ; 7c030 (1f:4030) db CH7 - dw SFX_1f_10_Ch1 + dw SFX_Triangle3_3_Ch1 -SFX_1f_11:: ; 7c033 (1f:4033) +SFX_Muted_Snare2_3:: ; 7c033 (1f:4033) db CH7 - dw SFX_1f_11_Ch1 + dw SFX_Muted_Snare2_3_Ch1 -SFX_1f_12:: ; 7c036 (1f:4036) +SFX_Muted_Snare3_3:: ; 7c036 (1f:4036) db CH7 - dw SFX_1f_12_Ch1 + dw SFX_Muted_Snare3_3_Ch1 -SFX_1f_13:: ; 7c039 (1f:4039) +SFX_Muted_Snare4_3:: ; 7c039 (1f:4039) db CH7 - dw SFX_1f_13_Ch1 + dw SFX_Muted_Snare4_3_Ch1 -SFX_1f_14:: ; 7c03c (1f:403c) +SFX_Cry00_3:: ; 7c03c (1f:403c) db ( $80 | CH4 ) - dw SFX_1f_14_Ch1 + dw SFX_Cry00_3_Ch1 db CH5 - dw SFX_1f_14_Ch2 + dw SFX_Cry00_3_Ch2 db CH7 - dw SFX_1f_14_Ch3 + dw SFX_Cry00_3_Ch3 -SFX_1f_15:: ; 7c045 (1f:4045) +SFX_Cry01_3:: ; 7c045 (1f:4045) db ( $80 | CH4 ) - dw SFX_1f_15_Ch1 + dw SFX_Cry01_3_Ch1 db CH5 - dw SFX_1f_15_Ch2 + dw SFX_Cry01_3_Ch2 db CH7 - dw SFX_1f_15_Ch3 + dw SFX_Cry01_3_Ch3 -SFX_1f_16:: ; 7c04e (1f:404e) +SFX_Cry02_3:: ; 7c04e (1f:404e) db ( $80 | CH4 ) - dw SFX_1f_16_Ch1 + dw SFX_Cry02_3_Ch1 db CH5 - dw SFX_1f_16_Ch2 + dw SFX_Cry02_3_Ch2 db CH7 - dw SFX_1f_16_Ch3 + dw SFX_Cry02_3_Ch3 -SFX_1f_17:: ; 7c057 (1f:4057) +SFX_Cry03_3:: ; 7c057 (1f:4057) db ( $80 | CH4 ) - dw SFX_1f_17_Ch1 + dw SFX_Cry03_3_Ch1 db CH5 - dw SFX_1f_17_Ch2 + dw SFX_Cry03_3_Ch2 db CH7 - dw SFX_1f_17_Ch3 + dw SFX_Cry03_3_Ch3 -SFX_1f_18:: ; 7c060 (1f:4060) +SFX_Cry04_3:: ; 7c060 (1f:4060) db ( $80 | CH4 ) - dw SFX_1f_18_Ch1 + dw SFX_Cry04_3_Ch1 db CH5 - dw SFX_1f_18_Ch2 + dw SFX_Cry04_3_Ch2 db CH7 - dw SFX_1f_18_Ch3 + dw SFX_Cry04_3_Ch3 -SFX_1f_19:: ; 7c069 (1f:4069) +SFX_Cry05_3:: ; 7c069 (1f:4069) db ( $80 | CH4 ) - dw SFX_1f_19_Ch1 + dw SFX_Cry05_3_Ch1 db CH5 - dw SFX_1f_19_Ch2 + dw SFX_Cry05_3_Ch2 db CH7 - dw SFX_1f_19_Ch3 + dw SFX_Cry05_3_Ch3 -SFX_1f_1a:: ; 7c072 (1f:4072) +SFX_Cry06_3:: ; 7c072 (1f:4072) db ( $80 | CH4 ) - dw SFX_1f_1a_Ch1 + dw SFX_Cry06_3_Ch1 db CH5 - dw SFX_1f_1a_Ch2 + dw SFX_Cry06_3_Ch2 db CH7 - dw SFX_1f_1a_Ch3 + dw SFX_Cry06_3_Ch3 -SFX_1f_1b:: ; 7c07b (1f:407b) +SFX_Cry07_3:: ; 7c07b (1f:407b) db ( $80 | CH4 ) - dw SFX_1f_1b_Ch1 + dw SFX_Cry07_3_Ch1 db CH5 - dw SFX_1f_1b_Ch2 + dw SFX_Cry07_3_Ch2 db CH7 - dw SFX_1f_1b_Ch3 + dw SFX_Cry07_3_Ch3 -SFX_1f_1c:: ; 7c084 (1f:4084) +SFX_Cry08_3:: ; 7c084 (1f:4084) db ( $80 | CH4 ) - dw SFX_1f_1c_Ch1 + dw SFX_Cry08_3_Ch1 db CH5 - dw SFX_1f_1c_Ch2 + dw SFX_Cry08_3_Ch2 db CH7 - dw SFX_1f_1c_Ch3 + dw SFX_Cry08_3_Ch3 -SFX_1f_1d:: ; 7c08d (1f:408d) +SFX_Cry09_3:: ; 7c08d (1f:408d) db ( $80 | CH4 ) - dw SFX_1f_1d_Ch1 + dw SFX_Cry09_3_Ch1 db CH5 - dw SFX_1f_1d_Ch2 + dw SFX_Cry09_3_Ch2 db CH7 - dw SFX_1f_1d_Ch3 + dw SFX_Cry09_3_Ch3 -SFX_1f_1e:: ; 7c096 (1f:4096) +SFX_Cry0A_3:: ; 7c096 (1f:4096) db ( $80 | CH4 ) - dw SFX_1f_1e_Ch1 + dw SFX_Cry0A_3_Ch1 db CH5 - dw SFX_1f_1e_Ch2 + dw SFX_Cry0A_3_Ch2 db CH7 - dw SFX_1f_1e_Ch3 + dw SFX_Cry0A_3_Ch3 -SFX_1f_1f:: ; 7c09f (1f:409f) +SFX_Cry0B_3:: ; 7c09f (1f:409f) db ( $80 | CH4 ) - dw SFX_1f_1f_Ch1 + dw SFX_Cry0B_3_Ch1 db CH5 - dw SFX_1f_1f_Ch2 + dw SFX_Cry0B_3_Ch2 db CH7 - dw SFX_1f_1f_Ch3 + dw SFX_Cry0B_3_Ch3 -SFX_1f_20:: ; 7c0a8 (1f:40a8) +SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) db ( $80 | CH4 ) - dw SFX_1f_20_Ch1 + dw SFX_Cry0C_3_Ch1 db CH5 - dw SFX_1f_20_Ch2 + dw SFX_Cry0C_3_Ch2 db CH7 - dw SFX_1f_20_Ch3 + dw SFX_Cry0C_3_Ch3 -SFX_1f_21:: ; 7c0b1 (1f:40b1) +SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) db ( $80 | CH4 ) - dw SFX_1f_21_Ch1 + dw SFX_Cry0D_3_Ch1 db CH5 - dw SFX_1f_21_Ch2 + dw SFX_Cry0D_3_Ch2 db CH7 - dw SFX_1f_21_Ch3 + dw SFX_Cry0D_3_Ch3 -SFX_1f_22:: ; 7c0ba (1f:40ba) +SFX_Cry0E_3:: ; 7c0ba (1f:40ba) db ( $80 | CH4 ) - dw SFX_1f_22_Ch1 + dw SFX_Cry0E_3_Ch1 db CH5 - dw SFX_1f_22_Ch2 + dw SFX_Cry0E_3_Ch2 db CH7 - dw SFX_1f_22_Ch3 + dw SFX_Cry0E_3_Ch3 -SFX_1f_23:: ; 7c0c3 (1f:40c3) +SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) db ( $80 | CH4 ) - dw SFX_1f_23_Ch1 + dw SFX_Cry0F_3_Ch1 db CH5 - dw SFX_1f_23_Ch2 + dw SFX_Cry0F_3_Ch2 db CH7 - dw SFX_1f_23_Ch3 + dw SFX_Cry0F_3_Ch3 -SFX_1f_24:: ; 7c0cc (1f:40cc) +SFX_Cry10_3:: ; 7c0cc (1f:40cc) db ( $80 | CH4 ) - dw SFX_1f_24_Ch1 + dw SFX_Cry10_3_Ch1 db CH5 - dw SFX_1f_24_Ch2 + dw SFX_Cry10_3_Ch2 db CH7 - dw SFX_1f_24_Ch3 + dw SFX_Cry10_3_Ch3 -SFX_1f_25:: ; 7c0d5 (1f:40d5) +SFX_Cry11_3:: ; 7c0d5 (1f:40d5) db ( $80 | CH4 ) - dw SFX_1f_25_Ch1 + dw SFX_Cry11_3_Ch1 db CH5 - dw SFX_1f_25_Ch2 + dw SFX_Cry11_3_Ch2 db CH7 - dw SFX_1f_25_Ch3 + dw SFX_Cry11_3_Ch3 -SFX_1f_26:: ; 7c0de (1f:40de) +SFX_Cry12_3:: ; 7c0de (1f:40de) db ( $80 | CH4 ) - dw SFX_1f_26_Ch1 + dw SFX_Cry12_3_Ch1 db CH5 - dw SFX_1f_26_Ch2 + dw SFX_Cry12_3_Ch2 db CH7 - dw SFX_1f_26_Ch3 + dw SFX_Cry12_3_Ch3 -SFX_1f_27:: ; 7c0e7 (1f:40e7) +SFX_Cry13_3:: ; 7c0e7 (1f:40e7) db ( $80 | CH4 ) - dw SFX_1f_27_Ch1 + dw SFX_Cry13_3_Ch1 db CH5 - dw SFX_1f_27_Ch2 + dw SFX_Cry13_3_Ch2 db CH7 - dw SFX_1f_27_Ch3 + dw SFX_Cry13_3_Ch3 -SFX_1f_28:: ; 7c0f0 (1f:40f0) +SFX_Cry14_3:: ; 7c0f0 (1f:40f0) db ( $80 | CH4 ) - dw SFX_1f_28_Ch1 + dw SFX_Cry14_3_Ch1 db CH5 - dw SFX_1f_28_Ch2 + dw SFX_Cry14_3_Ch2 db CH7 - dw SFX_1f_28_Ch3 + dw SFX_Cry14_3_Ch3 -SFX_1f_29:: ; 7c0f9 (1f:40f9) +SFX_Cry15_3:: ; 7c0f9 (1f:40f9) db ( $80 | CH4 ) - dw SFX_1f_29_Ch1 + dw SFX_Cry15_3_Ch1 db CH5 - dw SFX_1f_29_Ch2 + dw SFX_Cry15_3_Ch2 db CH7 - dw SFX_1f_29_Ch3 + dw SFX_Cry15_3_Ch3 -SFX_1f_2a:: ; 7c102 (1f:4102) +SFX_Cry16_3:: ; 7c102 (1f:4102) db ( $80 | CH4 ) - dw SFX_1f_2a_Ch1 + dw SFX_Cry16_3_Ch1 db CH5 - dw SFX_1f_2a_Ch2 + dw SFX_Cry16_3_Ch2 db CH7 - dw SFX_1f_2a_Ch3 + dw SFX_Cry16_3_Ch3 -SFX_1f_2b:: ; 7c10b (1f:410b) +SFX_Cry17_3:: ; 7c10b (1f:410b) db ( $80 | CH4 ) - dw SFX_1f_2b_Ch1 + dw SFX_Cry17_3_Ch1 db CH5 - dw SFX_1f_2b_Ch2 + dw SFX_Cry17_3_Ch2 db CH7 - dw SFX_1f_2b_Ch3 + dw SFX_Cry17_3_Ch3 -SFX_1f_2c:: ; 7c114 (1f:4114) +SFX_Cry18_3:: ; 7c114 (1f:4114) db ( $80 | CH4 ) - dw SFX_1f_2c_Ch1 + dw SFX_Cry18_3_Ch1 db CH5 - dw SFX_1f_2c_Ch2 + dw SFX_Cry18_3_Ch2 db CH7 - dw SFX_1f_2c_Ch3 + dw SFX_Cry18_3_Ch3 -SFX_1f_2d:: ; 7c11d (1f:411d) +SFX_Cry19_3:: ; 7c11d (1f:411d) db ( $80 | CH4 ) - dw SFX_1f_2d_Ch1 + dw SFX_Cry19_3_Ch1 db CH5 - dw SFX_1f_2d_Ch2 + dw SFX_Cry19_3_Ch2 db CH7 - dw SFX_1f_2d_Ch3 + dw SFX_Cry19_3_Ch3 -SFX_1f_2e:: ; 7c126 (1f:4126) +SFX_Cry1A_3:: ; 7c126 (1f:4126) db ( $80 | CH4 ) - dw SFX_1f_2e_Ch1 + dw SFX_Cry1A_3_Ch1 db CH5 - dw SFX_1f_2e_Ch2 + dw SFX_Cry1A_3_Ch2 db CH7 - dw SFX_1f_2e_Ch3 + dw SFX_Cry1A_3_Ch3 -SFX_1f_2f:: ; 7c12f (1f:412f) +SFX_Cry1B_3:: ; 7c12f (1f:412f) db ( $80 | CH4 ) - dw SFX_1f_2f_Ch1 + dw SFX_Cry1B_3_Ch1 db CH5 - dw SFX_1f_2f_Ch2 + dw SFX_Cry1B_3_Ch2 db CH7 - dw SFX_1f_2f_Ch3 + dw SFX_Cry1B_3_Ch3 -SFX_1f_30:: ; 7c138 (1f:4138) +SFX_Cry1C_3:: ; 7c138 (1f:4138) db ( $80 | CH4 ) - dw SFX_1f_30_Ch1 + dw SFX_Cry1C_3_Ch1 db CH5 - dw SFX_1f_30_Ch2 + dw SFX_Cry1C_3_Ch2 db CH7 - dw SFX_1f_30_Ch3 + dw SFX_Cry1C_3_Ch3 -SFX_1f_31:: ; 7c141 (1f:4141) +SFX_Cry1D_3:: ; 7c141 (1f:4141) db ( $80 | CH4 ) - dw SFX_1f_31_Ch1 + dw SFX_Cry1D_3_Ch1 db CH5 - dw SFX_1f_31_Ch2 + dw SFX_Cry1D_3_Ch2 db CH7 - dw SFX_1f_31_Ch3 + dw SFX_Cry1D_3_Ch3 -SFX_1f_32:: ; 7c14a (1f:414a) +SFX_Cry1E_3:: ; 7c14a (1f:414a) db ( $80 | CH4 ) - dw SFX_1f_32_Ch1 + dw SFX_Cry1E_3_Ch1 db CH5 - dw SFX_1f_32_Ch2 + dw SFX_Cry1E_3_Ch2 db CH7 - dw SFX_1f_32_Ch3 + dw SFX_Cry1E_3_Ch3 -SFX_1f_33:: ; 7c153 (1f:4153) +SFX_Cry1F_3:: ; 7c153 (1f:4153) db ( $80 | CH4 ) - dw SFX_1f_33_Ch1 + dw SFX_Cry1F_3_Ch1 db CH5 - dw SFX_1f_33_Ch2 + dw SFX_Cry1F_3_Ch2 db CH7 - dw SFX_1f_33_Ch3 + dw SFX_Cry1F_3_Ch3 -SFX_1f_34:: ; 7c15c (1f:415c) +SFX_Cry20_3:: ; 7c15c (1f:415c) db ( $80 | CH4 ) - dw SFX_1f_34_Ch1 + dw SFX_Cry20_3_Ch1 db CH5 - dw SFX_1f_34_Ch2 + dw SFX_Cry20_3_Ch2 db CH7 - dw SFX_1f_34_Ch3 + dw SFX_Cry20_3_Ch3 -SFX_1f_35:: ; 7c165 (1f:4165) +SFX_Cry21_3:: ; 7c165 (1f:4165) db ( $80 | CH4 ) - dw SFX_1f_35_Ch1 + dw SFX_Cry21_3_Ch1 db CH5 - dw SFX_1f_35_Ch2 + dw SFX_Cry21_3_Ch2 db CH7 - dw SFX_1f_35_Ch3 + dw SFX_Cry21_3_Ch3 -SFX_1f_36:: ; 7c16e (1f:416e) +SFX_Cry22_3:: ; 7c16e (1f:416e) db ( $80 | CH4 ) - dw SFX_1f_36_Ch1 + dw SFX_Cry22_3_Ch1 db CH5 - dw SFX_1f_36_Ch2 + dw SFX_Cry22_3_Ch2 db CH7 - dw SFX_1f_36_Ch3 + dw SFX_Cry22_3_Ch3 -SFX_1f_37:: ; 7c177 (1f:4177) +SFX_Cry23_3:: ; 7c177 (1f:4177) db ( $80 | CH4 ) - dw SFX_1f_37_Ch1 + dw SFX_Cry23_3_Ch1 db CH5 - dw SFX_1f_37_Ch2 + dw SFX_Cry23_3_Ch2 db CH7 - dw SFX_1f_37_Ch3 + dw SFX_Cry23_3_Ch3 -SFX_1f_38:: ; 7c180 (1f:4180) +SFX_Cry24_3:: ; 7c180 (1f:4180) db ( $80 | CH4 ) - dw SFX_1f_38_Ch1 + dw SFX_Cry24_3_Ch1 db CH5 - dw SFX_1f_38_Ch2 + dw SFX_Cry24_3_Ch2 db CH7 - dw SFX_1f_38_Ch3 + dw SFX_Cry24_3_Ch3 -SFX_1f_39:: ; 7c189 (1f:4189) +SFX_Cry25_3:: ; 7c189 (1f:4189) db ( $80 | CH4 ) - dw SFX_1f_39_Ch1 + dw SFX_Cry25_3_Ch1 db CH5 - dw SFX_1f_39_Ch2 + dw SFX_Cry25_3_Ch2 db CH7 - dw SFX_1f_39_Ch3 + dw SFX_Cry25_3_Ch3 -SFX_1f_3a:: ; 7c192 (1f:4192) +SFX_Get_Item1_3:: ; 7c192 (1f:4192) db ( $80 | CH4 ) - dw SFX_1f_3a_Ch1 + dw SFX_Get_Item1_3_Ch1 db CH5 - dw SFX_1f_3a_Ch2 + dw SFX_Get_Item1_3_Ch2 db CH6 - dw SFX_1f_3a_Ch3 + dw SFX_Get_Item1_3_Ch3 -SFX_1f_3b:: ; 7c19b (1f:419b) +SFX_Get_Item2_3:: ; 7c19b (1f:419b) db ( $80 | CH4 ) - dw SFX_1f_3b_Ch1 + dw SFX_Get_Item2_3_Ch1 db CH5 - dw SFX_1f_3b_Ch2 + dw SFX_Get_Item2_3_Ch2 db CH6 - dw SFX_1f_3b_Ch3 + dw SFX_Get_Item2_3_Ch3 -SFX_1f_3c:: ; 7c1a4 (1f:41a4) +SFX_Tink_3:: ; 7c1a4 (1f:41a4) db CH4 - dw SFX_1f_3c_Ch1 + dw SFX_Tink_3_Ch1 -SFX_1f_3d:: ; 7c1a7 (1f:41a7) +SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7) db CH4 - dw SFX_1f_3d_Ch1 + dw SFX_Heal_HP_3_Ch1 -SFX_1f_3e:: ; 7c1aa (1f:41aa) +SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa) db CH4 - dw SFX_1f_3e_Ch1 + dw SFX_Heal_Ailment_3_Ch1 -SFX_1f_3f:: ; 7c1ad (1f:41ad) +SFX_Start_Menu_3:: ; 7c1ad (1f:41ad) db CH7 - dw SFX_1f_3f_Ch1 + dw SFX_Start_Menu_3_Ch1 -SFX_1f_40:: ; 7c1b0 (1f:41b0) +SFX_Press_AB_3:: ; 7c1b0 (1f:41b0) db CH4 - dw SFX_1f_40_Ch1 + dw SFX_Press_AB_3_Ch1 -SFX_1f_41:: ; 7c1b3 (1f:41b3) +SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) db ( $80 | CH4 ) - dw SFX_1f_41_Ch1 + dw SFX_Pokedex_Rating_3_Ch1 db CH5 - dw SFX_1f_41_Ch2 + dw SFX_Pokedex_Rating_3_Ch2 db CH6 - dw SFX_1f_41_Ch3 + dw SFX_Pokedex_Rating_3_Ch3 -SFX_1f_42:: ; 7c1bc (1f:41bc) +SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) db ( $80 | CH4 ) - dw SFX_1f_42_Ch1 + dw SFX_Get_Key_Item_3_Ch1 db CH5 - dw SFX_1f_42_Ch2 + dw SFX_Get_Key_Item_3_Ch2 db CH6 - dw SFX_1f_42_Ch3 + dw SFX_Get_Key_Item_3_Ch3 -SFX_1f_43:: ; 7c1c5 (1f:41c5) +SFX_Poisoned_3:: ; 7c1c5 (1f:41c5) db CH4 - dw SFX_1f_43_Ch1 + dw SFX_Poisoned_3_Ch1 -SFX_1f_44:: ; 7c1c8 (1f:41c8) +SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8) db CH4 - dw SFX_1f_44_Ch1 + dw SFX_Trade_Machine_3_Ch1 -SFX_1f_45:: ; 7c1cb (1f:41cb) +SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb) db CH4 - dw SFX_1f_45_Ch1 + dw SFX_Turn_On_PC_3_Ch1 -SFX_1f_46:: ; 7c1ce (1f:41ce) +SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce) db CH4 - dw SFX_1f_46_Ch1 + dw SFX_Turn_Off_PC_3_Ch1 -SFX_1f_47:: ; 7c1d1 (1f:41d1) +SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1) db CH4 - dw SFX_1f_47_Ch1 + dw SFX_Enter_PC_3_Ch1 -SFX_1f_48:: ; 7c1d4 (1f:41d4) +SFX_Shrink_3:: ; 7c1d4 (1f:41d4) db CH4 - dw SFX_1f_48_Ch1 + dw SFX_Shrink_3_Ch1 -SFX_1f_49:: ; 7c1d7 (1f:41d7) +SFX_Switch_3:: ; 7c1d7 (1f:41d7) db CH4 - dw SFX_1f_49_Ch1 + dw SFX_Switch_3_Ch1 -SFX_1f_4a:: ; 7c1da (1f:41da) +SFX_Healing_Machine_3:: ; 7c1da (1f:41da) db CH4 - dw SFX_1f_4a_Ch1 + dw SFX_Healing_Machine_3_Ch1 -SFX_1f_4b:: ; 7c1dd (1f:41dd) +SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd) db CH4 - dw SFX_1f_4b_Ch1 + dw SFX_Teleport_Exit1_3_Ch1 -SFX_1f_4c:: ; 7c1e0 (1f:41e0) +SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0) db CH4 - dw SFX_1f_4c_Ch1 + dw SFX_Teleport_Enter1_3_Ch1 -SFX_1f_4d:: ; 7c1e3 (1f:41e3) +SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3) db CH4 - dw SFX_1f_4d_Ch1 + dw SFX_Teleport_Exit2_3_Ch1 -SFX_1f_4e:: ; 7c1e6 (1f:41e6) +SFX_Ledge_3:: ; 7c1e6 (1f:41e6) db CH4 - dw SFX_1f_4e_Ch1 + dw SFX_Ledge_3_Ch1 -SFX_1f_4f:: ; 7c1e9 (1f:41e9) +SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9) db CH7 - dw SFX_1f_4f_Ch1 + dw SFX_Teleport_Enter2_3_Ch1 -SFX_1f_50:: ; 7c1ec (1f:41ec) +SFX_Fly_3:: ; 7c1ec (1f:41ec) db CH7 - dw SFX_1f_50_Ch1 + dw SFX_Fly_3_Ch1 -SFX_1f_51:: ; 7c1ef (1f:41ef) +SFX_Denied_3:: ; 7c1ef (1f:41ef) db ( $40 | CH4 ) - dw SFX_1f_51_Ch1 + dw SFX_Denied_3_Ch1 db CH5 - dw SFX_1f_51_Ch2 + dw SFX_Denied_3_Ch2 -SFX_1f_52:: ; 7c1f5 (1f:41f5) +SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5) db CH4 - dw SFX_1f_52_Ch1 + dw SFX_Arrow_Tiles_3_Ch1 -SFX_1f_53:: ; 7c1f8 (1f:41f8) +SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8) db CH7 - dw SFX_1f_53_Ch1 + dw SFX_Push_Boulder_3_Ch1 -SFX_1f_54:: ; 7c1fb (1f:41fb) +SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb) db ( $40 | CH4 ) - dw SFX_1f_54_Ch1 + dw SFX_SS_Anne_Horn_3_Ch1 db CH5 - dw SFX_1f_54_Ch2 + dw SFX_SS_Anne_Horn_3_Ch2 -SFX_1f_55:: ; 7c201 (1f:4201) +SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201) db CH4 - dw SFX_1f_55_Ch1 + dw SFX_Withdraw_Deposit_3_Ch1 -SFX_1f_56:: ; 7c204 (1f:4204) +SFX_Cut_3:: ; 7c204 (1f:4204) db CH7 - dw SFX_1f_56_Ch1 + dw SFX_Cut_3_Ch1 -SFX_1f_57:: ; 7c207 (1f:4207) +SFX_Go_Inside_3:: ; 7c207 (1f:4207) db CH7 - dw SFX_1f_57_Ch1 + dw SFX_Go_Inside_3_Ch1 -SFX_1f_58:: ; 7c20a (1f:420a) +SFX_Swap_3:: ; 7c20a (1f:420a) db ( $40 | CH4 ) - dw SFX_1f_58_Ch1 + dw SFX_Swap_3_Ch1 db CH5 - dw SFX_1f_58_Ch2 + dw SFX_Swap_3_Ch2 -SFX_1f_59:: ; 7c210 (1f:4210) +SFX_59_3:: ; 7c210 (1f:4210) db ( $40 | CH4 ) - dw SFX_1f_59_Ch1 + dw SFX_59_3_Ch1 db CH5 - dw SFX_1f_59_Ch2 + dw SFX_59_3_Ch2 -SFX_1f_5a:: ; 7c216 (1f:4216) +SFX_Purchase_3:: ; 7c216 (1f:4216) db ( $40 | CH4 ) - dw SFX_1f_5a_Ch1 + dw SFX_Purchase_3_Ch1 db CH5 - dw SFX_1f_5a_Ch2 + dw SFX_Purchase_3_Ch2 -SFX_1f_5b:: ; 7c21c (1f:421c) +SFX_Collision_3:: ; 7c21c (1f:421c) db CH4 - dw SFX_1f_5b_Ch1 + dw SFX_Collision_3_Ch1 -SFX_1f_5c:: ; 7c21f (1f:421f) +SFX_Go_Outside_3:: ; 7c21f (1f:421f) db CH7 - dw SFX_1f_5c_Ch1 + dw SFX_Go_Outside_3_Ch1 -SFX_1f_5d:: ; 7c222 (1f:4222) +SFX_Save_3:: ; 7c222 (1f:4222) db ( $40 | CH4 ) - dw SFX_1f_5d_Ch1 + dw SFX_Save_3_Ch1 db CH5 - dw SFX_1f_5d_Ch2 + dw SFX_Save_3_Ch2 -SFX_1f_5e:: ; 7c228 (1f:4228) +SFX_Intro_Lunge:: ; 7c228 (1f:4228) db CH7 - dw SFX_1f_5e_Ch1 + dw SFX_Intro_Lunge_Ch1 -SFX_1f_5f:: ; 7c22b (1f:422b) +SFX_Intro_Hip:: ; 7c22b (1f:422b) db CH4 - dw SFX_1f_5f_Ch1 + dw SFX_Intro_Hip_Ch1 -SFX_1f_60:: ; 7c22e (1f:422e) +SFX_Intro_Hop:: ; 7c22e (1f:422e) db CH4 - dw SFX_1f_60_Ch1 + dw SFX_Intro_Hop_Ch1 -SFX_1f_61:: ; 7c231 (1f:4231) +SFX_Intro_Raise:: ; 7c231 (1f:4231) db CH7 - dw SFX_1f_61_Ch1 + dw SFX_Intro_Raise_Ch1 -SFX_1f_62:: ; 7c234 (1f:4234) +SFX_Intro_Crash:: ; 7c234 (1f:4234) db CH7 - dw SFX_1f_62_Ch1 + dw SFX_Intro_Crash_Ch1 -SFX_1f_63:: ; 7c237 (1f:4237) +SFX_Intro_Whoosh:: ; 7c237 (1f:4237) db CH7 - dw SFX_1f_63_Ch1 + dw SFX_Intro_Whoosh_Ch1 -SFX_1f_64:: ; 7c23a (1f:423a) +SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a) db CH4 - dw SFX_1f_64_Ch1 + dw SFX_Slots_Stop_Wheel_Ch1 -SFX_1f_65:: ; 7c23d (1f:423d) +SFX_Slots_Reward:: ; 7c23d (1f:423d) db CH4 - dw SFX_1f_65_Ch1 + dw SFX_Slots_Reward_Ch1 -SFX_1f_66:: ; 7c240 (1f:4240) +SFX_Slots_New_Spin:: ; 7c240 (1f:4240) db ( $40 | CH4 ) - dw SFX_1f_66_Ch1 + dw SFX_Slots_New_Spin_Ch1 db CH5 - dw SFX_1f_66_Ch2 + dw SFX_Slots_New_Spin_Ch2 -SFX_1f_67:: ; 7c246 (1f:4246) +SFX_Shooting_Star:: ; 7c246 (1f:4246) db CH4 - dw SFX_1f_67_Ch1 + dw SFX_Shooting_Star_Ch1 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm new file mode 100644 index 00000000..6cbfdb16 --- /dev/null +++ b/audio/sfx/59_1.asm @@ -0,0 +1,11 @@ +SFX_59_1_Ch1: ; 841b (2:441b) + duty 2 + unknownsfx0x20 4, 241, 128, 7 + endchannel + + +SFX_59_1_Ch2: ; 8422 (2:4422) + duty 2 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 161, 97, 7 + endchannel diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm new file mode 100644 index 00000000..9c808359 --- /dev/null +++ b/audio/sfx/59_3.asm @@ -0,0 +1,11 @@ +SFX_59_3_Ch1: ; 7c404 (1f:4404) + duty 2 + unknownsfx0x20 4, 241, 128, 7 + endchannel + + +SFX_59_3_Ch2: ; 7c40b (1f:440b) + duty 2 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 161, 97, 7 + endchannel diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm new file mode 100644 index 00000000..172907a8 --- /dev/null +++ b/audio/sfx/arrow_tiles_1.asm @@ -0,0 +1,6 @@ +SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649) + duty 0 + unknownsfx0x10 23 + unknownsfx0x20 15, 210, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm new file mode 100644 index 00000000..fd225a5f --- /dev/null +++ b/audio/sfx/arrow_tiles_3.asm @@ -0,0 +1,6 @@ +SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626) + duty 0 + unknownsfx0x10 23 + unknownsfx0x20 15, 210, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm new file mode 100644 index 00000000..46fb2a07 --- /dev/null +++ b/audio/sfx/ball_poof.asm @@ -0,0 +1,11 @@ +SFX_Ball_Poof_Ch1: ; 2043d (8:443d) + duty 2 + unknownsfx0x10 22 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 + endchannel + + +SFX_Ball_Poof_Ch2: ; 20448 (8:4448) + unknownnoise0x20 15, 162, 34 + endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm new file mode 100644 index 00000000..fc9f81cc --- /dev/null +++ b/audio/sfx/ball_toss.asm @@ -0,0 +1,11 @@ +SFX_Ball_Toss_Ch1: ; 2042d (8:442d) + duty 2 + unknownsfx0x10 47 + unknownsfx0x20 15, 242, 128, 7 + endchannel + + +SFX_Ball_Toss_Ch2: ; 20436 (8:4436) + duty 2 + unknownsfx0x20 15, 194, 130, 7 + endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm new file mode 100644 index 00000000..19e9b9e7 --- /dev/null +++ b/audio/sfx/battle_09.asm @@ -0,0 +1,6 @@ +SFX_Battle_09_Ch1: ; 204b9 (8:44b9) + duty 1 + unknownsfx0x10 151 + unknownsfx0x20 15, 242, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm new file mode 100644 index 00000000..1a7e17ec --- /dev/null +++ b/audio/sfx/battle_0b.asm @@ -0,0 +1,3 @@ +SFX_Battle_0B_Ch1: ; 204c8 (8:44c8) + unknownnoise0x20 8, 241, 84 + endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm new file mode 100644 index 00000000..b2fdf455 --- /dev/null +++ b/audio/sfx/battle_0c.asm @@ -0,0 +1,5 @@ +SFX_Battle_0C_Ch1: ; 204cc (8:44cc) + unknownnoise0x20 15, 143, 17 + unknownnoise0x20 4, 255, 18 + unknownnoise0x20 10, 241, 85 + endchannel diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm new file mode 100644 index 00000000..c70b281d --- /dev/null +++ b/audio/sfx/battle_0d.asm @@ -0,0 +1,5 @@ +SFX_Battle_0D_Ch1: ; 204d6 (8:44d6) + unknownnoise0x20 15, 143, 52 + unknownnoise0x20 8, 242, 53 + unknownnoise0x20 10, 241, 85 + endchannel diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm new file mode 100644 index 00000000..20c20628 --- /dev/null +++ b/audio/sfx/battle_0e.asm @@ -0,0 +1,4 @@ +SFX_Battle_0E_Ch1: ; 204e0 (8:44e0) + unknownnoise0x20 15, 159, 35 + unknownnoise0x20 8, 241, 33 + endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm new file mode 100644 index 00000000..d84aed37 --- /dev/null +++ b/audio/sfx/battle_0f.asm @@ -0,0 +1,6 @@ +SFX_Battle_0F_Ch1: ; 204e7 (8:44e7) + unknownnoise0x20 2, 225, 75 + unknownnoise0x20 10, 241, 68 + unknownnoise0x20 2, 225, 58 + unknownnoise0x20 6, 241, 52 + endchannel diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm new file mode 100644 index 00000000..324ce9b9 --- /dev/null +++ b/audio/sfx/battle_12.asm @@ -0,0 +1,6 @@ +SFX_Battle_12_Ch1: ; 2050b (8:450b) + unknownnoise0x20 8, 79, 35 + unknownnoise0x20 4, 196, 34 + unknownnoise0x20 6, 242, 35 + loopchannel 4, SFX_Battle_12_Ch1 + endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm new file mode 100644 index 00000000..74349bb5 --- /dev/null +++ b/audio/sfx/battle_13.asm @@ -0,0 +1,6 @@ +SFX_Battle_13_Ch1: ; 20519 (8:4519) + unknownnoise0x20 8, 79, 51 + unknownnoise0x20 4, 196, 34 + unknownnoise0x20 6, 242, 35 + unknownnoise0x20 15, 242, 34 + endchannel diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm new file mode 100644 index 00000000..82234904 --- /dev/null +++ b/audio/sfx/battle_14.asm @@ -0,0 +1,6 @@ +SFX_Battle_14_Ch1: ; 20526 (8:4526) + unknownnoise0x20 8, 255, 50 + unknownnoise0x20 8, 244, 67 + unknownnoise0x20 8, 242, 84 + unknownnoise0x20 8, 241, 101 + endchannel diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm new file mode 100644 index 00000000..a2b5031e --- /dev/null +++ b/audio/sfx/battle_16.asm @@ -0,0 +1,5 @@ +SFX_Battle_16_Ch1: ; 2054c (8:454c) + unknownnoise0x20 1, 148, 35 + unknownnoise0x20 1, 180, 34 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm new file mode 100644 index 00000000..4be1d96b --- /dev/null +++ b/audio/sfx/battle_17.asm @@ -0,0 +1,6 @@ +SFX_Battle_17_Ch1: ; 20556 (8:4556) + unknownnoise0x20 2, 148, 51 + unknownnoise0x20 4, 180, 34 + unknownnoise0x20 4, 241, 68 + unknownnoise0x20 8, 241, 85 + endchannel diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm new file mode 100644 index 00000000..6c201d38 --- /dev/null +++ b/audio/sfx/battle_18.asm @@ -0,0 +1,4 @@ +SFX_Battle_18_Ch1: ; 20563 (8:4563) + unknownnoise0x20 4, 255, 85 + unknownnoise0x20 8, 241, 101 + endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm new file mode 100644 index 00000000..6b54f8cd --- /dev/null +++ b/audio/sfx/battle_19.asm @@ -0,0 +1,5 @@ +SFX_Battle_19_Ch1: ; 2056a (8:456a) + unknownnoise0x20 2, 132, 67 + unknownnoise0x20 2, 196, 34 + unknownnoise0x20 8, 242, 52 + endchannel diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm new file mode 100644 index 00000000..3bb451d5 --- /dev/null +++ b/audio/sfx/battle_1b.asm @@ -0,0 +1,4 @@ +SFX_Battle_1B_Ch1: ; 2057b (8:457b) + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 15, 242, 18 + endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm new file mode 100644 index 00000000..579e36cc --- /dev/null +++ b/audio/sfx/battle_1c.asm @@ -0,0 +1,5 @@ +SFX_Battle_1C_Ch1: ; 20582 (8:4582) + unknownnoise0x20 2, 194, 1 + unknownnoise0x20 15, 244, 1 + unknownnoise0x20 15, 242, 1 + endchannel diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm new file mode 100644 index 00000000..df556540 --- /dev/null +++ b/audio/sfx/battle_1e.asm @@ -0,0 +1,16 @@ +SFX_Battle_1E_Ch1: ; 20593 (8:4593) + duty 0 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel + + +SFX_Battle_1E_Ch2: ; 205a4 (8:45a4) + unknownnoise0x20 0, 209, 66 + unknownnoise0x20 4, 161, 50 + unknownnoise0x20 0, 209, 34 + unknownnoise0x20 6, 161, 50 + endchannel diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm new file mode 100644 index 00000000..142030ee --- /dev/null +++ b/audio/sfx/battle_20.asm @@ -0,0 +1,4 @@ +SFX_Battle_20_Ch1: ; 205be (8:45be) + unknownnoise0x20 12, 241, 84 + unknownnoise0x20 8, 241, 100 + endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm new file mode 100644 index 00000000..10ad350e --- /dev/null +++ b/audio/sfx/battle_21.asm @@ -0,0 +1,7 @@ +SFX_Battle_21_Ch1: ; 205c5 (8:45c5) + unknownnoise0x20 2, 241, 51 + unknownnoise0x20 2, 193, 50 + unknownnoise0x20 2, 161, 49 + unknownnoise0x20 15, 130, 50 + unknownnoise0x20 8, 241, 52 + endchannel diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm new file mode 100644 index 00000000..c6b0d972 --- /dev/null +++ b/audio/sfx/battle_22.asm @@ -0,0 +1,4 @@ +SFX_Battle_22_Ch1: ; 205d5 (8:45d5) + unknownnoise0x20 2, 210, 50 + unknownnoise0x20 15, 242, 67 + endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm new file mode 100644 index 00000000..474e43b6 --- /dev/null +++ b/audio/sfx/battle_23.asm @@ -0,0 +1,7 @@ +SFX_Battle_23_Ch1: ; 205dc (8:45dc) + unknownnoise0x20 2, 242, 67 + unknownnoise0x20 4, 181, 50 + unknownnoise0x20 9, 134, 49 + unknownnoise0x20 7, 100, 0 + unknownnoise0x20 15, 242, 85 + endchannel diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm new file mode 100644 index 00000000..4fea9cf9 --- /dev/null +++ b/audio/sfx/battle_24.asm @@ -0,0 +1,12 @@ +SFX_Battle_24_Ch1: ; 205ec (8:45ec) + duty 1 + unknownsfx0x10 151 + unknownsfx0x20 15, 242, 0, 7 + unknownsfx0x10 8 + endchannel + + +SFX_Battle_24_Ch2: ; 205f7 (8:45f7) + unknownnoise0x20 15, 63, 34 + unknownnoise0x20 15, 242, 33 + endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm new file mode 100644 index 00000000..18a70f45 --- /dev/null +++ b/audio/sfx/battle_25.asm @@ -0,0 +1,7 @@ +SFX_Battle_25_Ch1: ; 205fe (8:45fe) + unknownnoise0x20 15, 79, 65 + unknownnoise0x20 8, 143, 65 + unknownnoise0x20 8, 207, 65 + unknownnoise0x20 8, 242, 66 + unknownnoise0x20 15, 242, 65 + endchannel diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm new file mode 100644 index 00000000..943078e1 --- /dev/null +++ b/audio/sfx/battle_26.asm @@ -0,0 +1,9 @@ +SFX_Battle_26_Ch1: ; 2060e (8:460e) + unknownnoise0x20 10, 255, 80 + unknownnoise0x20 15, 255, 81 + unknownnoise0x20 8, 242, 81 + unknownnoise0x20 6, 255, 82 + unknownnoise0x20 6, 255, 83 + unknownnoise0x20 8, 255, 84 + unknownnoise0x20 15, 242, 84 + endchannel diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm new file mode 100644 index 00000000..ddd4e452 --- /dev/null +++ b/audio/sfx/battle_27.asm @@ -0,0 +1,27 @@ +SFX_Battle_27_Ch1: ; 20624 (8:4624) + duty 2 + unknownsfx0x20 15, 63, 192, 7 + +SFX_Battle_27_branch_2062a: + unknownsfx0x20 15, 223, 192, 7 + loopchannel 4, SFX_Battle_27_branch_2062a + unknownsfx0x20 15, 209, 192, 7 + endchannel + + +SFX_Battle_27_Ch2: ; 20637 (8:4637) + dutycycle 179 + unknownsfx0x20 15, 47, 200, 7 + +SFX_Battle_27_branch_2063d: + unknownsfx0x20 15, 207, 199, 7 + loopchannel 4, SFX_Battle_27_branch_2063d + unknownsfx0x20 15, 193, 200, 7 + endchannel + + +SFX_Battle_27_Ch3: ; 2064a (8:464a) + unknownnoise0x20 3, 151, 18 + unknownnoise0x20 3, 161, 17 + loopchannel 10, SFX_Battle_27_Ch3 + endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm new file mode 100644 index 00000000..73855179 --- /dev/null +++ b/audio/sfx/battle_28.asm @@ -0,0 +1,21 @@ +SFX_Battle_28_Ch1: ; 20655 (8:4655) + duty 0 + unknownsfx0x20 0, 241, 192, 7 + unknownsfx0x20 0, 241, 0, 7 + loopchannel 12, SFX_Battle_28_Ch1 + endchannel + + +SFX_Battle_28_Ch2: ; 20664 (8:4664) + dutycycle 179 + unknownsfx0x20 0, 225, 193, 7 + unknownsfx0x20 0, 225, 1, 7 + loopchannel 12, SFX_Battle_28_Ch2 + endchannel + + +SFX_Battle_28_Ch3: ; 20673 (8:4673) + unknownnoise0x20 1, 209, 73 + unknownnoise0x20 1, 209, 41 + loopchannel 6, SFX_Battle_28_Ch3 + endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm new file mode 100644 index 00000000..e766a453 --- /dev/null +++ b/audio/sfx/battle_29.asm @@ -0,0 +1,18 @@ +SFX_Battle_29_Ch1: ; 2067e (8:467e) + dutycycle 201 + unknownsfx0x20 11, 243, 32, 1 + unknownsfx0x20 9, 211, 80, 1 + loopchannel 5, SFX_Battle_29_Ch1 + unknownsfx0x20 8, 227, 48, 1 + unknownsfx0x20 15, 194, 16, 1 + endchannel + + +SFX_Battle_29_Ch2: ; 20695 (8:4695) + unknownnoise0x20 10, 243, 53 + unknownnoise0x20 14, 246, 69 + loopchannel 4, SFX_Battle_29_Ch2 + unknownnoise0x20 12, 244, 188 + unknownnoise0x20 12, 245, 156 + unknownnoise0x20 15, 244, 172 + endchannel diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm new file mode 100644 index 00000000..d7334aae --- /dev/null +++ b/audio/sfx/battle_2a.asm @@ -0,0 +1,28 @@ +SFX_Battle_2A_Ch1: ; 206a9 (8:46a9) + dutycycle 57 + unknownsfx0x20 4, 244, 0, 6 + unknownsfx0x20 3, 196, 0, 5 + unknownsfx0x20 5, 181, 0, 6 + unknownsfx0x20 13, 226, 192, 6 + loopchannel 3, SFX_Battle_2A_Ch1 + unknownsfx0x20 8, 209, 0, 6 + endchannel + + +SFX_Battle_2A_Ch2: ; 206c4 (8:46c4) + dutycycle 141 + unknownsfx0x20 5, 228, 224, 5 + unknownsfx0x20 4, 180, 224, 4 + unknownsfx0x20 6, 165, 232, 5 + unknownsfx0x20 14, 209, 160, 6 + loopchannel 3, SFX_Battle_2A_Ch2 + endchannel + + +SFX_Battle_2A_Ch3: ; 206db (8:46db) + unknownnoise0x20 5, 195, 51 + unknownnoise0x20 3, 146, 67 + unknownnoise0x20 10, 181, 51 + unknownnoise0x20 15, 195, 50 + loopchannel 2, SFX_Battle_2A_Ch3 + endchannel diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm new file mode 100644 index 00000000..276627c3 --- /dev/null +++ b/audio/sfx/battle_2b.asm @@ -0,0 +1,21 @@ +SFX_Battle_2B_Ch1: ; 206ec (8:46ec) + dutycycle 210 + unknownsfx0x20 3, 129, 0, 3 + unknownsfx0x20 3, 193, 0, 4 + unknownsfx0x20 3, 241, 0, 5 + unknownsfx0x20 3, 177, 0, 4 + unknownsfx0x20 3, 113, 0, 3 + loopchannel 5, SFX_Battle_2B_Ch1 + unknownsfx0x20 8, 129, 0, 4 + endchannel + + +SFX_Battle_2B_Ch2: ; 2070b (8:470b) + unknownnoise0x20 3, 98, 34 + unknownnoise0x20 3, 162, 50 + unknownnoise0x20 3, 210, 51 + unknownnoise0x20 3, 146, 35 + unknownnoise0x20 3, 82, 18 + loopchannel 5, SFX_Battle_2B_Ch2 + unknownnoise0x20 8, 129, 18 + endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm new file mode 100644 index 00000000..22b902f1 --- /dev/null +++ b/audio/sfx/battle_2c.asm @@ -0,0 +1,25 @@ +SFX_Battle_2C_Ch1: ; 20722 (8:4722) + dutycycle 57 + unknownsfx0x20 15, 244, 0, 5 + unknownsfx0x20 15, 196, 0, 4 + unknownsfx0x20 15, 226, 192, 5 + loopchannel 3, SFX_Battle_2C_Ch1 + endchannel + + +SFX_Battle_2C_Ch2: ; 20735 (8:4735) + dutycycle 141 + unknownsfx0x20 7, 228, 48, 4 + unknownsfx0x20 15, 180, 48, 3 + unknownsfx0x20 15, 162, 56, 4 + loopchannel 4, SFX_Battle_2C_Ch2 + endchannel + + +SFX_Battle_2C_Ch3: ; 20748 (8:4748) + unknownnoise0x20 9, 244, 68 + unknownnoise0x20 9, 242, 67 + unknownnoise0x20 15, 244, 66 + unknownnoise0x20 15, 244, 65 + loopchannel 3, SFX_Battle_2C_Ch3 + endchannel diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm new file mode 100644 index 00000000..91dda605 --- /dev/null +++ b/audio/sfx/battle_2e.asm @@ -0,0 +1,27 @@ +SFX_Battle_2E_Ch1: ; 20792 (8:4792) + duty 0 + unknownsfx0x20 2, 241, 0, 2 + unknownsfx0x20 3, 241, 0, 7 + unknownsfx0x20 4, 241, 0, 5 + unknownsfx0x20 5, 241, 240, 7 + loopchannel 8, SFX_Battle_2E_Ch1 + endchannel + + +SFX_Battle_2E_Ch2: ; 207a9 (8:47a9) + dutycycle 179 + unknownsfx0x20 2, 225, 2, 3 + unknownsfx0x20 3, 225, 242, 7 + unknownsfx0x20 4, 225, 2, 6 + unknownsfx0x20 5, 225, 2, 7 + loopchannel 8, SFX_Battle_2E_Ch2 + endchannel + + +SFX_Battle_2E_Ch3: ; 207c0 (8:47c0) + unknownnoise0x20 2, 211, 16 + unknownnoise0x20 3, 211, 17 + unknownnoise0x20 2, 210, 16 + unknownnoise0x20 5, 210, 18 + loopchannel 9, SFX_Battle_2E_Ch3 + endchannel diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm new file mode 100644 index 00000000..4b1d9b2c --- /dev/null +++ b/audio/sfx/battle_2f.asm @@ -0,0 +1,21 @@ +SFX_Battle_2F_Ch1: ; 207d1 (8:47d1) + dutycycle 43 + unknownsfx0x20 3, 241, 240, 7 + unknownsfx0x20 4, 242, 0, 2 + loopchannel 8, SFX_Battle_2F_Ch1 + endchannel + + +SFX_Battle_2F_Ch2: ; 207e0 (8:47e0) + dutycycle 179 + unknownsfx0x20 4, 226, 2, 2 + unknownsfx0x20 4, 225, 226, 7 + loopchannel 9, SFX_Battle_2F_Ch2 + endchannel + + +SFX_Battle_2F_Ch3: ; 207ef (8:47ef) + unknownnoise0x20 4, 255, 67 + unknownnoise0x20 4, 242, 68 + loopchannel 9, SFX_Battle_2F_Ch3 + endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm new file mode 100644 index 00000000..5d3e2e40 --- /dev/null +++ b/audio/sfx/battle_31.asm @@ -0,0 +1,18 @@ +SFX_Battle_31_Ch1: ; 20847 (8:4847) + duty 2 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 242, 224, 7 + endchannel + + +SFX_Battle_31_Ch2: ; 2085e (8:485e) + duty 3 + unknownsfx0x20 15, 255, 226, 7 + unknownsfx0x20 15, 255, 225, 7 + unknownsfx0x20 15, 255, 226, 7 + unknownsfx0x20 15, 255, 225, 7 + unknownsfx0x20 15, 242, 226, 7 + endchannel diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm new file mode 100644 index 00000000..c949fb5b --- /dev/null +++ b/audio/sfx/battle_32.asm @@ -0,0 +1,12 @@ +SFX_Battle_32_Ch1: ; 20875 (8:4875) + duty 2 + unknownsfx0x10 175 + unknownsfx0x20 8, 241, 0, 7 + unknownsfx0x10 8 + endchannel + + +SFX_Battle_32_Ch2: ; 20880 (8:4880) + duty 3 + unknownsfx0x20 8, 241, 1, 7 + endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm new file mode 100644 index 00000000..8b2bd17d --- /dev/null +++ b/audio/sfx/battle_33.asm @@ -0,0 +1,18 @@ +SFX_Battle_33_Ch1: ; 20887 (8:4887) + duty 2 + unknownsfx0x20 6, 241, 0, 5 + unknownsfx0x20 6, 241, 128, 5 + unknownsfx0x20 6, 241, 0, 6 + unknownsfx0x20 6, 241, 128, 6 + unknownsfx0x20 8, 241, 0, 7 + endchannel + + +SFX_Battle_33_Ch2: ; 2089e (8:489e) + duty 3 + unknownsfx0x20 6, 225, 16, 5 + unknownsfx0x20 6, 225, 144, 5 + unknownsfx0x20 6, 225, 16, 6 + unknownsfx0x20 6, 225, 144, 6 + unknownsfx0x20 8, 225, 16, 7 + endchannel diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm new file mode 100644 index 00000000..ac80eeea --- /dev/null +++ b/audio/sfx/battle_34.asm @@ -0,0 +1,22 @@ +SFX_Battle_34_Ch1: ; 208b5 (8:48b5) + dutycycle 237 + unknownsfx0x20 8, 255, 248, 3 + unknownsfx0x20 15, 255, 0, 4 + unknownsfx0x20 15, 243, 0, 4 + endchannel + + +SFX_Battle_34_Ch2: ; 208c4 (8:48c4) + dutycycle 180 + unknownsfx0x20 8, 239, 192, 3 + unknownsfx0x20 15, 239, 192, 3 + unknownsfx0x20 15, 227, 192, 3 + endchannel + + +SFX_Battle_34_Ch3: ; 208d3 (8:48d3) + unknownnoise0x20 4, 255, 81 + unknownnoise0x20 8, 255, 84 + unknownnoise0x20 15, 255, 85 + unknownnoise0x20 15, 243, 86 + endchannel diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm new file mode 100644 index 00000000..7e64aca9 --- /dev/null +++ b/audio/sfx/battle_35.asm @@ -0,0 +1,29 @@ +SFX_Battle_35_Ch1: ; 208e0 (8:48e0) + executemusic + vibrato 10, 2, 4 + duty 2 + notetype 10, 8, 7 + octave 5 + G# 8 + octave 6 + F# 4 + E_ 4 + octave 5 + G# 8 + endchannel + + +SFX_Battle_35_Ch2: ; 208f0 (8:48f0) + executemusic + vibrato 10, 2, 3 + duty 2 + notetype 11, 6, 7 + octave 5 + G# 8 + notetype 10, 6, 7 + octave 6 + F# 4 + E_ 4 + octave 5 + G# 8 + endchannel diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm new file mode 100644 index 00000000..f878a1c8 --- /dev/null +++ b/audio/sfx/battle_36.asm @@ -0,0 +1,47 @@ +SFX_Battle_36_Ch1: ; 20902 (8:4902) + duty 0 + unknownsfx0x20 2, 241, 128, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 144, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 160, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 176, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 192, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 208, 7 + +SFX_Battle_36_branch_20930: + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 224, 7 + loopchannel 12, SFX_Battle_36_branch_20930 + unknownsfx0x20 15, 241, 0, 7 + endchannel + + +SFX_Battle_36_Ch2: ; 20941 (8:4941) + dutycycle 179 + unknownsfx0x20 2, 241, 129, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 145, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 161, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 177, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 193, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 209, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 225, 7 + loopchannel 12, SFX_Battle_36_branch_20930 + unknownsfx0x20 15, 241, 1, 7 + endchannel + + +SFX_Battle_36_Ch3: ; 20980 (8:4980) + unknownnoise0x20 1, 209, 73 + unknownnoise0x20 1, 209, 41 + loopchannel 26, SFX_Battle_36_Ch3 + endchannel diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm new file mode 100644 index 00000000..d841f57a --- /dev/null +++ b/audio/sfx/caught_mon.asm @@ -0,0 +1,61 @@ +SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13) + executemusic + tempo 256 + volume 7, 7 + duty 3 + toggleperfectpitch + notetype 6, 11, 2 + octave 3 + E_ 2 + F# 2 + G# 2 + G# 1 + G# 1 + B_ 2 + octave 4 + C# 2 + D# 2 + D# 1 + D# 1 + notetype 6, 11, 5 + E_ 8 + endchannel + + +SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e) + executemusic + duty 2 + notetype 6, 12, 2 + octave 4 + G# 2 + G# 1 + G# 1 + E_ 2 + E_ 1 + E_ 1 + B_ 2 + B_ 1 + B_ 1 + A_ 2 + A_ 1 + A_ 1 + notetype 6, 12, 5 + G# 8 + endchannel + + +SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44) + executemusic + notetype 6, 1, 0 + octave 4 + B_ 2 + rest 2 + octave 5 + C# 2 + rest 2 + D# 2 + rest 2 + F# 2 + G_ 2 + G# 4 + endchannel diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm new file mode 100644 index 00000000..4b9c4a7e --- /dev/null +++ b/audio/sfx/collision_1.asm @@ -0,0 +1,6 @@ +SFX_Collision_1_Ch1: ; 8447 (2:4447) + duty 2 + unknownsfx0x10 90 + unknownsfx0x20 15, 241, 0, 3 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm new file mode 100644 index 00000000..18806c1f --- /dev/null +++ b/audio/sfx/collision_3.asm @@ -0,0 +1,6 @@ +SFX_Collision_3_Ch1: ; 7c430 (1f:4430) + duty 2 + unknownsfx0x10 90 + unknownsfx0x20 15, 241, 0, 3 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm new file mode 100644 index 00000000..f29e29ab --- /dev/null +++ b/audio/sfx/cry00_1.asm @@ -0,0 +1,21 @@ +SFX_Cry00_1_Ch1: ; 8987 (2:4987) + dutycycle 245 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 + endchannel + + +SFX_Cry00_1_Ch2: ; 8996 (2:4996) + dutycycle 160 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 + endchannel + + +SFX_Cry00_1_Ch3: ; 89a5 (2:49a5) + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 + endchannel diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm new file mode 100644 index 00000000..fa069f18 --- /dev/null +++ b/audio/sfx/cry00_2.asm @@ -0,0 +1,21 @@ +SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f) + dutycycle 245 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 + endchannel + + +SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e) + dutycycle 160 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 + endchannel + + +SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d) + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 + endchannel diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm new file mode 100644 index 00000000..bdeadab5 --- /dev/null +++ b/audio/sfx/cry00_3.asm @@ -0,0 +1,21 @@ +SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc) + dutycycle 245 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 + endchannel + + +SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b) + dutycycle 160 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 + endchannel + + +SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a) + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 + endchannel diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm new file mode 100644 index 00000000..835d41f7 --- /dev/null +++ b/audio/sfx/cry01_1.asm @@ -0,0 +1,24 @@ +SFX_Cry01_1_Ch1: ; 8b97 (2:4b97) + dutycycle 160 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 + endchannel + + +SFX_Cry01_1_Ch2: ; 8baa (2:4baa) + dutycycle 90 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 + endchannel + + +SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd) + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 + endchannel diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm new file mode 100644 index 00000000..bcafa873 --- /dev/null +++ b/audio/sfx/cry01_2.asm @@ -0,0 +1,24 @@ +SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f) + dutycycle 160 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 + endchannel + + +SFX_Cry01_2_Ch2: ; 20e52 (8:4e52) + dutycycle 90 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 + endchannel + + +SFX_Cry01_2_Ch3: ; 20e65 (8:4e65) + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 + endchannel diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm new file mode 100644 index 00000000..1a31c7ca --- /dev/null +++ b/audio/sfx/cry01_3.asm @@ -0,0 +1,24 @@ +SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c) + dutycycle 160 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 + endchannel + + +SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f) + dutycycle 90 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 + endchannel + + +SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32) + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 + endchannel diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm new file mode 100644 index 00000000..97cff95e --- /dev/null +++ b/audio/sfx/cry02_1.asm @@ -0,0 +1,17 @@ +SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c) + duty 0 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 + endchannel + + +SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b) + dutycycle 165 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 + + +SFX_Cry02_1_Ch3: ; 8b29 (2:4b29) + endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm new file mode 100644 index 00000000..7d67fc4a --- /dev/null +++ b/audio/sfx/cry02_2.asm @@ -0,0 +1,17 @@ +SFX_Cry02_2_Ch1: ; 20db4 (8:4db4) + duty 0 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 + endchannel + + +SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3) + dutycycle 165 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 + + +SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1) + endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm new file mode 100644 index 00000000..604d084a --- /dev/null +++ b/audio/sfx/cry02_3.asm @@ -0,0 +1,17 @@ +SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81) + duty 0 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 + endchannel + + +SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90) + dutycycle 165 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 + + +SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e) + endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm new file mode 100644 index 00000000..42f2c5d3 --- /dev/null +++ b/audio/sfx/cry03_1.asm @@ -0,0 +1,30 @@ +SFX_Cry03_1_Ch1: ; 88a6 (2:48a6) + dutycycle 240 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 + endchannel + + +SFX_Cry03_1_Ch2: ; 88c5 (2:48c5) + dutycycle 10 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 + endchannel + + +SFX_Cry03_1_Ch3: ; 88e4 (2:48e4) + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm new file mode 100644 index 00000000..92dab482 --- /dev/null +++ b/audio/sfx/cry03_2.asm @@ -0,0 +1,30 @@ +SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e) + dutycycle 240 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 + endchannel + + +SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d) + dutycycle 10 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 + endchannel + + +SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c) + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm new file mode 100644 index 00000000..0161b820 --- /dev/null +++ b/audio/sfx/cry03_3.asm @@ -0,0 +1,30 @@ +SFX_Cry03_3_Ch1: ; 7c91b (1f:491b) + dutycycle 240 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 + endchannel + + +SFX_Cry03_3_Ch2: ; 7c93a (1f:493a) + dutycycle 10 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 + endchannel + + +SFX_Cry03_3_Ch3: ; 7c959 (1f:4959) + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm new file mode 100644 index 00000000..c80a6bd9 --- /dev/null +++ b/audio/sfx/cry04_1.asm @@ -0,0 +1,32 @@ +SFX_Cry04_1_Ch1: ; 8c55 (2:4c55) + dutycycle 240 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 + endchannel + + +SFX_Cry04_1_Ch2: ; 8c74 (2:4c74) + dutycycle 90 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 + endchannel + + +SFX_Cry04_1_Ch3: ; 8c93 (2:4c93) + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm new file mode 100644 index 00000000..dcd866da --- /dev/null +++ b/audio/sfx/cry04_2.asm @@ -0,0 +1,32 @@ +SFX_Cry04_2_Ch1: ; 20efd (8:4efd) + dutycycle 240 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 + endchannel + + +SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c) + dutycycle 90 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 + endchannel + + +SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b) + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm new file mode 100644 index 00000000..5d8c6df9 --- /dev/null +++ b/audio/sfx/cry04_3.asm @@ -0,0 +1,32 @@ +SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca) + dutycycle 240 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 + endchannel + + +SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9) + dutycycle 90 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 + endchannel + + +SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08) + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm new file mode 100644 index 00000000..891cc50e --- /dev/null +++ b/audio/sfx/cry05_1.asm @@ -0,0 +1,19 @@ +SFX_Cry05_1_Ch1: ; 8a35 (2:4a35) + dutycycle 10 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 + endchannel + + +SFX_Cry05_1_Ch2: ; 8a48 (2:4a48) + dutycycle 245 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 + + +SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a) + endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm new file mode 100644 index 00000000..98df4c1d --- /dev/null +++ b/audio/sfx/cry05_2.asm @@ -0,0 +1,19 @@ +SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd) + dutycycle 10 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 + endchannel + + +SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0) + dutycycle 245 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 + + +SFX_Cry05_2_Ch3: ; 20d02 (8:4d02) + endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm new file mode 100644 index 00000000..a7f88abf --- /dev/null +++ b/audio/sfx/cry05_3.asm @@ -0,0 +1,19 @@ +SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa) + dutycycle 10 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 + endchannel + + +SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd) + dutycycle 245 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 + + +SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf) + endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm new file mode 100644 index 00000000..b26004e2 --- /dev/null +++ b/audio/sfx/cry06_1.asm @@ -0,0 +1,22 @@ +SFX_Cry06_1_Ch1: ; 89df (2:49df) + dutycycle 250 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 + + +SFX_Cry06_1_Ch2: ; 89f9 (2:49f9) + endchannel + + +SFX_Cry06_1_Ch3: ; 89fa (2:49fa) + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 + endchannel diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm new file mode 100644 index 00000000..283c1360 --- /dev/null +++ b/audio/sfx/cry06_2.asm @@ -0,0 +1,22 @@ +SFX_Cry06_2_Ch1: ; 20c87 (8:4c87) + dutycycle 250 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 + + +SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1) + endchannel + + +SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2) + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 + endchannel diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm new file mode 100644 index 00000000..9feecc3b --- /dev/null +++ b/audio/sfx/cry06_3.asm @@ -0,0 +1,22 @@ +SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54) + dutycycle 250 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 + + +SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e) + endchannel + + +SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f) + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 + endchannel diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm new file mode 100644 index 00000000..b1346b94 --- /dev/null +++ b/audio/sfx/cry07_1.asm @@ -0,0 +1,21 @@ +SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d) + dutycycle 240 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c) + dutycycle 10 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 + endchannel + + +SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b) + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 + endchannel diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm new file mode 100644 index 00000000..075b7139 --- /dev/null +++ b/audio/sfx/cry07_2.asm @@ -0,0 +1,21 @@ +SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5) + dutycycle 240 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4) + dutycycle 10 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 + endchannel + + +SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3) + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 + endchannel diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm new file mode 100644 index 00000000..4955e115 --- /dev/null +++ b/audio/sfx/cry07_3.asm @@ -0,0 +1,21 @@ +SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82) + dutycycle 240 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91) + dutycycle 10 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 + endchannel + + +SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0) + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 + endchannel diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm new file mode 100644 index 00000000..65131766 --- /dev/null +++ b/audio/sfx/cry08_1.asm @@ -0,0 +1,23 @@ +SFX_Cry08_1_Ch1: ; 8c25 (2:4c25) + dutycycle 240 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 + endchannel + + +SFX_Cry08_1_Ch2: ; 8c38 (2:4c38) + dutycycle 90 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 + endchannel + + +SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b) + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm new file mode 100644 index 00000000..71a0e205 --- /dev/null +++ b/audio/sfx/cry08_2.asm @@ -0,0 +1,23 @@ +SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd) + dutycycle 240 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 + endchannel + + +SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0) + dutycycle 90 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 + endchannel + + +SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3) + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm new file mode 100644 index 00000000..bfda8c3d --- /dev/null +++ b/audio/sfx/cry08_3.asm @@ -0,0 +1,23 @@ +SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a) + dutycycle 240 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 + endchannel + + +SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad) + dutycycle 90 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 + endchannel + + +SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0) + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm new file mode 100644 index 00000000..29dffdb6 --- /dev/null +++ b/audio/sfx/cry09_1.asm @@ -0,0 +1,35 @@ +SFX_Cry09_1_Ch1: ; 872f (2:472f) + dutycycle 240 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 + dutycycle 165 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 + endchannel + + +SFX_Cry09_1_Ch2: ; 874c (2:474c) + dutycycle 5 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 + dutycycle 95 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 + endchannel + + +SFX_Cry09_1_Ch3: ; 876d (2:476d) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 + endchannel diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm new file mode 100644 index 00000000..c0e61ec7 --- /dev/null +++ b/audio/sfx/cry09_2.asm @@ -0,0 +1,35 @@ +SFX_Cry09_2_Ch1: ; 209d7 (8:49d7) + dutycycle 240 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 + dutycycle 165 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 + endchannel + + +SFX_Cry09_2_Ch2: ; 209f4 (8:49f4) + dutycycle 5 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 + dutycycle 95 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 + endchannel + + +SFX_Cry09_2_Ch3: ; 20a15 (8:4a15) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 + endchannel diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm new file mode 100644 index 00000000..c5c0f599 --- /dev/null +++ b/audio/sfx/cry09_3.asm @@ -0,0 +1,35 @@ +SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4) + dutycycle 240 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 + dutycycle 165 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 + endchannel + + +SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1) + dutycycle 5 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 + dutycycle 95 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 + endchannel + + +SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 + endchannel diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm new file mode 100644 index 00000000..9a8e616b --- /dev/null +++ b/audio/sfx/cry0a_1.asm @@ -0,0 +1,35 @@ +SFX_Cry0A_1_Ch1: ; 8bca (2:4bca) + dutycycle 240 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 + endchannel + + +SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9) + dutycycle 5 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 + endchannel + + +SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 + endchannel diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm new file mode 100644 index 00000000..0386099d --- /dev/null +++ b/audio/sfx/cry0a_2.asm @@ -0,0 +1,35 @@ +SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72) + dutycycle 240 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 + endchannel + + +SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91) + dutycycle 5 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 + endchannel + + +SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 + endchannel diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm new file mode 100644 index 00000000..4cf59333 --- /dev/null +++ b/audio/sfx/cry0a_3.asm @@ -0,0 +1,35 @@ +SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f) + dutycycle 240 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 + endchannel + + +SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e) + dutycycle 5 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 + endchannel + + +SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 + endchannel diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm new file mode 100644 index 00000000..0f0edca7 --- /dev/null +++ b/audio/sfx/cry0b_1.asm @@ -0,0 +1,37 @@ +SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b) + dutycycle 204 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 + endchannel + + +SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86) + dutycycle 68 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 + endchannel + + +SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5) + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 + endchannel diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm new file mode 100644 index 00000000..071cd9b1 --- /dev/null +++ b/audio/sfx/cry0b_2.asm @@ -0,0 +1,37 @@ +SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03) + dutycycle 204 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 + endchannel + + +SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e) + dutycycle 68 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 + endchannel + + +SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d) + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 + endchannel diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm new file mode 100644 index 00000000..c2bd1809 --- /dev/null +++ b/audio/sfx/cry0b_3.asm @@ -0,0 +1,37 @@ +SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0) + dutycycle 204 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 + endchannel + + +SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb) + dutycycle 68 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 + endchannel + + +SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a) + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 + endchannel diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm new file mode 100644 index 00000000..1c0f9f65 --- /dev/null +++ b/audio/sfx/cry0c_1.asm @@ -0,0 +1,29 @@ +SFX_Cry0C_1_Ch1: ; 8abe (2:4abe) + dutycycle 204 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5) + dutycycle 68 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 + + +SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b) + endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm new file mode 100644 index 00000000..ef598b3e --- /dev/null +++ b/audio/sfx/cry0c_2.asm @@ -0,0 +1,29 @@ +SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66) + dutycycle 204 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d) + dutycycle 68 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 + + +SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3) + endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm new file mode 100644 index 00000000..4075ac51 --- /dev/null +++ b/audio/sfx/cry0c_3.asm @@ -0,0 +1,29 @@ +SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33) + dutycycle 204 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a) + dutycycle 68 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 + + +SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80) + endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm new file mode 100644 index 00000000..591bf58e --- /dev/null +++ b/audio/sfx/cry0d_1.asm @@ -0,0 +1,40 @@ +SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a) + dutycycle 136 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 + loopchannel 2, SFX_Cry0D_1_Ch1 + endchannel + + +SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49) + dutycycle 64 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 + endchannel + + +SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78) + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 + endchannel diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm new file mode 100644 index 00000000..a7ca34f1 --- /dev/null +++ b/audio/sfx/cry0d_2.asm @@ -0,0 +1,40 @@ +SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2) + dutycycle 136 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 + loopchannel 2, SFX_Cry0D_2_Ch1 + endchannel + + +SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1) + dutycycle 64 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 + endchannel + + +SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20) + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 + endchannel diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm new file mode 100644 index 00000000..a9187dc8 --- /dev/null +++ b/audio/sfx/cry0d_3.asm @@ -0,0 +1,40 @@ +SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f) + dutycycle 136 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 + loopchannel 2, SFX_Cry0D_3_Ch1 + endchannel + + +SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe) + dutycycle 64 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 + endchannel + + +SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed) + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 + endchannel diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm new file mode 100644 index 00000000..1e778dea --- /dev/null +++ b/audio/sfx/cry0e_1.asm @@ -0,0 +1,23 @@ +SFX_Cry0E_1_Ch1: ; 89af (2:49af) + dutycycle 165 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 + endchannel + + +SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2) + dutycycle 10 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 + endchannel + + +SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5) + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 + endchannel diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm new file mode 100644 index 00000000..bab74449 --- /dev/null +++ b/audio/sfx/cry0e_2.asm @@ -0,0 +1,23 @@ +SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57) + dutycycle 165 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 + endchannel + + +SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a) + dutycycle 10 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 + endchannel + + +SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d) + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 + endchannel diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm new file mode 100644 index 00000000..da14b3a7 --- /dev/null +++ b/audio/sfx/cry0e_3.asm @@ -0,0 +1,23 @@ +SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24) + dutycycle 165 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 + endchannel + + +SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37) + dutycycle 10 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 + endchannel + + +SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a) + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 + endchannel diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm new file mode 100644 index 00000000..84563293 --- /dev/null +++ b/audio/sfx/cry0f_1.asm @@ -0,0 +1,29 @@ +SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1) + dutycycle 241 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry0F_1_Ch2: ; 890c (2:490c) + dutycycle 204 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 + endchannel + + +SFX_Cry0F_1_Ch3: ; 8927 (2:4927) + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 + endchannel diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm new file mode 100644 index 00000000..0fbaeb7a --- /dev/null +++ b/audio/sfx/cry0f_2.asm @@ -0,0 +1,29 @@ +SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99) + dutycycle 241 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4) + dutycycle 204 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 + endchannel + + +SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf) + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 + endchannel diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm new file mode 100644 index 00000000..810ab949 --- /dev/null +++ b/audio/sfx/cry0f_3.asm @@ -0,0 +1,29 @@ +SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966) + dutycycle 241 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981) + dutycycle 204 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 + endchannel + + +SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c) + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 + endchannel diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm new file mode 100644 index 00000000..956fc910 --- /dev/null +++ b/audio/sfx/cry10_1.asm @@ -0,0 +1,31 @@ +SFX_Cry10_1_Ch1: ; 8937 (2:4937) + dutycycle 201 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 + endchannel + + +SFX_Cry10_1_Ch2: ; 895a (2:495a) + dutycycle 121 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 + endchannel + + +SFX_Cry10_1_Ch3: ; 897d (2:497d) + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 + endchannel diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm new file mode 100644 index 00000000..5d4cc3aa --- /dev/null +++ b/audio/sfx/cry10_2.asm @@ -0,0 +1,31 @@ +SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf) + dutycycle 201 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 + endchannel + + +SFX_Cry10_2_Ch2: ; 20c02 (8:4c02) + dutycycle 121 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 + endchannel + + +SFX_Cry10_2_Ch3: ; 20c25 (8:4c25) + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 + endchannel diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm new file mode 100644 index 00000000..2d5df465 --- /dev/null +++ b/audio/sfx/cry10_3.asm @@ -0,0 +1,31 @@ +SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac) + dutycycle 201 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 + endchannel + + +SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf) + dutycycle 121 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 + endchannel + + +SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2) + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 + endchannel diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm new file mode 100644 index 00000000..dd354c90 --- /dev/null +++ b/audio/sfx/cry11_1.asm @@ -0,0 +1,34 @@ +SFX_Cry11_1_Ch1: ; 8813 (2:4813) + dutycycle 240 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 + endchannel + + +SFX_Cry11_1_Ch2: ; 8832 (2:4832) + dutycycle 10 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 + endchannel + + +SFX_Cry11_1_Ch3: ; 8855 (2:4855) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm new file mode 100644 index 00000000..37546fe1 --- /dev/null +++ b/audio/sfx/cry11_2.asm @@ -0,0 +1,34 @@ +SFX_Cry11_2_Ch1: ; 20abb (8:4abb) + dutycycle 240 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 + endchannel + + +SFX_Cry11_2_Ch2: ; 20ada (8:4ada) + dutycycle 10 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 + endchannel + + +SFX_Cry11_2_Ch3: ; 20afd (8:4afd) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm new file mode 100644 index 00000000..75b9a861 --- /dev/null +++ b/audio/sfx/cry11_3.asm @@ -0,0 +1,34 @@ +SFX_Cry11_3_Ch1: ; 7c888 (1f:4888) + dutycycle 240 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 + endchannel + + +SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7) + dutycycle 10 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 + endchannel + + +SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm new file mode 100644 index 00000000..a6b1a0f8 --- /dev/null +++ b/audio/sfx/cry12_1.asm @@ -0,0 +1,24 @@ +SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b) + dutycycle 165 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 + endchannel + + +SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e) + dutycycle 238 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 + endchannel + + +SFX_Cry12_1_Ch3: ; 8d51 (2:4d51) + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 + endchannel diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm new file mode 100644 index 00000000..e2b29de7 --- /dev/null +++ b/audio/sfx/cry12_2.asm @@ -0,0 +1,24 @@ +SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3) + dutycycle 165 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 + endchannel + + +SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6) + dutycycle 238 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 + endchannel + + +SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9) + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 + endchannel diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm new file mode 100644 index 00000000..143f8045 --- /dev/null +++ b/audio/sfx/cry12_3.asm @@ -0,0 +1,24 @@ +SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0) + dutycycle 165 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 + endchannel + + +SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3) + dutycycle 238 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 + endchannel + + +SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6) + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 + endchannel diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm new file mode 100644 index 00000000..c2f1002f --- /dev/null +++ b/audio/sfx/cry13_1.asm @@ -0,0 +1,30 @@ +SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e) + dutycycle 51 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 + endchannel + + +SFX_Cry13_1_Ch2: ; 8d79 (2:4d79) + dutycycle 153 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 + endchannel + + +SFX_Cry13_1_Ch3: ; 8d94 (2:4d94) + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm new file mode 100644 index 00000000..b072fb07 --- /dev/null +++ b/audio/sfx/cry13_2.asm @@ -0,0 +1,30 @@ +SFX_Cry13_2_Ch1: ; 21006 (8:5006) + dutycycle 51 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 + endchannel + + +SFX_Cry13_2_Ch2: ; 21021 (8:5021) + dutycycle 153 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 + endchannel + + +SFX_Cry13_2_Ch3: ; 2103c (8:503c) + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm new file mode 100644 index 00000000..f2c110b8 --- /dev/null +++ b/audio/sfx/cry13_3.asm @@ -0,0 +1,30 @@ +SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3) + dutycycle 51 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 + endchannel + + +SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee) + dutycycle 153 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 + endchannel + + +SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09) + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm new file mode 100644 index 00000000..125fe86e --- /dev/null +++ b/audio/sfx/cry14_1.asm @@ -0,0 +1,21 @@ +SFX_Cry14_1_Ch1: ; 8da7 (2:4da7) + dutycycle 240 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 + endchannel + + +SFX_Cry14_1_Ch2: ; 8db6 (2:4db6) + dutycycle 165 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 + endchannel + + +SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5) + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm new file mode 100644 index 00000000..3ba2ac26 --- /dev/null +++ b/audio/sfx/cry14_2.asm @@ -0,0 +1,21 @@ +SFX_Cry14_2_Ch1: ; 2104f (8:504f) + dutycycle 240 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 + endchannel + + +SFX_Cry14_2_Ch2: ; 2105e (8:505e) + dutycycle 165 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 + endchannel + + +SFX_Cry14_2_Ch3: ; 2106d (8:506d) + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm new file mode 100644 index 00000000..fe2cd1e8 --- /dev/null +++ b/audio/sfx/cry14_3.asm @@ -0,0 +1,21 @@ +SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c) + dutycycle 240 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 + endchannel + + +SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b) + dutycycle 165 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 + endchannel + + +SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a) + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm new file mode 100644 index 00000000..54f94deb --- /dev/null +++ b/audio/sfx/cry15_1.asm @@ -0,0 +1,30 @@ +SFX_Cry15_1_Ch1: ; 8e35 (2:4e35) + dutycycle 240 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 + endchannel + + +SFX_Cry15_1_Ch2: ; 8e50 (2:4e50) + dutycycle 90 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 + endchannel + + +SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b) + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 + endchannel diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm new file mode 100644 index 00000000..14b1af72 --- /dev/null +++ b/audio/sfx/cry15_2.asm @@ -0,0 +1,30 @@ +SFX_Cry15_2_Ch1: ; 210dd (8:50dd) + dutycycle 240 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 + endchannel + + +SFX_Cry15_2_Ch2: ; 210f8 (8:50f8) + dutycycle 90 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 + endchannel + + +SFX_Cry15_2_Ch3: ; 21113 (8:5113) + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 + endchannel diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm new file mode 100644 index 00000000..36951439 --- /dev/null +++ b/audio/sfx/cry15_3.asm @@ -0,0 +1,30 @@ +SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa) + dutycycle 240 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 + endchannel + + +SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5) + dutycycle 90 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 + endchannel + + +SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0) + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 + endchannel diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm new file mode 100644 index 00000000..91fa2596 --- /dev/null +++ b/audio/sfx/cry16_1.asm @@ -0,0 +1,21 @@ +SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8) + dutycycle 240 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 + endchannel + + +SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7) + dutycycle 90 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 + endchannel + + +SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6) + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 + endchannel diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm new file mode 100644 index 00000000..5e29eba8 --- /dev/null +++ b/audio/sfx/cry16_2.asm @@ -0,0 +1,21 @@ +SFX_Cry16_2_Ch1: ; 20f70 (8:4f70) + dutycycle 240 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 + endchannel + + +SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f) + dutycycle 90 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 + endchannel + + +SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e) + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 + endchannel diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm new file mode 100644 index 00000000..af32e9ef --- /dev/null +++ b/audio/sfx/cry16_3.asm @@ -0,0 +1,21 @@ +SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d) + dutycycle 240 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 + endchannel + + +SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c) + dutycycle 90 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 + endchannel + + +SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b) + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 + endchannel diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm new file mode 100644 index 00000000..2f2cde11 --- /dev/null +++ b/audio/sfx/cry17_1.asm @@ -0,0 +1,24 @@ +SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e) + dutycycle 15 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 + endchannel + + +SFX_Cry17_1_Ch2: ; 8e91 (2:4e91) + dutycycle 68 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 + endchannel + + +SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4) + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 + endchannel diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm new file mode 100644 index 00000000..cca78ae2 --- /dev/null +++ b/audio/sfx/cry17_2.asm @@ -0,0 +1,24 @@ +SFX_Cry17_2_Ch1: ; 21126 (8:5126) + dutycycle 15 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 + endchannel + + +SFX_Cry17_2_Ch2: ; 21139 (8:5139) + dutycycle 68 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 + endchannel + + +SFX_Cry17_2_Ch3: ; 2114c (8:514c) + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 + endchannel diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm new file mode 100644 index 00000000..6aad35d0 --- /dev/null +++ b/audio/sfx/cry17_3.asm @@ -0,0 +1,24 @@ +SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3) + dutycycle 15 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 + endchannel + + +SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06) + dutycycle 68 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 + endchannel + + +SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19) + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 + endchannel diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm new file mode 100644 index 00000000..576ea693 --- /dev/null +++ b/audio/sfx/cry18_1.asm @@ -0,0 +1,34 @@ +SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e) + dutycycle 80 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 + endchannel + + +SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1) + dutycycle 15 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 + endchannel + + +SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4) + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm new file mode 100644 index 00000000..333ddb9e --- /dev/null +++ b/audio/sfx/cry18_2.asm @@ -0,0 +1,34 @@ +SFX_Cry18_2_Ch1: ; 21236 (8:5236) + dutycycle 80 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 + endchannel + + +SFX_Cry18_2_Ch2: ; 21259 (8:5259) + dutycycle 15 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 + endchannel + + +SFX_Cry18_2_Ch3: ; 2127c (8:527c) + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm new file mode 100644 index 00000000..3c7b1a99 --- /dev/null +++ b/audio/sfx/cry18_3.asm @@ -0,0 +1,34 @@ +SFX_Cry18_3_Ch1: ; 7d003 (1f:5003) + dutycycle 80 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 + endchannel + + +SFX_Cry18_3_Ch2: ; 7d026 (1f:5026) + dutycycle 15 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 + endchannel + + +SFX_Cry18_3_Ch3: ; 7d049 (1f:5049) + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm new file mode 100644 index 00000000..94607b9b --- /dev/null +++ b/audio/sfx/cry19_1.asm @@ -0,0 +1,18 @@ +SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6) + dutycycle 27 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 + endchannel + + +SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5) + dutycycle 129 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 + + +SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7) + endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm new file mode 100644 index 00000000..717a5d2b --- /dev/null +++ b/audio/sfx/cry19_2.asm @@ -0,0 +1,18 @@ +SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e) + dutycycle 27 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 + endchannel + + +SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d) + dutycycle 129 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 + + +SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f) + endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm new file mode 100644 index 00000000..535be2b6 --- /dev/null +++ b/audio/sfx/cry19_3.asm @@ -0,0 +1,18 @@ +SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b) + dutycycle 27 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 + endchannel + + +SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a) + dutycycle 129 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 + + +SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c) + endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm new file mode 100644 index 00000000..0217deef --- /dev/null +++ b/audio/sfx/cry1a_1.asm @@ -0,0 +1,30 @@ +SFX_Cry1A_1_Ch1: ; 8eff (2:4eff) + dutycycle 240 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 + endchannel + + +SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a) + dutycycle 10 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 + endchannel + + +SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35) + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm new file mode 100644 index 00000000..c94fc657 --- /dev/null +++ b/audio/sfx/cry1a_2.asm @@ -0,0 +1,30 @@ +SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7) + dutycycle 240 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 + endchannel + + +SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2) + dutycycle 10 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 + endchannel + + +SFX_Cry1A_2_Ch3: ; 211dd (8:51dd) + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm new file mode 100644 index 00000000..29ff2ec0 --- /dev/null +++ b/audio/sfx/cry1a_3.asm @@ -0,0 +1,30 @@ +SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74) + dutycycle 240 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 + endchannel + + +SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f) + dutycycle 10 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 + endchannel + + +SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa) + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm new file mode 100644 index 00000000..858d724a --- /dev/null +++ b/audio/sfx/cry1b_1.asm @@ -0,0 +1,26 @@ +SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0) + dutycycle 240 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 + endchannel + + +SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07) + dutycycle 10 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 + endchannel + + +SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e) + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 + endchannel diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm new file mode 100644 index 00000000..423258ee --- /dev/null +++ b/audio/sfx/cry1b_2.asm @@ -0,0 +1,26 @@ +SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98) + dutycycle 240 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 + endchannel + + +SFX_Cry1B_2_Ch2: ; 20faf (8:4faf) + dutycycle 10 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 + endchannel + + +SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6) + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 + endchannel diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm new file mode 100644 index 00000000..7fe6019f --- /dev/null +++ b/audio/sfx/cry1b_3.asm @@ -0,0 +1,26 @@ +SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65) + dutycycle 240 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 + endchannel + + +SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c) + dutycycle 10 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 + endchannel + + +SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93) + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 + endchannel diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm new file mode 100644 index 00000000..f7e66dfb --- /dev/null +++ b/audio/sfx/cry1c_1.asm @@ -0,0 +1,31 @@ +SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1) + dutycycle 245 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 + endchannel + + +SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4) + dutycycle 68 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 + endchannel + + +SFX_Cry1C_1_Ch3: ; 8eef (2:4eef) + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 + endchannel diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm new file mode 100644 index 00000000..8037fc96 --- /dev/null +++ b/audio/sfx/cry1c_2.asm @@ -0,0 +1,31 @@ +SFX_Cry1C_2_Ch1: ; 21159 (8:5159) + dutycycle 245 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 + endchannel + + +SFX_Cry1C_2_Ch2: ; 2117c (8:517c) + dutycycle 68 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 + endchannel + + +SFX_Cry1C_2_Ch3: ; 21197 (8:5197) + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 + endchannel diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm new file mode 100644 index 00000000..853eb1c6 --- /dev/null +++ b/audio/sfx/cry1c_3.asm @@ -0,0 +1,31 @@ +SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26) + dutycycle 245 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 + endchannel + + +SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49) + dutycycle 68 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 + endchannel + + +SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64) + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 + endchannel diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm new file mode 100644 index 00000000..6e2818c1 --- /dev/null +++ b/audio/sfx/cry1d_1.asm @@ -0,0 +1,29 @@ +SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48) + dutycycle 244 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 + endchannel + + +SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63) + dutycycle 34 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 + endchannel + + +SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e) + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm new file mode 100644 index 00000000..c7a2c512 --- /dev/null +++ b/audio/sfx/cry1d_2.asm @@ -0,0 +1,29 @@ +SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0) + dutycycle 244 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 + endchannel + + +SFX_Cry1D_2_Ch2: ; 2120b (8:520b) + dutycycle 34 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 + endchannel + + +SFX_Cry1D_2_Ch3: ; 21226 (8:5226) + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm new file mode 100644 index 00000000..7210406c --- /dev/null +++ b/audio/sfx/cry1d_3.asm @@ -0,0 +1,29 @@ +SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd) + dutycycle 244 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 + endchannel + + +SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8) + dutycycle 34 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 + endchannel + + +SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3) + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm new file mode 100644 index 00000000..e445fdd7 --- /dev/null +++ b/audio/sfx/cry1e_1.asm @@ -0,0 +1,38 @@ +SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf) + dutycycle 240 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 + endchannel + + +SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2) + dutycycle 17 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 + endchannel + + +SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19) + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 + endchannel diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm new file mode 100644 index 00000000..59c9985f --- /dev/null +++ b/audio/sfx/cry1e_2.asm @@ -0,0 +1,38 @@ +SFX_Cry1E_2_Ch1: ; 21077 (8:5077) + dutycycle 240 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 + endchannel + + +SFX_Cry1E_2_Ch2: ; 2109a (8:509a) + dutycycle 17 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 + endchannel + + +SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1) + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 + endchannel diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm new file mode 100644 index 00000000..1c50d4b8 --- /dev/null +++ b/audio/sfx/cry1e_3.asm @@ -0,0 +1,38 @@ +SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44) + dutycycle 240 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 + endchannel + + +SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67) + dutycycle 17 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 + endchannel + + +SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e) + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 + endchannel diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm new file mode 100644 index 00000000..52be80df --- /dev/null +++ b/audio/sfx/cry1f_1.asm @@ -0,0 +1,24 @@ +SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7) + dutycycle 165 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 + endchannel + + +SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa) + dutycycle 204 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 + endchannel + + +SFX_Cry1F_1_Ch3: ; 900d (2:500d) + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 + endchannel diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm new file mode 100644 index 00000000..da7df61a --- /dev/null +++ b/audio/sfx/cry1f_2.asm @@ -0,0 +1,24 @@ +SFX_Cry1F_2_Ch1: ; 2128f (8:528f) + dutycycle 165 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 + endchannel + + +SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2) + dutycycle 204 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 + endchannel + + +SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5) + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 + endchannel diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm new file mode 100644 index 00000000..2f6c1eda --- /dev/null +++ b/audio/sfx/cry1f_3.asm @@ -0,0 +1,24 @@ +SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c) + dutycycle 165 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 + endchannel + + +SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f) + dutycycle 204 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 + endchannel + + +SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082) + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 + endchannel diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm new file mode 100644 index 00000000..d6586bdd --- /dev/null +++ b/audio/sfx/cry20_1.asm @@ -0,0 +1,24 @@ +SFX_Cry20_1_Ch1: ; 901a (2:501a) + dutycycle 240 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 + endchannel + + +SFX_Cry20_1_Ch2: ; 902d (2:502d) + dutycycle 21 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 + endchannel + + +SFX_Cry20_1_Ch3: ; 9040 (2:5040) + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 + endchannel diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm new file mode 100644 index 00000000..b345eba5 --- /dev/null +++ b/audio/sfx/cry20_2.asm @@ -0,0 +1,24 @@ +SFX_Cry20_2_Ch1: ; 212c2 (8:52c2) + dutycycle 240 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 + endchannel + + +SFX_Cry20_2_Ch2: ; 212d5 (8:52d5) + dutycycle 21 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 + endchannel + + +SFX_Cry20_2_Ch3: ; 212e8 (8:52e8) + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 + endchannel diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm new file mode 100644 index 00000000..5bcdf3df --- /dev/null +++ b/audio/sfx/cry20_3.asm @@ -0,0 +1,24 @@ +SFX_Cry20_3_Ch1: ; 7d08f (1f:508f) + dutycycle 240 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 + endchannel + + +SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2) + dutycycle 21 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 + endchannel + + +SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5) + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 + endchannel diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm new file mode 100644 index 00000000..9b81e2a3 --- /dev/null +++ b/audio/sfx/cry21_1.asm @@ -0,0 +1,27 @@ +SFX_Cry21_1_Ch1: ; 904d (2:504d) + dutycycle 27 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 + endchannel + + +SFX_Cry21_1_Ch2: ; 9070 (2:5070) + dutycycle 204 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 + + +SFX_Cry21_1_Ch3: ; 9092 (2:5092) + endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm new file mode 100644 index 00000000..f5571642 --- /dev/null +++ b/audio/sfx/cry21_2.asm @@ -0,0 +1,27 @@ +SFX_Cry21_2_Ch1: ; 212f5 (8:52f5) + dutycycle 27 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 + endchannel + + +SFX_Cry21_2_Ch2: ; 21318 (8:5318) + dutycycle 204 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 + + +SFX_Cry21_2_Ch3: ; 2133a (8:533a) + endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm new file mode 100644 index 00000000..d91177b8 --- /dev/null +++ b/audio/sfx/cry21_3.asm @@ -0,0 +1,27 @@ +SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2) + dutycycle 27 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 + endchannel + + +SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5) + dutycycle 204 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 + + +SFX_Cry21_3_Ch3: ; 7d107 (1f:5107) + endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm new file mode 100644 index 00000000..90961298 --- /dev/null +++ b/audio/sfx/cry22_1.asm @@ -0,0 +1,24 @@ +SFX_Cry22_1_Ch1: ; 9093 (2:5093) + dutycycle 17 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 + endchannel + + +SFX_Cry22_1_Ch2: ; 90a6 (2:50a6) + dutycycle 238 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 + endchannel + + +SFX_Cry22_1_Ch3: ; 90b9 (2:50b9) + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 + endchannel diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm new file mode 100644 index 00000000..861c3bfb --- /dev/null +++ b/audio/sfx/cry22_2.asm @@ -0,0 +1,24 @@ +SFX_Cry22_2_Ch1: ; 2133b (8:533b) + dutycycle 17 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 + endchannel + + +SFX_Cry22_2_Ch2: ; 2134e (8:534e) + dutycycle 238 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 + endchannel + + +SFX_Cry22_2_Ch3: ; 21361 (8:5361) + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 + endchannel diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm new file mode 100644 index 00000000..42b3039c --- /dev/null +++ b/audio/sfx/cry22_3.asm @@ -0,0 +1,24 @@ +SFX_Cry22_3_Ch1: ; 7d108 (1f:5108) + dutycycle 17 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 + endchannel + + +SFX_Cry22_3_Ch2: ; 7d11b (1f:511b) + dutycycle 238 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 + endchannel + + +SFX_Cry22_3_Ch3: ; 7d12e (1f:512e) + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 + endchannel diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm new file mode 100644 index 00000000..02868042 --- /dev/null +++ b/audio/sfx/cry23_1.asm @@ -0,0 +1,25 @@ +SFX_Cry23_1_Ch1: ; 8786 (2:4786) + dutycycle 240 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 + endchannel + + +SFX_Cry23_1_Ch2: ; 879d (2:479d) + dutycycle 95 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 + endchannel + + +SFX_Cry23_1_Ch3: ; 87b0 (2:47b0) + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm new file mode 100644 index 00000000..089a233c --- /dev/null +++ b/audio/sfx/cry23_2.asm @@ -0,0 +1,25 @@ +SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e) + dutycycle 240 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 + endchannel + + +SFX_Cry23_2_Ch2: ; 20a45 (8:4a45) + dutycycle 95 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 + endchannel + + +SFX_Cry23_2_Ch3: ; 20a58 (8:4a58) + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm new file mode 100644 index 00000000..31ba3743 --- /dev/null +++ b/audio/sfx/cry23_3.asm @@ -0,0 +1,25 @@ +SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb) + dutycycle 240 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 + endchannel + + +SFX_Cry23_3_Ch2: ; 7c812 (1f:4812) + dutycycle 95 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 + endchannel + + +SFX_Cry23_3_Ch3: ; 7c825 (1f:4825) + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm new file mode 100644 index 00000000..061ed65a --- /dev/null +++ b/audio/sfx/cry24_1.asm @@ -0,0 +1,33 @@ +SFX_Cry24_1_Ch1: ; 87bd (2:47bd) + dutycycle 240 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry24_1_Ch2: ; 87e0 (2:47e0) + dutycycle 5 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 + endchannel + + +SFX_Cry24_1_Ch3: ; 8803 (2:4803) + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm new file mode 100644 index 00000000..52986829 --- /dev/null +++ b/audio/sfx/cry24_2.asm @@ -0,0 +1,33 @@ +SFX_Cry24_2_Ch1: ; 20a65 (8:4a65) + dutycycle 240 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry24_2_Ch2: ; 20a88 (8:4a88) + dutycycle 5 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 + endchannel + + +SFX_Cry24_2_Ch3: ; 20aab (8:4aab) + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm new file mode 100644 index 00000000..8c9cfc81 --- /dev/null +++ b/audio/sfx/cry24_3.asm @@ -0,0 +1,33 @@ +SFX_Cry24_3_Ch1: ; 7c832 (1f:4832) + dutycycle 240 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry24_3_Ch2: ; 7c855 (1f:4855) + dutycycle 5 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 + endchannel + + +SFX_Cry24_3_Ch3: ; 7c878 (1f:4878) + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm new file mode 100644 index 00000000..ce238db2 --- /dev/null +++ b/audio/sfx/cry25_1.asm @@ -0,0 +1,26 @@ +SFX_Cry25_1_Ch1: ; 886b (2:486b) + dutycycle 165 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 + endchannel + + +SFX_Cry25_1_Ch2: ; 8882 (2:4882) + dutycycle 119 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 + endchannel + + +SFX_Cry25_1_Ch3: ; 8899 (2:4899) + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 + endchannel diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm new file mode 100644 index 00000000..b00210a9 --- /dev/null +++ b/audio/sfx/cry25_2.asm @@ -0,0 +1,26 @@ +SFX_Cry25_2_Ch1: ; 20b13 (8:4b13) + dutycycle 165 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 + endchannel + + +SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a) + dutycycle 119 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 + endchannel + + +SFX_Cry25_2_Ch3: ; 20b41 (8:4b41) + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 + endchannel diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm new file mode 100644 index 00000000..7c93b0e6 --- /dev/null +++ b/audio/sfx/cry25_3.asm @@ -0,0 +1,26 @@ +SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0) + dutycycle 165 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 + endchannel + + +SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7) + dutycycle 119 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 + endchannel + + +SFX_Cry25_3_Ch3: ; 7c90e (1f:490e) + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 + endchannel diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm new file mode 100644 index 00000000..c1b763e0 --- /dev/null +++ b/audio/sfx/cut_1.asm @@ -0,0 +1,7 @@ +SFX_Cut_1_Ch1: ; 83e1 (2:43e1) + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm new file mode 100644 index 00000000..4ad5551d --- /dev/null +++ b/audio/sfx/cut_3.asm @@ -0,0 +1,7 @@ +SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca) + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm new file mode 100644 index 00000000..d001b750 --- /dev/null +++ b/audio/sfx/cymbal1_1.asm @@ -0,0 +1,3 @@ +SFX_Cymbal1_1_Ch1: ; 833b (2:433b) + unknownnoise0x20 0, 161, 16 + endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm new file mode 100644 index 00000000..8987d85f --- /dev/null +++ b/audio/sfx/cymbal1_2.asm @@ -0,0 +1,3 @@ +SFX_Cymbal1_2_Ch1: ; 2033b (8:433b) + unknownnoise0x20 0, 161, 16 + endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm new file mode 100644 index 00000000..597a8b61 --- /dev/null +++ b/audio/sfx/cymbal1_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b) + unknownnoise0x20 0, 161, 16 + endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm new file mode 100644 index 00000000..3f50299a --- /dev/null +++ b/audio/sfx/cymbal2_1.asm @@ -0,0 +1,3 @@ +SFX_Cymbal2_1_Ch1: ; 833f (2:433f) + unknownnoise0x20 0, 162, 17 + endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm new file mode 100644 index 00000000..5224a20d --- /dev/null +++ b/audio/sfx/cymbal2_2.asm @@ -0,0 +1,3 @@ +SFX_Cymbal2_2_Ch1: ; 2033f (8:433f) + unknownnoise0x20 0, 162, 17 + endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm new file mode 100644 index 00000000..dd3a4fc9 --- /dev/null +++ b/audio/sfx/cymbal2_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f) + unknownnoise0x20 0, 162, 17 + endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm new file mode 100644 index 00000000..8aa5ebe5 --- /dev/null +++ b/audio/sfx/cymbal3_1.asm @@ -0,0 +1,3 @@ +SFX_Cymbal3_1_Ch1: ; 8343 (2:4343) + unknownnoise0x20 0, 162, 80 + endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm new file mode 100644 index 00000000..d1fd3b90 --- /dev/null +++ b/audio/sfx/cymbal3_2.asm @@ -0,0 +1,3 @@ +SFX_Cymbal3_2_Ch1: ; 20343 (8:4343) + unknownnoise0x20 0, 162, 80 + endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm new file mode 100644 index 00000000..45e41c15 --- /dev/null +++ b/audio/sfx/cymbal3_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343) + unknownnoise0x20 0, 162, 80 + endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm new file mode 100644 index 00000000..4022fcbf --- /dev/null +++ b/audio/sfx/damage.asm @@ -0,0 +1,5 @@ +SFX_Damage_Ch1: ; 204f4 (8:44f4) + unknownnoise0x20 2, 244, 68 + unknownnoise0x20 2, 244, 20 + unknownnoise0x20 15, 241, 50 + endchannel diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm new file mode 100644 index 00000000..46520151 --- /dev/null +++ b/audio/sfx/denied_1.asm @@ -0,0 +1,18 @@ +SFX_Denied_1_Ch1: ; 861f (2:461f) + duty 3 + unknownsfx0x10 90 + unknownsfx0x20 4, 240, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 1, 0, 0, 0 + endchannel + + +SFX_Denied_1_Ch2: ; 8636 (2:4636) + duty 3 + unknownsfx0x20 4, 240, 1, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 1, 4 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm new file mode 100644 index 00000000..2cebd766 --- /dev/null +++ b/audio/sfx/denied_3.asm @@ -0,0 +1,18 @@ +SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc) + duty 3 + unknownsfx0x10 90 + unknownsfx0x20 4, 240, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 1, 0, 0, 0 + endchannel + + +SFX_Denied_3_Ch2: ; 7c613 (1f:4613) + duty 3 + unknownsfx0x20 4, 240, 1, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 1, 4 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm new file mode 100644 index 00000000..dac55ed9 --- /dev/null +++ b/audio/sfx/dex_page_added.asm @@ -0,0 +1,15 @@ +SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f) + duty 2 + unknownsfx0x10 68 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel + + +SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490) + duty 2 + unknownsfx0x20 15, 146, 0, 6 + unknownsfx0x20 15, 146, 130, 7 + endchannel diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm new file mode 100644 index 00000000..0918238a --- /dev/null +++ b/audio/sfx/doubleslap.asm @@ -0,0 +1,4 @@ +SFX_Doubleslap_Ch1: ; 2058c (8:458c) + unknownnoise0x20 8, 241, 50 + unknownnoise0x20 8, 241, 51 + endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm new file mode 100644 index 00000000..5c1a189a --- /dev/null +++ b/audio/sfx/enter_pc_1.asm @@ -0,0 +1,7 @@ +SFX_Enter_PC_1_Ch1: ; 853b (2:453b) + duty 2 + unknownsfx0x20 6, 240, 0, 7 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 6, 240, 0, 7 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm new file mode 100644 index 00000000..5907a7e5 --- /dev/null +++ b/audio/sfx/enter_pc_3.asm @@ -0,0 +1,7 @@ +SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518) + duty 2 + unknownsfx0x20 4, 240, 0, 7 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 4, 240, 0, 7 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm new file mode 100644 index 00000000..c252b93a --- /dev/null +++ b/audio/sfx/faint_fall.asm @@ -0,0 +1,6 @@ +SFX_Faint_Fall_Ch1: ; 204ae (8:44ae) + duty 1 + unknownsfx0x10 175 + unknownsfx0x20 15, 242, 128, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm new file mode 100644 index 00000000..5ef100c5 --- /dev/null +++ b/audio/sfx/faint_thud.asm @@ -0,0 +1,11 @@ +SFX_Faint_Thud_Ch1: ; 2044c (8:444c) + unknownsfx0x20 15, 209, 0, 2 + unknownsfx0x10 8 + endchannel + + +SFX_Faint_Thud_Ch2: ; 20453 (8:4453) + unknownnoise0x20 4, 245, 51 + unknownnoise0x20 8, 244, 34 + unknownnoise0x20 15, 242, 33 + endchannel diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm new file mode 100644 index 00000000..c2ecf435 --- /dev/null +++ b/audio/sfx/fly_1.asm @@ -0,0 +1,18 @@ +SFX_Fly_1_Ch1: ; 85ee (2:45ee) + unknownnoise0x20 2, 241, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 161, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 209, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 129, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 177, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 97, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 145, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 65, 18 + unknownnoise0x20 2, 0, 0 + endchannel diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm new file mode 100644 index 00000000..043d4b51 --- /dev/null +++ b/audio/sfx/fly_3.asm @@ -0,0 +1,18 @@ +SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb) + unknownnoise0x20 2, 241, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 161, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 209, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 129, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 177, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 97, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 145, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 65, 18 + unknownnoise0x20 2, 0, 0 + endchannel diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm new file mode 100644 index 00000000..471124d7 --- /dev/null +++ b/audio/sfx/get_item1_1.asm @@ -0,0 +1,47 @@ +SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77) + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + + +SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + + +SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e) + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm new file mode 100644 index 00000000..6a7ebabc --- /dev/null +++ b/audio/sfx/get_item1_3.asm @@ -0,0 +1,47 @@ +SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850) + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + + +SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + + +SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877) + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm new file mode 100644 index 00000000..6fda3404 --- /dev/null +++ b/audio/sfx/get_item2_1.asm @@ -0,0 +1,69 @@ +SFX_Get_Item2_1_Ch1: ; b316 (2:7316) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + + +SFX_Get_Item2_1_Ch2: ; b335 (2:7335) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + + +SFX_Get_Item2_1_Ch3: ; b34d (2:734d) + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm new file mode 100644 index 00000000..25e40744 --- /dev/null +++ b/audio/sfx/get_item2_2.asm @@ -0,0 +1,69 @@ +SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + + +SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + + +SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe) + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm new file mode 100644 index 00000000..20a0ee04 --- /dev/null +++ b/audio/sfx/get_item2_3.asm @@ -0,0 +1,69 @@ +SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + + +SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + + +SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f) + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm new file mode 100644 index 00000000..233ea01b --- /dev/null +++ b/audio/sfx/get_key_item_1.asm @@ -0,0 +1,59 @@ +SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 10, 4 + octave 3 + A# 4 + notetype 5, 11, 1 + octave 4 + C_ 2 + C_ 1 + C_ 1 + notetype 5, 10, 4 + D# 4 + notetype 5, 11, 1 + F_ 2 + F_ 1 + F_ 1 + notetype 5, 11, 4 + A# 8 + endchannel + + +SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381) + executemusic + vibrato 4, 2, 3 + duty 2 + notetype 5, 13, 1 + octave 4 + G_ 2 + G_ 1 + G_ 1 + notetype 5, 12, 4 + D# 4 + notetype 5, 13, 1 + G# 2 + G# 1 + G# 1 + A# 2 + A# 1 + A# 1 + notetype 5, 12, 4 + octave 5 + D# 8 + endchannel + + +SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d) + executemusic + notetype 5, 1, 0 + octave 4 + D# 4 + G# 4 + G_ 4 + F_ 4 + D# 8 + endchannel diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm new file mode 100644 index 00000000..f918e1bf --- /dev/null +++ b/audio/sfx/get_key_item_3.asm @@ -0,0 +1,59 @@ +SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 10, 4 + octave 3 + A# 4 + notetype 5, 11, 1 + octave 4 + C_ 2 + C_ 1 + C_ 1 + notetype 5, 10, 4 + D# 4 + notetype 5, 11, 1 + F_ 2 + F_ 1 + F_ 1 + notetype 5, 11, 4 + A# 8 + endchannel + + +SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93) + executemusic + vibrato 4, 2, 3 + duty 2 + notetype 5, 13, 1 + octave 4 + G_ 2 + G_ 1 + G_ 1 + notetype 5, 12, 4 + D# 4 + notetype 5, 13, 1 + G# 2 + G# 1 + G# 1 + A# 2 + A# 1 + A# 1 + notetype 5, 12, 4 + octave 5 + D# 8 + endchannel + + +SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf) + executemusic + notetype 5, 1, 0 + octave 4 + D# 4 + G# 4 + G_ 4 + F_ 4 + D# 8 + endchannel diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm new file mode 100644 index 00000000..1eb1e2ca --- /dev/null +++ b/audio/sfx/go_inside_1.asm @@ -0,0 +1,4 @@ +SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1) + unknownnoise0x20 9, 241, 68 + unknownnoise0x20 8, 209, 67 + endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm new file mode 100644 index 00000000..d8e18b7d --- /dev/null +++ b/audio/sfx/go_inside_3.asm @@ -0,0 +1,4 @@ +SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da) + unknownnoise0x20 9, 241, 68 + unknownnoise0x20 8, 209, 67 + endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm new file mode 100644 index 00000000..2e8a8b31 --- /dev/null +++ b/audio/sfx/go_outside_1.asm @@ -0,0 +1,7 @@ +SFX_Go_Outside_1_Ch1: ; 8452 (2:4452) + unknownnoise0x20 2, 241, 84 + unknownnoise0x20 12, 113, 35 + unknownnoise0x20 2, 177, 84 + unknownnoise0x20 12, 97, 35 + unknownnoise0x20 6, 65, 84 + endchannel diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm new file mode 100644 index 00000000..2dc4242d --- /dev/null +++ b/audio/sfx/go_outside_3.asm @@ -0,0 +1,7 @@ +SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b) + unknownnoise0x20 2, 241, 84 + unknownnoise0x20 12, 113, 35 + unknownnoise0x20 2, 177, 84 + unknownnoise0x20 12, 97, 35 + unknownnoise0x20 6, 65, 84 + endchannel diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm new file mode 100644 index 00000000..5937f3a2 --- /dev/null +++ b/audio/sfx/heal_ailment_1.asm @@ -0,0 +1,9 @@ +SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9) + duty 2 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm new file mode 100644 index 00000000..4b39895a --- /dev/null +++ b/audio/sfx/heal_ailment_2.asm @@ -0,0 +1,9 @@ +SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd) + duty 2 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm new file mode 100644 index 00000000..b2805f3d --- /dev/null +++ b/audio/sfx/heal_ailment_3.asm @@ -0,0 +1,9 @@ +SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2) + duty 2 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm new file mode 100644 index 00000000..eb8063f7 --- /dev/null +++ b/audio/sfx/heal_hp_1.asm @@ -0,0 +1,7 @@ +SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7) + duty 2 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm new file mode 100644 index 00000000..890a2151 --- /dev/null +++ b/audio/sfx/heal_hp_2.asm @@ -0,0 +1,7 @@ +SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee) + duty 2 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm new file mode 100644 index 00000000..da80d48f --- /dev/null +++ b/audio/sfx/heal_hp_3.asm @@ -0,0 +1,7 @@ +SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490) + duty 2 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm new file mode 100644 index 00000000..4babf6b0 --- /dev/null +++ b/audio/sfx/healing_machine_1.asm @@ -0,0 +1,9 @@ +SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580) + duty 2 + unknownsfx0x10 44 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 2, 241, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm new file mode 100644 index 00000000..c72f7905 --- /dev/null +++ b/audio/sfx/healing_machine_3.asm @@ -0,0 +1,9 @@ +SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d) + duty 2 + unknownsfx0x10 44 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 2, 241, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm new file mode 100644 index 00000000..e68e5834 --- /dev/null +++ b/audio/sfx/horn_drill.asm @@ -0,0 +1,6 @@ +SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1) + unknownnoise0x20 3, 146, 49 + unknownnoise0x20 3, 178, 50 + unknownnoise0x20 3, 194, 51 + unknownnoise0x20 8, 241, 84 + endchannel diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm new file mode 100644 index 00000000..65e475f8 --- /dev/null +++ b/audio/sfx/intro_crash.asm @@ -0,0 +1,4 @@ +SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de) + unknownnoise0x20 2, 210, 50 + unknownnoise0x20 15, 242, 67 + endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm new file mode 100644 index 00000000..70d0f8b1 --- /dev/null +++ b/audio/sfx/intro_hip.asm @@ -0,0 +1,6 @@ +SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be) + duty 2 + unknownsfx0x10 38 + unknownsfx0x20 12, 194, 64, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm new file mode 100644 index 00000000..223c7f25 --- /dev/null +++ b/audio/sfx/intro_hop.asm @@ -0,0 +1,6 @@ +SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9) + duty 2 + unknownsfx0x10 38 + unknownsfx0x20 12, 194, 128, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm new file mode 100644 index 00000000..ad00f56f --- /dev/null +++ b/audio/sfx/intro_lunge.asm @@ -0,0 +1,10 @@ +SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5) + unknownnoise0x20 6, 32, 16 + unknownnoise0x20 6, 47, 64 + unknownnoise0x20 6, 79, 65 + unknownnoise0x20 6, 143, 65 + unknownnoise0x20 6, 207, 66 + unknownnoise0x20 8, 215, 66 + unknownnoise0x20 15, 231, 67 + unknownnoise0x20 15, 242, 67 + endchannel diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm new file mode 100644 index 00000000..d6ee1430 --- /dev/null +++ b/audio/sfx/intro_raise.asm @@ -0,0 +1,5 @@ +SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4) + unknownnoise0x20 2, 111, 33 + unknownnoise0x20 2, 175, 49 + unknownnoise0x20 15, 242, 65 + endchannel diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm new file mode 100644 index 00000000..903b7252 --- /dev/null +++ b/audio/sfx/intro_whoosh.asm @@ -0,0 +1,7 @@ +SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5) + unknownnoise0x20 4, 44, 32 + unknownnoise0x20 3, 160, 32 + unknownnoise0x20 3, 176, 33 + unknownnoise0x20 3, 192, 34 + unknownnoise0x20 15, 210, 36 + endchannel diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm new file mode 100644 index 00000000..dfd7c819 --- /dev/null +++ b/audio/sfx/ledge_1.asm @@ -0,0 +1,6 @@ +SFX_Ledge_1_Ch1: ; 85d6 (2:45d6) + duty 2 + unknownsfx0x10 149 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm new file mode 100644 index 00000000..2bf172e7 --- /dev/null +++ b/audio/sfx/ledge_3.asm @@ -0,0 +1,6 @@ +SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3) + duty 2 + unknownsfx0x10 149 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm new file mode 100644 index 00000000..03e077ec --- /dev/null +++ b/audio/sfx/level_up.asm @@ -0,0 +1,63 @@ +SFX_Level_Up_Ch1: ; 2397d (8:797d) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 6, 11, 4 + octave 4 + F_ 4 + notetype 4, 11, 2 + C_ 2 + F_ 2 + C_ 2 + notetype 6, 11, 3 + D# 2 + D# 2 + E_ 2 + notetype 6, 11, 4 + F_ 8 + endchannel + + +SFX_Level_Up_Ch2: ; 23998 (8:7998) + executemusic + vibrato 4, 2, 2 + duty 2 + notetype 6, 12, 4 + octave 4 + A_ 4 + notetype 4, 12, 2 + A_ 2 + A_ 2 + A_ 2 + notetype 6, 12, 4 + A# 2 + A# 2 + A# 2 + notetype 6, 12, 4 + A_ 8 + endchannel + + +SFX_Level_Up_Ch3: ; 239b0 (8:79b0) + executemusic + notetype 6, 1, 0 + octave 5 + A_ 4 + notetype 4, 1, 0 + F_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + notetype 6, 1, 0 + G_ 1 + rest 1 + D# 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm new file mode 100644 index 00000000..5d10ecc1 --- /dev/null +++ b/audio/sfx/muted_snare1_1.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347) + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 + endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm new file mode 100644 index 00000000..ea3cfc8c --- /dev/null +++ b/audio/sfx/muted_snare1_2.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347) + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 + endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm new file mode 100644 index 00000000..27caa37b --- /dev/null +++ b/audio/sfx/muted_snare1_3.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347) + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 + endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm new file mode 100644 index 00000000..7ab6252b --- /dev/null +++ b/audio/sfx/muted_snare2_1.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355) + unknownnoise0x20 0, 145, 34 + endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm new file mode 100644 index 00000000..a9359226 --- /dev/null +++ b/audio/sfx/muted_snare2_2.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355) + unknownnoise0x20 0, 145, 34 + endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm new file mode 100644 index 00000000..7ac9705d --- /dev/null +++ b/audio/sfx/muted_snare2_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355) + unknownnoise0x20 0, 145, 34 + endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm new file mode 100644 index 00000000..1cd27319 --- /dev/null +++ b/audio/sfx/muted_snare3_1.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359) + unknownnoise0x20 0, 113, 34 + endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm new file mode 100644 index 00000000..1606b6d5 --- /dev/null +++ b/audio/sfx/muted_snare3_2.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359) + unknownnoise0x20 0, 113, 34 + endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm new file mode 100644 index 00000000..c0fe7efb --- /dev/null +++ b/audio/sfx/muted_snare3_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359) + unknownnoise0x20 0, 113, 34 + endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm new file mode 100644 index 00000000..bcac6440 --- /dev/null +++ b/audio/sfx/muted_snare4_1.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d) + unknownnoise0x20 0, 97, 34 + endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm new file mode 100644 index 00000000..6910c20d --- /dev/null +++ b/audio/sfx/muted_snare4_2.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d) + unknownnoise0x20 0, 97, 34 + endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm new file mode 100644 index 00000000..52f14f21 --- /dev/null +++ b/audio/sfx/muted_snare4_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d) + unknownnoise0x20 0, 97, 34 + endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm new file mode 100644 index 00000000..959f33e3 --- /dev/null +++ b/audio/sfx/not_very_effective.asm @@ -0,0 +1,6 @@ +SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe) + unknownnoise0x20 4, 143, 85 + unknownnoise0x20 2, 244, 68 + unknownnoise0x20 8, 244, 34 + unknownnoise0x20 15, 242, 33 + endchannel diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm new file mode 100644 index 00000000..e4632281 --- /dev/null +++ b/audio/sfx/peck.asm @@ -0,0 +1,3 @@ +SFX_Peck_Ch1: ; 204aa (8:44aa) + unknownnoise0x20 2, 161, 18 + endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm new file mode 100644 index 00000000..4760696d --- /dev/null +++ b/audio/sfx/poisoned_1.asm @@ -0,0 +1,8 @@ +SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6) + duty 0 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + loopchannel 4, SFX_Poisoned_1_Ch1 + unknownsfx0x20 15, 243, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm new file mode 100644 index 00000000..b6d69dc6 --- /dev/null +++ b/audio/sfx/poisoned_3.asm @@ -0,0 +1,8 @@ +SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f) + duty 0 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + loopchannel 4, SFX_Poisoned_3_Ch1 + unknownsfx0x20 15, 243, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm new file mode 100644 index 00000000..21503d16 --- /dev/null +++ b/audio/sfx/pokedex_rating_1.asm @@ -0,0 +1,77 @@ +SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8) + executemusic + tempo 256 + volume 7, 7 + duty 2 + notetype 5, 11, 1 + octave 3 + A_ 2 + A_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 2 + A_ 2 + octave 4 + C_ 4 + E_ 4 + octave 3 + F_ 4 + endchannel + + +SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1) + executemusic + duty 2 + notetype 5, 12, 2 + octave 5 + F_ 2 + E_ 1 + rest 1 + D_ 2 + C_ 1 + rest 1 + octave 4 + A# 2 + octave 5 + C_ 2 + D_ 2 + E_ 2 + F_ 4 + G_ 4 + F_ 4 + endchannel + + +SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7) + executemusic + notetype 5, 1, 0 + octave 5 + C_ 1 + rest 1 + octave 4 + F_ 2 + octave 5 + C_ 1 + rest 1 + octave 4 + A# 1 + rest 1 + A_ 1 + rest 1 + G_ 1 + rest 1 + F_ 1 + rest 1 + E_ 1 + rest 1 + octave 5 + F_ 1 + rest 3 + C_ 1 + rest 3 + octave 4 + F_ 2 + rest 2 + endchannel diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm new file mode 100644 index 00000000..a9ea1c75 --- /dev/null +++ b/audio/sfx/pokedex_rating_3.asm @@ -0,0 +1,77 @@ +SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda) + executemusic + tempo 256 + volume 7, 7 + duty 2 + notetype 5, 11, 1 + octave 3 + A_ 2 + A_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 2 + A_ 2 + octave 4 + C_ 4 + E_ 4 + octave 3 + F_ 4 + endchannel + + +SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3) + executemusic + duty 2 + notetype 5, 12, 2 + octave 5 + F_ 2 + E_ 1 + rest 1 + D_ 2 + C_ 1 + rest 1 + octave 4 + A# 2 + octave 5 + C_ 2 + D_ 2 + E_ 2 + F_ 4 + G_ 4 + F_ 4 + endchannel + + +SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09) + executemusic + notetype 5, 1, 0 + octave 5 + C_ 1 + rest 1 + octave 4 + F_ 2 + octave 5 + C_ 1 + rest 1 + octave 4 + A# 1 + rest 1 + A_ 1 + rest 1 + G_ 1 + rest 1 + F_ 1 + rest 1 + E_ 1 + rest 1 + octave 5 + F_ 1 + rest 3 + C_ 1 + rest 3 + octave 4 + F_ 2 + rest 2 + endchannel diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm new file mode 100644 index 00000000..4abf1713 --- /dev/null +++ b/audio/sfx/pokeflute.asm @@ -0,0 +1,21 @@ +SFX_Pokeflute_Ch1: ; 83ca (2:43ca) + vibrato 16, 1, 4 + notetype 12, 1, 0 + octave 5 + E_ 2 + F_ 2 + G_ 4 + A_ 2 + G_ 2 + octave 6 + C_ 4 + C_ 2 + D_ 2 + C_ 2 + octave 5 + G_ 2 + A_ 2 + F_ 2 + G_ 8 + rest 12 + endchannel diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm new file mode 100644 index 00000000..102d7d6d --- /dev/null +++ b/audio/sfx/pound.asm @@ -0,0 +1,3 @@ +SFX_Pound_Ch1: ; 204c4 (8:44c4) + unknownnoise0x20 2, 161, 34 + endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm new file mode 100644 index 00000000..5925b788 --- /dev/null +++ b/audio/sfx/press_ab_1.asm @@ -0,0 +1,7 @@ +SFX_Press_AB_1_Ch1: ; 8462 (2:4462) + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm new file mode 100644 index 00000000..e15dadc4 --- /dev/null +++ b/audio/sfx/press_ab_2.asm @@ -0,0 +1,7 @@ +SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3) + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm new file mode 100644 index 00000000..8af4a335 --- /dev/null +++ b/audio/sfx/press_ab_3.asm @@ -0,0 +1,7 @@ +SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b) + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm new file mode 100644 index 00000000..65fcc229 --- /dev/null +++ b/audio/sfx/psybeam.asm @@ -0,0 +1,25 @@ +SFX_Psybeam_Ch1: ; 20759 (8:4759) + dutycycle 161 + unknownsfx0x20 10, 241, 64, 6 + unknownsfx0x20 10, 243, 128, 6 + unknownsfx0x20 10, 242, 32, 6 + loopchannel 4, SFX_Psybeam_Ch1 + unknownsfx0x20 10, 241, 64, 6 + endchannel + + +SFX_Psybeam_Ch2: ; 20770 (8:4770) + dutycycle 179 + unknownsfx0x20 10, 243, 113, 5 + unknownsfx0x20 7, 227, 49, 5 + unknownsfx0x20 10, 241, 81, 5 + loopchannel 4, SFX_Psybeam_Ch2 + unknownsfx0x20 10, 241, 113, 5 + endchannel + + +SFX_Psybeam_Ch3: ; 20787 (8:4787) + unknownnoise0x20 2, 209, 74 + unknownnoise0x20 2, 210, 42 + loopchannel 21, SFX_Psybeam_Ch3 + endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm new file mode 100644 index 00000000..e734b7ac --- /dev/null +++ b/audio/sfx/psychic_m.asm @@ -0,0 +1,32 @@ +SFX_Psychic_M_Ch1: ; 207fa (8:47fa) + duty 2 + unknownsfx0x10 247 + unknownsfx0x20 8, 196, 189, 7 + unknownsfx0x20 8, 196, 190, 7 + unknownsfx0x20 8, 196, 191, 7 + unknownsfx0x20 8, 196, 192, 7 + unknownsfx0x20 15, 196, 193, 7 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x10 8 + endchannel + + +SFX_Psychic_M_Ch2: ; 20819 (8:4819) + duty 2 + unknownsfx0x20 8, 196, 112, 7 + unknownsfx0x20 8, 196, 97, 7 + unknownsfx0x20 8, 196, 98, 7 + unknownsfx0x20 8, 196, 99, 7 + unknownsfx0x20 15, 196, 100, 7 + unknownsfx0x20 15, 242, 100, 7 + endchannel + + +SFX_Psychic_M_Ch3: ; 20834 (8:4834) + unknownnoise0x20 15, 63, 20 + unknownnoise0x20 15, 207, 19 + unknownnoise0x20 15, 207, 18 + unknownnoise0x20 15, 207, 17 + unknownnoise0x20 15, 207, 16 + unknownnoise0x20 15, 194, 16 + endchannel diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm new file mode 100644 index 00000000..fc0cecb5 --- /dev/null +++ b/audio/sfx/purchase_1.asm @@ -0,0 +1,13 @@ +SFX_Purchase_1_Ch1: ; 842d (2:442d) + duty 2 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 8, 242, 224, 7 + endchannel + + +SFX_Purchase_1_Ch2: ; 8438 (2:4438) + duty 2 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 145, 193, 6 + unknownsfx0x20 8, 162, 161, 7 + endchannel diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm new file mode 100644 index 00000000..5d649958 --- /dev/null +++ b/audio/sfx/purchase_3.asm @@ -0,0 +1,13 @@ +SFX_Purchase_3_Ch1: ; 7c416 (1f:4416) + duty 2 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 8, 242, 224, 7 + endchannel + + +SFX_Purchase_3_Ch2: ; 7c421 (1f:4421) + duty 2 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 145, 193, 6 + unknownsfx0x20 8, 162, 161, 7 + endchannel diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm new file mode 100644 index 00000000..31096861 --- /dev/null +++ b/audio/sfx/push_boulder_1.asm @@ -0,0 +1,10 @@ +SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654) + unknownnoise0x20 4, 162, 35 + unknownnoise0x20 8, 241, 52 + unknownnoise0x20 15, 0, 0 + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm new file mode 100644 index 00000000..ca7d2cd1 --- /dev/null +++ b/audio/sfx/push_boulder_3.asm @@ -0,0 +1,10 @@ +SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631) + unknownnoise0x20 4, 162, 35 + unknownnoise0x20 8, 241, 52 + unknownnoise0x20 15, 0, 0 + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm new file mode 100644 index 00000000..653b0f6b --- /dev/null +++ b/audio/sfx/run.asm @@ -0,0 +1,13 @@ +SFX_Run_Ch1: ; 2045d (8:445d) + unknownnoise0x20 2, 97, 35 + unknownnoise0x20 2, 161, 51 + unknownnoise0x20 2, 193, 51 + unknownnoise0x20 2, 81, 17 + unknownnoise0x20 2, 241, 51 + unknownnoise0x20 2, 65, 17 + unknownnoise0x20 2, 193, 51 + unknownnoise0x20 2, 49, 17 + unknownnoise0x20 2, 129, 51 + unknownnoise0x20 2, 49, 17 + unknownnoise0x20 8, 65, 51 + endchannel diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm new file mode 100644 index 00000000..fb8c4d1f --- /dev/null +++ b/audio/sfx/safari_zone_pa.asm @@ -0,0 +1,9 @@ +SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8) + duty 2 + unknownsfx0x20 15, 243, 48, 7 + unknownsfx0x20 8, 101, 48, 7 + unknownsfx0x20 15, 244, 0, 7 + unknownsfx0x20 15, 116, 0, 7 + unknownsfx0x20 15, 68, 0, 7 + unknownsfx0x20 15, 36, 0, 7 + endchannel diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm new file mode 100644 index 00000000..2e6c1f2b --- /dev/null +++ b/audio/sfx/save_1.asm @@ -0,0 +1,23 @@ +SFX_Save_1_Ch1: ; 8475 (2:4475) + duty 2 + unknownsfx0x20 4, 244, 0, 7 + unknownsfx0x20 2, 228, 0, 6 + unknownsfx0x20 2, 228, 128, 6 + unknownsfx0x20 2, 228, 192, 6 + unknownsfx0x20 2, 228, 0, 7 + unknownsfx0x20 2, 228, 160, 7 + unknownsfx0x20 15, 242, 224, 7 + endchannel + + +SFX_Save_1_Ch2: ; 8494 (2:4494) + duty 2 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 2, 212, 1, 7 + unknownsfx0x20 2, 196, 1, 6 + unknownsfx0x20 2, 196, 129, 6 + unknownsfx0x20 2, 196, 193, 6 + unknownsfx0x20 2, 196, 1, 7 + unknownsfx0x20 2, 196, 161, 7 + unknownsfx0x20 15, 210, 225, 7 + endchannel diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm new file mode 100644 index 00000000..47142bb4 --- /dev/null +++ b/audio/sfx/save_3.asm @@ -0,0 +1,36 @@ +SFX_Save_3_Ch1: ; 7c45e (1f:445e) + duty 2 +IF DEF(_RED) + unknownsfx0x20 4, 244, 0, 7 + unknownsfx0x20 3, 228, 128, 6 + unknownsfx0x20 3, 228, 192, 6 + unknownsfx0x20 3, 228, 0, 7 + unknownsfx0x20 2, 228, 160, 7 +ELSE + unknownsfx0x20 3, 228, 0, 6 + unknownsfx0x20 3, 228, 128, 6 + unknownsfx0x20 3, 228, 192, 6 + unknownsfx0x20 3, 228, 0, 7 + unknownsfx0x20 15, 242, 224, 7 +ENDC + endchannel + + +SFX_Save_3_Ch2: ; 7c475 (1f:4475) + duty 2 +IF DEF(_RED) + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 3, 212, 1, 7 + unknownsfx0x20 3, 196, 129, 6 + unknownsfx0x20 3, 196, 193, 6 + unknownsfx0x20 3, 196, 1, 7 + unknownsfx0x20 2, 196, 161, 7 +ELSE + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 3, 196, 1, 6 + unknownsfx0x20 3, 196, 129, 6 + unknownsfx0x20 3, 196, 193, 6 + unknownsfx0x20 3, 196, 1, 7 + unknownsfx0x20 15, 210, 225, 7 +ENDC + endchannel diff --git a/audio/sfx/sfx_02_01.asm b/audio/sfx/sfx_02_01.asm deleted file mode 100755 index 0de37099..00000000 --- a/audio/sfx/sfx_02_01.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_01_Ch1: ; 82fd (2:42fd) - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/sfx_02_02.asm b/audio/sfx/sfx_02_02.asm deleted file mode 100755 index ce8efcf0..00000000 --- a/audio/sfx/sfx_02_02.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_02_Ch1: ; 8301 (2:4301) - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/sfx_02_03.asm b/audio/sfx/sfx_02_03.asm deleted file mode 100755 index 3fc19143..00000000 --- a/audio/sfx/sfx_02_03.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_03_Ch1: ; 8305 (2:4305) - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/sfx_02_04.asm b/audio/sfx/sfx_02_04.asm deleted file mode 100755 index 35abd908..00000000 --- a/audio/sfx/sfx_02_04.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_04_Ch1: ; 8309 (2:4309) - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/sfx_02_05.asm b/audio/sfx/sfx_02_05.asm deleted file mode 100755 index 5aca7085..00000000 --- a/audio/sfx/sfx_02_05.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_02_05_Ch1: ; 830d (2:430d) - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/sfx_02_06.asm b/audio/sfx/sfx_02_06.asm deleted file mode 100755 index f2031c3f..00000000 --- a/audio/sfx/sfx_02_06.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_06_Ch1: ; 8320 (2:4320) - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/sfx_02_07.asm b/audio/sfx/sfx_02_07.asm deleted file mode 100755 index 58ae12fd..00000000 --- a/audio/sfx/sfx_02_07.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_07_Ch1: ; 8324 (2:4324) - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/sfx_02_08.asm b/audio/sfx/sfx_02_08.asm deleted file mode 100755 index 5a172e25..00000000 --- a/audio/sfx/sfx_02_08.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_08_Ch1: ; 832b (2:432b) - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/sfx_02_09.asm b/audio/sfx/sfx_02_09.asm deleted file mode 100755 index 47f85e16..00000000 --- a/audio/sfx/sfx_02_09.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_09_Ch1: ; 832f (2:432f) - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/sfx_02_0a.asm b/audio/sfx/sfx_02_0a.asm deleted file mode 100755 index 3d43afa9..00000000 --- a/audio/sfx/sfx_02_0a.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0a_Ch1: ; 8333 (2:4333) - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/sfx_02_0b.asm b/audio/sfx/sfx_02_0b.asm deleted file mode 100755 index 9c8d38ca..00000000 --- a/audio/sfx/sfx_02_0b.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0b_Ch1: ; 8337 (2:4337) - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/sfx_02_0c.asm b/audio/sfx/sfx_02_0c.asm deleted file mode 100755 index 4f3568e1..00000000 --- a/audio/sfx/sfx_02_0c.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0c_Ch1: ; 833b (2:433b) - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/sfx_02_0d.asm b/audio/sfx/sfx_02_0d.asm deleted file mode 100755 index 154b5c1e..00000000 --- a/audio/sfx/sfx_02_0d.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0d_Ch1: ; 833f (2:433f) - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/sfx_02_0e.asm b/audio/sfx/sfx_02_0e.asm deleted file mode 100755 index d1333575..00000000 --- a/audio/sfx/sfx_02_0e.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0e_Ch1: ; 8343 (2:4343) - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/sfx_02_0f.asm b/audio/sfx/sfx_02_0f.asm deleted file mode 100755 index 32156d7d..00000000 --- a/audio/sfx/sfx_02_0f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_0f_Ch1: ; 8347 (2:4347) - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/sfx_02_10.asm b/audio/sfx/sfx_02_10.asm deleted file mode 100755 index 61d57b01..00000000 --- a/audio/sfx/sfx_02_10.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_10_Ch1: ; 834e (2:434e) - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/sfx_02_11.asm b/audio/sfx/sfx_02_11.asm deleted file mode 100755 index f4bde465..00000000 --- a/audio/sfx/sfx_02_11.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_11_Ch1: ; 8355 (2:4355) - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/sfx_02_12.asm b/audio/sfx/sfx_02_12.asm deleted file mode 100755 index 908c3fb2..00000000 --- a/audio/sfx/sfx_02_12.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_12_Ch1: ; 8359 (2:4359) - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/sfx_02_13.asm b/audio/sfx/sfx_02_13.asm deleted file mode 100755 index bd985ab4..00000000 --- a/audio/sfx/sfx_02_13.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_13_Ch1: ; 835d (2:435d) - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/sfx_02_14.asm b/audio/sfx/sfx_02_14.asm deleted file mode 100755 index 3a289882..00000000 --- a/audio/sfx/sfx_02_14.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_14_Ch1: ; 8987 (2:4987) - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_02_14_Ch2: ; 8996 (2:4996) - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_02_14_Ch3: ; 89a5 (2:49a5) - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/sfx_02_15.asm b/audio/sfx/sfx_02_15.asm deleted file mode 100755 index 91b6c951..00000000 --- a/audio/sfx/sfx_02_15.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_15_Ch1: ; 8b97 (2:4b97) - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_02_15_Ch2: ; 8baa (2:4baa) - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_02_15_Ch3: ; 8bbd (2:4bbd) - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/sfx_02_16.asm b/audio/sfx/sfx_02_16.asm deleted file mode 100755 index fe15f6b6..00000000 --- a/audio/sfx/sfx_02_16.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_02_16_Ch1: ; 8b0c (2:4b0c) - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_02_16_Ch2: ; 8b1b (2:4b1b) - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_02_16_Ch3: ; 8b29 (2:4b29) - endchannel diff --git a/audio/sfx/sfx_02_17.asm b/audio/sfx/sfx_02_17.asm deleted file mode 100755 index ecc34899..00000000 --- a/audio/sfx/sfx_02_17.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_02_17_Ch1: ; 88a6 (2:48a6) - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_02_17_Ch2: ; 88c5 (2:48c5) - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_02_17_Ch3: ; 88e4 (2:48e4) - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_02_18.asm b/audio/sfx/sfx_02_18.asm deleted file mode 100755 index 73f8f41e..00000000 --- a/audio/sfx/sfx_02_18.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_02_18_Ch1: ; 8c55 (2:4c55) - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_02_18_Ch2: ; 8c74 (2:4c74) - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_02_18_Ch3: ; 8c93 (2:4c93) - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_02_19.asm b/audio/sfx/sfx_02_19.asm deleted file mode 100755 index d78b66b4..00000000 --- a/audio/sfx/sfx_02_19.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_02_19_Ch1: ; 8a35 (2:4a35) - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_02_19_Ch2: ; 8a48 (2:4a48) - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_02_19_Ch3: ; 8a5a (2:4a5a) - endchannel diff --git a/audio/sfx/sfx_02_1a.asm b/audio/sfx/sfx_02_1a.asm deleted file mode 100755 index 036703b5..00000000 --- a/audio/sfx/sfx_02_1a.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_02_1a_Ch1: ; 89df (2:49df) - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_02_1a_Ch2: ; 89f9 (2:49f9) - endchannel - - -SFX_02_1a_Ch3: ; 89fa (2:49fa) - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/sfx_02_1b.asm b/audio/sfx/sfx_02_1b.asm deleted file mode 100755 index 0e1112f6..00000000 --- a/audio/sfx/sfx_02_1b.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_1b_Ch1: ; 8a0d (2:4a0d) - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_02_1b_Ch2: ; 8a1c (2:4a1c) - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_02_1b_Ch3: ; 8a2b (2:4a2b) - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/sfx_02_1c.asm b/audio/sfx/sfx_02_1c.asm deleted file mode 100755 index 3a06819f..00000000 --- a/audio/sfx/sfx_02_1c.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_02_1c_Ch1: ; 8c25 (2:4c25) - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_02_1c_Ch2: ; 8c38 (2:4c38) - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_02_1c_Ch3: ; 8c4b (2:4c4b) - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_02_1d.asm b/audio/sfx/sfx_02_1d.asm deleted file mode 100755 index 1501e2ab..00000000 --- a/audio/sfx/sfx_02_1d.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_02_1d_Ch1: ; 872f (2:472f) - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_02_1d_Ch2: ; 874c (2:474c) - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_02_1d_Ch3: ; 876d (2:476d) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/sfx_02_1e.asm b/audio/sfx/sfx_02_1e.asm deleted file mode 100755 index 1036f953..00000000 --- a/audio/sfx/sfx_02_1e.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_02_1e_Ch1: ; 8bca (2:4bca) - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_02_1e_Ch2: ; 8be9 (2:4be9) - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_02_1e_Ch3: ; 8c0c (2:4c0c) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/sfx_02_1f.asm b/audio/sfx/sfx_02_1f.asm deleted file mode 100755 index 8f603856..00000000 --- a/audio/sfx/sfx_02_1f.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_02_1f_Ch1: ; 8a5b (2:4a5b) - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_02_1f_Ch2: ; 8a86 (2:4a86) - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_02_1f_Ch3: ; 8aa5 (2:4aa5) - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/sfx_02_20.asm b/audio/sfx/sfx_02_20.asm deleted file mode 100755 index 741ae0e8..00000000 --- a/audio/sfx/sfx_02_20.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_02_20_Ch1: ; 8abe (2:4abe) - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_02_20_Ch2: ; 8ae5 (2:4ae5) - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_02_20_Ch3: ; 8b0b (2:4b0b) - endchannel diff --git a/audio/sfx/sfx_02_21.asm b/audio/sfx/sfx_02_21.asm deleted file mode 100755 index 4c7bebee..00000000 --- a/audio/sfx/sfx_02_21.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_02_21_Ch1: ; 8b2a (2:4b2a) - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_02_21_Ch1 - endchannel - - -SFX_02_21_Ch2: ; 8b49 (2:4b49) - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_02_21_Ch3: ; 8b78 (2:4b78) - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/sfx_02_22.asm b/audio/sfx/sfx_02_22.asm deleted file mode 100755 index 6d4a8f7d..00000000 --- a/audio/sfx/sfx_02_22.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_02_22_Ch1: ; 89af (2:49af) - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_02_22_Ch2: ; 89c2 (2:49c2) - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_02_22_Ch3: ; 89d5 (2:49d5) - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/sfx_02_23.asm b/audio/sfx/sfx_02_23.asm deleted file mode 100755 index fb0ff58c..00000000 --- a/audio/sfx/sfx_02_23.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_02_23_Ch1: ; 88f1 (2:48f1) - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_02_23_Ch2: ; 890c (2:490c) - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_02_23_Ch3: ; 8927 (2:4927) - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/sfx_02_24.asm b/audio/sfx/sfx_02_24.asm deleted file mode 100755 index c1ff6fcc..00000000 --- a/audio/sfx/sfx_02_24.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_02_24_Ch1: ; 8937 (2:4937) - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_02_24_Ch2: ; 895a (2:495a) - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_02_24_Ch3: ; 897d (2:497d) - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/sfx_02_25.asm b/audio/sfx/sfx_02_25.asm deleted file mode 100755 index f324be84..00000000 --- a/audio/sfx/sfx_02_25.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_02_25_Ch1: ; 8813 (2:4813) - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_02_25_Ch2: ; 8832 (2:4832) - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_02_25_Ch3: ; 8855 (2:4855) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_02_26.asm b/audio/sfx/sfx_02_26.asm deleted file mode 100755 index 6ecd820f..00000000 --- a/audio/sfx/sfx_02_26.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_26_Ch1: ; 8d2b (2:4d2b) - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_02_26_Ch2: ; 8d3e (2:4d3e) - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_02_26_Ch3: ; 8d51 (2:4d51) - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/sfx_02_27.asm b/audio/sfx/sfx_02_27.asm deleted file mode 100755 index 2449cf89..00000000 --- a/audio/sfx/sfx_02_27.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_02_27_Ch1: ; 8d5e (2:4d5e) - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_02_27_Ch2: ; 8d79 (2:4d79) - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_02_27_Ch3: ; 8d94 (2:4d94) - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_02_28.asm b/audio/sfx/sfx_02_28.asm deleted file mode 100755 index bb872795..00000000 --- a/audio/sfx/sfx_02_28.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_28_Ch1: ; 8da7 (2:4da7) - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_02_28_Ch2: ; 8db6 (2:4db6) - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_02_28_Ch3: ; 8dc5 (2:4dc5) - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_02_29.asm b/audio/sfx/sfx_02_29.asm deleted file mode 100755 index 466a8bc8..00000000 --- a/audio/sfx/sfx_02_29.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_02_29_Ch1: ; 8e35 (2:4e35) - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_02_29_Ch2: ; 8e50 (2:4e50) - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_02_29_Ch3: ; 8e6b (2:4e6b) - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/sfx_02_2a.asm b/audio/sfx/sfx_02_2a.asm deleted file mode 100755 index 13356384..00000000 --- a/audio/sfx/sfx_02_2a.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_2a_Ch1: ; 8cc8 (2:4cc8) - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_02_2a_Ch2: ; 8cd7 (2:4cd7) - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_02_2a_Ch3: ; 8ce6 (2:4ce6) - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/sfx_02_2b.asm b/audio/sfx/sfx_02_2b.asm deleted file mode 100755 index 5aa42f68..00000000 --- a/audio/sfx/sfx_02_2b.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_2b_Ch1: ; 8e7e (2:4e7e) - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_02_2b_Ch2: ; 8e91 (2:4e91) - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_02_2b_Ch3: ; 8ea4 (2:4ea4) - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/sfx_02_2c.asm b/audio/sfx/sfx_02_2c.asm deleted file mode 100755 index 39f2a7da..00000000 --- a/audio/sfx/sfx_02_2c.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_02_2c_Ch1: ; 8f8e (2:4f8e) - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_02_2c_Ch2: ; 8fb1 (2:4fb1) - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_02_2c_Ch3: ; 8fd4 (2:4fd4) - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_02_2d.asm b/audio/sfx/sfx_02_2d.asm deleted file mode 100755 index 1e9ef3e5..00000000 --- a/audio/sfx/sfx_02_2d.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_02_2d_Ch1: ; 8ca6 (2:4ca6) - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_02_2d_Ch2: ; 8cb5 (2:4cb5) - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_02_2d_Ch3: ; 8cc7 (2:4cc7) - endchannel diff --git a/audio/sfx/sfx_02_2e.asm b/audio/sfx/sfx_02_2e.asm deleted file mode 100755 index d0c25b47..00000000 --- a/audio/sfx/sfx_02_2e.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_02_2e_Ch1: ; 8eff (2:4eff) - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_02_2e_Ch2: ; 8f1a (2:4f1a) - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_02_2e_Ch3: ; 8f35 (2:4f35) - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_02_2f.asm b/audio/sfx/sfx_02_2f.asm deleted file mode 100755 index ba0ecd23..00000000 --- a/audio/sfx/sfx_02_2f.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_02_2f_Ch1: ; 8cf0 (2:4cf0) - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_02_2f_Ch2: ; 8d07 (2:4d07) - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_02_2f_Ch3: ; 8d1e (2:4d1e) - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/sfx_02_30.asm b/audio/sfx/sfx_02_30.asm deleted file mode 100755 index 41a18486..00000000 --- a/audio/sfx/sfx_02_30.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_02_30_Ch1: ; 8eb1 (2:4eb1) - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_02_30_Ch2: ; 8ed4 (2:4ed4) - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_02_30_Ch3: ; 8eef (2:4eef) - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/sfx_02_31.asm b/audio/sfx/sfx_02_31.asm deleted file mode 100755 index 331413d3..00000000 --- a/audio/sfx/sfx_02_31.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_02_31_Ch1: ; 8f48 (2:4f48) - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_02_31_Ch2: ; 8f63 (2:4f63) - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_02_31_Ch3: ; 8f7e (2:4f7e) - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_02_32.asm b/audio/sfx/sfx_02_32.asm deleted file mode 100755 index a38da7fd..00000000 --- a/audio/sfx/sfx_02_32.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_02_32_Ch1: ; 8dcf (2:4dcf) - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_02_32_Ch2: ; 8df2 (2:4df2) - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_02_32_Ch3: ; 8e19 (2:4e19) - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/sfx_02_33.asm b/audio/sfx/sfx_02_33.asm deleted file mode 100755 index 555f9b14..00000000 --- a/audio/sfx/sfx_02_33.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_33_Ch1: ; 8fe7 (2:4fe7) - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_02_33_Ch2: ; 8ffa (2:4ffa) - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_02_33_Ch3: ; 900d (2:500d) - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/sfx_02_34.asm b/audio/sfx/sfx_02_34.asm deleted file mode 100755 index a8b21680..00000000 --- a/audio/sfx/sfx_02_34.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_34_Ch1: ; 901a (2:501a) - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_02_34_Ch2: ; 902d (2:502d) - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_02_34_Ch3: ; 9040 (2:5040) - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/sfx_02_35.asm b/audio/sfx/sfx_02_35.asm deleted file mode 100755 index 61b2a5ac..00000000 --- a/audio/sfx/sfx_02_35.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_02_35_Ch1: ; 904d (2:504d) - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_02_35_Ch2: ; 9070 (2:5070) - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_02_35_Ch3: ; 9092 (2:5092) - endchannel diff --git a/audio/sfx/sfx_02_36.asm b/audio/sfx/sfx_02_36.asm deleted file mode 100755 index 972f87a6..00000000 --- a/audio/sfx/sfx_02_36.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_36_Ch1: ; 9093 (2:5093) - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_02_36_Ch2: ; 90a6 (2:50a6) - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_02_36_Ch3: ; 90b9 (2:50b9) - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/sfx_02_37.asm b/audio/sfx/sfx_02_37.asm deleted file mode 100755 index c286b018..00000000 --- a/audio/sfx/sfx_02_37.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_02_37_Ch1: ; 8786 (2:4786) - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_02_37_Ch2: ; 879d (2:479d) - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_02_37_Ch3: ; 87b0 (2:47b0) - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_02_38.asm b/audio/sfx/sfx_02_38.asm deleted file mode 100755 index 9b6ba80f..00000000 --- a/audio/sfx/sfx_02_38.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_02_38_Ch1: ; 87bd (2:47bd) - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_02_38_Ch2: ; 87e0 (2:47e0) - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_02_38_Ch3: ; 8803 (2:4803) - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_02_39.asm b/audio/sfx/sfx_02_39.asm deleted file mode 100755 index 3d50aef5..00000000 --- a/audio/sfx/sfx_02_39.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_02_39_Ch1: ; 886b (2:486b) - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_02_39_Ch2: ; 8882 (2:4882) - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_02_39_Ch3: ; 8899 (2:4899) - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm deleted file mode 100755 index 96c93702..00000000 --- a/audio/sfx/sfx_02_3a.asm +++ /dev/null @@ -1,47 +0,0 @@ -SFX_02_3a_Ch1: ; ad77 (2:6d77) - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 - octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 - octave 4 - E_ 4 - endchannel - - -SFX_02_3a_Ch2: ; ad8e (2:6d8e) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 - octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel - - -SFX_02_3a_Ch3: ; ad9e (2:6d9e) - executemusic - notetype 4, 1, 0 - octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 - octave 4 - B_ 2 - rest 2 - endchannel diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm deleted file mode 100755 index 190b1299..00000000 --- a/audio/sfx/sfx_02_3b.asm +++ /dev/null @@ -1,69 +0,0 @@ -SFX_02_3b_Ch1: ; b316 (2:7316) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - - -SFX_02_3b_Ch2: ; b335 (2:7335) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - - -SFX_02_3b_Ch3: ; b34d (2:734d) - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/sfx_02_3c.asm b/audio/sfx/sfx_02_3c.asm deleted file mode 100755 index 95e2029d..00000000 --- a/audio/sfx/sfx_02_3c.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_02_3c_Ch1: ; 840a (2:440a) - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_3d.asm b/audio/sfx/sfx_02_3d.asm deleted file mode 100755 index 469776a4..00000000 --- a/audio/sfx/sfx_02_3d.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_3d_Ch1: ; 84b7 (2:44b7) - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_3e.asm b/audio/sfx/sfx_02_3e.asm deleted file mode 100755 index 36824962..00000000 --- a/audio/sfx/sfx_02_3e.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_02_3e_Ch1: ; 84d9 (2:44d9) - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_3f.asm b/audio/sfx/sfx_02_3f.asm deleted file mode 100755 index dffd99cb..00000000 --- a/audio/sfx/sfx_02_3f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_3f_Ch1: ; 83c3 (2:43c3) - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel diff --git a/audio/sfx/sfx_02_40.asm b/audio/sfx/sfx_02_40.asm deleted file mode 100755 index 2aa521b4..00000000 --- a/audio/sfx/sfx_02_40.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_40_Ch1: ; 8462 (2:4462) - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm deleted file mode 100755 index a21595f3..00000000 --- a/audio/sfx/sfx_02_41.asm +++ /dev/null @@ -1,77 +0,0 @@ -SFX_02_41_Ch1: ; b2c8 (2:72c8) - executemusic - tempo 256 - volume 7, 7 - duty 2 - notetype 5, 11, 1 - octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 - octave 4 - C_ 4 - E_ 4 - octave 3 - F_ 4 - endchannel - - -SFX_02_41_Ch2: ; b2e1 (2:72e1) - executemusic - duty 2 - notetype 5, 12, 2 - octave 5 - F_ 2 - E_ 1 - rest 1 - D_ 2 - C_ 1 - rest 1 - octave 4 - A# 2 - octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel - - -SFX_02_41_Ch3: ; b2f7 (2:72f7) - executemusic - notetype 5, 1, 0 - octave 5 - C_ 1 - rest 1 - octave 4 - F_ 2 - octave 5 - C_ 1 - rest 1 - octave 4 - A# 1 - rest 1 - A_ 1 - rest 1 - G_ 1 - rest 1 - F_ 1 - rest 1 - E_ 1 - rest 1 - octave 5 - F_ 1 - rest 3 - C_ 1 - rest 3 - octave 4 - F_ 2 - rest 2 - endchannel diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm deleted file mode 100755 index 9f997b36..00000000 --- a/audio/sfx/sfx_02_42.asm +++ /dev/null @@ -1,59 +0,0 @@ -SFX_02_42_Ch1: ; b362 (2:7362) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 - octave 3 - A# 4 - notetype 5, 11, 1 - octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel - - -SFX_02_42_Ch2: ; b381 (2:7381) - executemusic - vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 - octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 - octave 5 - D# 8 - endchannel - - -SFX_02_42_Ch3: ; b39d (2:739d) - executemusic - notetype 5, 1, 0 - octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel diff --git a/audio/sfx/sfx_02_43.asm b/audio/sfx/sfx_02_43.asm deleted file mode 100755 index 3bb6f7ed..00000000 --- a/audio/sfx/sfx_02_43.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_02_43_Ch1: ; 84c6 (2:44c6) - duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_02_43_Ch1 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_44.asm b/audio/sfx/sfx_02_44.asm deleted file mode 100755 index c03155d1..00000000 --- a/audio/sfx/sfx_02_44.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_44_Ch1: ; 84ee (2:44ee) - duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_45.asm b/audio/sfx/sfx_02_45.asm deleted file mode 100755 index a2b9f83d..00000000 --- a/audio/sfx/sfx_02_45.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_02_45_Ch1: ; 84fd (2:44fd) - duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 161, 128, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 64, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 128, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 192, 7 - unknownsfx0x20 8, 161, 0, 7 - endchannel diff --git a/audio/sfx/sfx_02_46.asm b/audio/sfx/sfx_02_46.asm deleted file mode 100755 index b75ef176..00000000 --- a/audio/sfx/sfx_02_46.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_46_Ch1: ; 8528 (2:4528) - duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_47.asm b/audio/sfx/sfx_02_47.asm deleted file mode 100755 index f498077c..00000000 --- a/audio/sfx/sfx_02_47.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_47_Ch1: ; 853b (2:453b) - duty 2 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_48.asm b/audio/sfx/sfx_02_48.asm deleted file mode 100755 index e22443cc..00000000 --- a/audio/sfx/sfx_02_48.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_02_48_Ch1: ; 854e (2:454e) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_49.asm b/audio/sfx/sfx_02_49.asm deleted file mode 100755 index 6cf3e647..00000000 --- a/audio/sfx/sfx_02_49.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_02_49_Ch1: ; 8569 (2:4569) - duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_4a.asm b/audio/sfx/sfx_02_4a.asm deleted file mode 100755 index 1cb0e857..00000000 --- a/audio/sfx/sfx_02_4a.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_02_4a_Ch1: ; 8580 (2:4580) - duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_4b.asm b/audio/sfx/sfx_02_4b.asm deleted file mode 100755 index 173a6c9d..00000000 --- a/audio/sfx/sfx_02_4b.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_02_4b_Ch1: ; 8595 (2:4595) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_4c.asm b/audio/sfx/sfx_02_4c.asm deleted file mode 100755 index a52fefcf..00000000 --- a/audio/sfx/sfx_02_4c.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_02_4c_Ch1: ; 85b0 (2:45b0) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_4d.asm b/audio/sfx/sfx_02_4d.asm deleted file mode 100755 index c7063722..00000000 --- a/audio/sfx/sfx_02_4d.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_4d_Ch1: ; 85cb (2:45cb) - duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_4e.asm b/audio/sfx/sfx_02_4e.asm deleted file mode 100755 index 78b64198..00000000 --- a/audio/sfx/sfx_02_4e.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_4e_Ch1: ; 85d6 (2:45d6) - duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_4f.asm b/audio/sfx/sfx_02_4f.asm deleted file mode 100755 index 53e523d0..00000000 --- a/audio/sfx/sfx_02_4f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_4f_Ch1: ; 85e1 (2:45e1) - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_50.asm b/audio/sfx/sfx_02_50.asm deleted file mode 100755 index 5a5cd2b6..00000000 --- a/audio/sfx/sfx_02_50.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_02_50_Ch1: ; 85ee (2:45ee) - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_51.asm b/audio/sfx/sfx_02_51.asm deleted file mode 100755 index cb55b512..00000000 --- a/audio/sfx/sfx_02_51.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_02_51_Ch1: ; 861f (2:461f) - duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 - endchannel - - -SFX_02_51_Ch2: ; 8636 (2:4636) - duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_52.asm b/audio/sfx/sfx_02_52.asm deleted file mode 100755 index 22b72929..00000000 --- a/audio/sfx/sfx_02_52.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_52_Ch1: ; 8649 (2:4649) - duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_53.asm b/audio/sfx/sfx_02_53.asm deleted file mode 100755 index e81724b0..00000000 --- a/audio/sfx/sfx_02_53.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_02_53_Ch1: ; 8654 (2:4654) - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_02_54.asm b/audio/sfx/sfx_02_54.asm deleted file mode 100755 index 72f79c78..00000000 --- a/audio/sfx/sfx_02_54.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_02_54_Ch1: ; 866d (2:466d) - duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 - endchannel - - -SFX_02_54_Ch2: ; 868c (2:468c) - duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 - endchannel diff --git a/audio/sfx/sfx_02_55.asm b/audio/sfx/sfx_02_55.asm deleted file mode 100755 index 57182f34..00000000 --- a/audio/sfx/sfx_02_55.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_02_55_Ch1: ; 86ab (2:46ab) - duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_56.asm b/audio/sfx/sfx_02_56.asm deleted file mode 100755 index d27fba19..00000000 --- a/audio/sfx/sfx_02_56.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_56_Ch1: ; 83e1 (2:43e1) - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_02_57.asm b/audio/sfx/sfx_02_57.asm deleted file mode 100755 index 8f8d06e2..00000000 --- a/audio/sfx/sfx_02_57.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_57_Ch1: ; 83f1 (2:43f1) - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 - endchannel diff --git a/audio/sfx/sfx_02_58.asm b/audio/sfx/sfx_02_58.asm deleted file mode 100755 index 3a9836fb..00000000 --- a/audio/sfx/sfx_02_58.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_02_58_Ch1: ; 83f8 (2:43f8) - duty 2 - unknownsfx0x20 8, 225, 64, 7 - endchannel - - -SFX_02_58_Ch2: ; 83ff (2:43ff) - duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 - endchannel diff --git a/audio/sfx/sfx_02_59.asm b/audio/sfx/sfx_02_59.asm deleted file mode 100755 index c4ea93f7..00000000 --- a/audio/sfx/sfx_02_59.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_02_59_Ch1: ; 841b (2:441b) - duty 2 - unknownsfx0x20 4, 241, 128, 7 - endchannel - - -SFX_02_59_Ch2: ; 8422 (2:4422) - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 - endchannel diff --git a/audio/sfx/sfx_02_5a.asm b/audio/sfx/sfx_02_5a.asm deleted file mode 100755 index d0d6f875..00000000 --- a/audio/sfx/sfx_02_5a.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_02_5a_Ch1: ; 842d (2:442d) - duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 - endchannel - - -SFX_02_5a_Ch2: ; 8438 (2:4438) - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 - endchannel diff --git a/audio/sfx/sfx_02_5b.asm b/audio/sfx/sfx_02_5b.asm deleted file mode 100755 index b09369db..00000000 --- a/audio/sfx/sfx_02_5b.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_5b_Ch1: ; 8447 (2:4447) - duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_5c.asm b/audio/sfx/sfx_02_5c.asm deleted file mode 100755 index 477fd03b..00000000 --- a/audio/sfx/sfx_02_5c.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_5c_Ch1: ; 8452 (2:4452) - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 - endchannel diff --git a/audio/sfx/sfx_02_5d.asm b/audio/sfx/sfx_02_5d.asm deleted file mode 100755 index 2411c9ee..00000000 --- a/audio/sfx/sfx_02_5d.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_02_5d_Ch1: ; 8475 (2:4475) - duty 2 - unknownsfx0x20 4, 244, 0, 7 - unknownsfx0x20 2, 228, 0, 6 - unknownsfx0x20 2, 228, 128, 6 - unknownsfx0x20 2, 228, 192, 6 - unknownsfx0x20 2, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 - unknownsfx0x20 15, 242, 224, 7 - endchannel - - -SFX_02_5d_Ch2: ; 8494 (2:4494) - duty 2 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 2, 212, 1, 7 - unknownsfx0x20 2, 196, 1, 6 - unknownsfx0x20 2, 196, 129, 6 - unknownsfx0x20 2, 196, 193, 6 - unknownsfx0x20 2, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 - unknownsfx0x20 15, 210, 225, 7 - endchannel diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/sfx_02_5e.asm deleted file mode 100755 index 5f631c2d..00000000 --- a/audio/sfx/sfx_02_5e.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_5e_Ch1: ; 83ca (2:43ca) - vibrato 16, 1, 4 - notetype 12, 1, 0 - octave 5 - E_ 2 - F_ 2 - G_ 4 - A_ 2 - G_ 2 - octave 6 - C_ 4 - C_ 2 - D_ 2 - C_ 2 - octave 5 - G_ 2 - A_ 2 - F_ 2 - G_ 8 - rest 12 - endchannel diff --git a/audio/sfx/sfx_02_5f.asm b/audio/sfx/sfx_02_5f.asm deleted file mode 100755 index c4fe674c..00000000 --- a/audio/sfx/sfx_02_5f.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_02_5f_Ch1: ; 86c8 (2:46c8) - duty 2 - unknownsfx0x20 15, 243, 48, 7 - unknownsfx0x20 8, 101, 48, 7 - unknownsfx0x20 15, 244, 0, 7 - unknownsfx0x20 15, 116, 0, 7 - unknownsfx0x20 15, 68, 0, 7 - unknownsfx0x20 15, 36, 0, 7 - endchannel diff --git a/audio/sfx/sfx_08_01.asm b/audio/sfx/sfx_08_01.asm deleted file mode 100755 index 7d86e4ad..00000000 --- a/audio/sfx/sfx_08_01.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_01_Ch1: ; 202fd (8:42fd) - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/sfx_08_02.asm b/audio/sfx/sfx_08_02.asm deleted file mode 100755 index 1fe0d185..00000000 --- a/audio/sfx/sfx_08_02.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_02_Ch1: ; 20301 (8:4301) - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/sfx_08_03.asm b/audio/sfx/sfx_08_03.asm deleted file mode 100755 index 141c4e5b..00000000 --- a/audio/sfx/sfx_08_03.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_03_Ch1: ; 20305 (8:4305) - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/sfx_08_04.asm b/audio/sfx/sfx_08_04.asm deleted file mode 100755 index 923fd349..00000000 --- a/audio/sfx/sfx_08_04.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_04_Ch1: ; 20309 (8:4309) - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/sfx_08_05.asm b/audio/sfx/sfx_08_05.asm deleted file mode 100755 index 54745d1f..00000000 --- a/audio/sfx/sfx_08_05.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_08_05_Ch1: ; 2030d (8:430d) - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/sfx_08_06.asm b/audio/sfx/sfx_08_06.asm deleted file mode 100755 index ecd2b191..00000000 --- a/audio/sfx/sfx_08_06.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_06_Ch1: ; 20320 (8:4320) - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/sfx_08_07.asm b/audio/sfx/sfx_08_07.asm deleted file mode 100755 index a520de0d..00000000 --- a/audio/sfx/sfx_08_07.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_07_Ch1: ; 20324 (8:4324) - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/sfx_08_08.asm b/audio/sfx/sfx_08_08.asm deleted file mode 100755 index 6def0c55..00000000 --- a/audio/sfx/sfx_08_08.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_08_Ch1: ; 2032b (8:432b) - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/sfx_08_09.asm b/audio/sfx/sfx_08_09.asm deleted file mode 100755 index c49c5cb7..00000000 --- a/audio/sfx/sfx_08_09.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_09_Ch1: ; 2032f (8:432f) - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/sfx_08_0a.asm b/audio/sfx/sfx_08_0a.asm deleted file mode 100755 index f5f2ab3c..00000000 --- a/audio/sfx/sfx_08_0a.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0a_Ch1: ; 20333 (8:4333) - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/sfx_08_0b.asm b/audio/sfx/sfx_08_0b.asm deleted file mode 100755 index 2d45ef7e..00000000 --- a/audio/sfx/sfx_08_0b.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0b_Ch1: ; 20337 (8:4337) - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/sfx_08_0c.asm b/audio/sfx/sfx_08_0c.asm deleted file mode 100755 index 782ecf90..00000000 --- a/audio/sfx/sfx_08_0c.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0c_Ch1: ; 2033b (8:433b) - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/sfx_08_0d.asm b/audio/sfx/sfx_08_0d.asm deleted file mode 100755 index d9ef41d0..00000000 --- a/audio/sfx/sfx_08_0d.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0d_Ch1: ; 2033f (8:433f) - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/sfx_08_0e.asm b/audio/sfx/sfx_08_0e.asm deleted file mode 100755 index 885225ea..00000000 --- a/audio/sfx/sfx_08_0e.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0e_Ch1: ; 20343 (8:4343) - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/sfx_08_0f.asm b/audio/sfx/sfx_08_0f.asm deleted file mode 100755 index 64f1cbe4..00000000 --- a/audio/sfx/sfx_08_0f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_0f_Ch1: ; 20347 (8:4347) - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/sfx_08_10.asm b/audio/sfx/sfx_08_10.asm deleted file mode 100755 index 3643a769..00000000 --- a/audio/sfx/sfx_08_10.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_10_Ch1: ; 2034e (8:434e) - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/sfx_08_11.asm b/audio/sfx/sfx_08_11.asm deleted file mode 100755 index bec0220f..00000000 --- a/audio/sfx/sfx_08_11.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_11_Ch1: ; 20355 (8:4355) - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/sfx_08_12.asm b/audio/sfx/sfx_08_12.asm deleted file mode 100755 index 7e93326b..00000000 --- a/audio/sfx/sfx_08_12.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_12_Ch1: ; 20359 (8:4359) - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/sfx_08_13.asm b/audio/sfx/sfx_08_13.asm deleted file mode 100755 index 7feb8deb..00000000 --- a/audio/sfx/sfx_08_13.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_13_Ch1: ; 2035d (8:435d) - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/sfx_08_14.asm b/audio/sfx/sfx_08_14.asm deleted file mode 100755 index 83837768..00000000 --- a/audio/sfx/sfx_08_14.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_14_Ch1: ; 20c2f (8:4c2f) - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_08_14_Ch2: ; 20c3e (8:4c3e) - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_08_14_Ch3: ; 20c4d (8:4c4d) - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/sfx_08_15.asm b/audio/sfx/sfx_08_15.asm deleted file mode 100755 index 94705f71..00000000 --- a/audio/sfx/sfx_08_15.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_15_Ch1: ; 20e3f (8:4e3f) - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_08_15_Ch2: ; 20e52 (8:4e52) - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_08_15_Ch3: ; 20e65 (8:4e65) - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/sfx_08_16.asm b/audio/sfx/sfx_08_16.asm deleted file mode 100755 index e2109f2b..00000000 --- a/audio/sfx/sfx_08_16.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_08_16_Ch1: ; 20db4 (8:4db4) - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_08_16_Ch2: ; 20dc3 (8:4dc3) - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_08_16_Ch3: ; 20dd1 (8:4dd1) - endchannel diff --git a/audio/sfx/sfx_08_17.asm b/audio/sfx/sfx_08_17.asm deleted file mode 100755 index c8efc25f..00000000 --- a/audio/sfx/sfx_08_17.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_08_17_Ch1: ; 20b4e (8:4b4e) - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_08_17_Ch2: ; 20b6d (8:4b6d) - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_08_17_Ch3: ; 20b8c (8:4b8c) - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_08_18.asm b/audio/sfx/sfx_08_18.asm deleted file mode 100755 index fce2f3e8..00000000 --- a/audio/sfx/sfx_08_18.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_08_18_Ch1: ; 20efd (8:4efd) - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_08_18_Ch2: ; 20f1c (8:4f1c) - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_08_18_Ch3: ; 20f3b (8:4f3b) - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_08_19.asm b/audio/sfx/sfx_08_19.asm deleted file mode 100755 index ad3a22ad..00000000 --- a/audio/sfx/sfx_08_19.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_08_19_Ch1: ; 20cdd (8:4cdd) - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_08_19_Ch2: ; 20cf0 (8:4cf0) - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_08_19_Ch3: ; 20d02 (8:4d02) - endchannel diff --git a/audio/sfx/sfx_08_1a.asm b/audio/sfx/sfx_08_1a.asm deleted file mode 100755 index 96df0f42..00000000 --- a/audio/sfx/sfx_08_1a.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_08_1a_Ch1: ; 20c87 (8:4c87) - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_08_1a_Ch2: ; 20ca1 (8:4ca1) - endchannel - - -SFX_08_1a_Ch3: ; 20ca2 (8:4ca2) - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/sfx_08_1b.asm b/audio/sfx/sfx_08_1b.asm deleted file mode 100755 index bd7e288f..00000000 --- a/audio/sfx/sfx_08_1b.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_1b_Ch1: ; 20cb5 (8:4cb5) - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_08_1b_Ch2: ; 20cc4 (8:4cc4) - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_08_1b_Ch3: ; 20cd3 (8:4cd3) - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/sfx_08_1c.asm b/audio/sfx/sfx_08_1c.asm deleted file mode 100755 index e3b904b0..00000000 --- a/audio/sfx/sfx_08_1c.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_08_1c_Ch1: ; 20ecd (8:4ecd) - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_08_1c_Ch2: ; 20ee0 (8:4ee0) - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_08_1c_Ch3: ; 20ef3 (8:4ef3) - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_08_1d.asm b/audio/sfx/sfx_08_1d.asm deleted file mode 100755 index a6f82cf2..00000000 --- a/audio/sfx/sfx_08_1d.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_08_1d_Ch1: ; 209d7 (8:49d7) - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_08_1d_Ch2: ; 209f4 (8:49f4) - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_08_1d_Ch3: ; 20a15 (8:4a15) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/sfx_08_1e.asm b/audio/sfx/sfx_08_1e.asm deleted file mode 100755 index 1312f6f2..00000000 --- a/audio/sfx/sfx_08_1e.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_08_1e_Ch1: ; 20e72 (8:4e72) - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_08_1e_Ch2: ; 20e91 (8:4e91) - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_08_1e_Ch3: ; 20eb4 (8:4eb4) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/sfx_08_1f.asm b/audio/sfx/sfx_08_1f.asm deleted file mode 100755 index ab708929..00000000 --- a/audio/sfx/sfx_08_1f.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_08_1f_Ch1: ; 20d03 (8:4d03) - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_08_1f_Ch2: ; 20d2e (8:4d2e) - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_08_1f_Ch3: ; 20d4d (8:4d4d) - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/sfx_08_20.asm b/audio/sfx/sfx_08_20.asm deleted file mode 100755 index 633276a8..00000000 --- a/audio/sfx/sfx_08_20.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_08_20_Ch1: ; 20d66 (8:4d66) - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_08_20_Ch2: ; 20d8d (8:4d8d) - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_08_20_Ch3: ; 20db3 (8:4db3) - endchannel diff --git a/audio/sfx/sfx_08_21.asm b/audio/sfx/sfx_08_21.asm deleted file mode 100755 index 5279435a..00000000 --- a/audio/sfx/sfx_08_21.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_08_21_Ch1: ; 20dd2 (8:4dd2) - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_08_21_Ch1 - endchannel - - -SFX_08_21_Ch2: ; 20df1 (8:4df1) - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_08_21_Ch3: ; 20e20 (8:4e20) - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/sfx_08_22.asm b/audio/sfx/sfx_08_22.asm deleted file mode 100755 index 6a54311f..00000000 --- a/audio/sfx/sfx_08_22.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_08_22_Ch1: ; 20c57 (8:4c57) - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_08_22_Ch2: ; 20c6a (8:4c6a) - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_08_22_Ch3: ; 20c7d (8:4c7d) - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/sfx_08_23.asm b/audio/sfx/sfx_08_23.asm deleted file mode 100755 index 03b63546..00000000 --- a/audio/sfx/sfx_08_23.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_08_23_Ch1: ; 20b99 (8:4b99) - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_08_23_Ch2: ; 20bb4 (8:4bb4) - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_08_23_Ch3: ; 20bcf (8:4bcf) - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/sfx_08_24.asm b/audio/sfx/sfx_08_24.asm deleted file mode 100755 index f94e2535..00000000 --- a/audio/sfx/sfx_08_24.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_08_24_Ch1: ; 20bdf (8:4bdf) - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_08_24_Ch2: ; 20c02 (8:4c02) - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_08_24_Ch3: ; 20c25 (8:4c25) - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/sfx_08_25.asm b/audio/sfx/sfx_08_25.asm deleted file mode 100755 index 55954029..00000000 --- a/audio/sfx/sfx_08_25.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_08_25_Ch1: ; 20abb (8:4abb) - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_08_25_Ch2: ; 20ada (8:4ada) - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_08_25_Ch3: ; 20afd (8:4afd) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_08_26.asm b/audio/sfx/sfx_08_26.asm deleted file mode 100755 index c166605b..00000000 --- a/audio/sfx/sfx_08_26.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_26_Ch1: ; 20fd3 (8:4fd3) - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_08_26_Ch2: ; 20fe6 (8:4fe6) - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_08_26_Ch3: ; 20ff9 (8:4ff9) - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/sfx_08_27.asm b/audio/sfx/sfx_08_27.asm deleted file mode 100755 index 9443379c..00000000 --- a/audio/sfx/sfx_08_27.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_08_27_Ch1: ; 21006 (8:5006) - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_08_27_Ch2: ; 21021 (8:5021) - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_08_27_Ch3: ; 2103c (8:503c) - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_08_28.asm b/audio/sfx/sfx_08_28.asm deleted file mode 100755 index 178ce5de..00000000 --- a/audio/sfx/sfx_08_28.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_28_Ch1: ; 2104f (8:504f) - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_08_28_Ch2: ; 2105e (8:505e) - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_08_28_Ch3: ; 2106d (8:506d) - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_08_29.asm b/audio/sfx/sfx_08_29.asm deleted file mode 100755 index ff22501f..00000000 --- a/audio/sfx/sfx_08_29.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_08_29_Ch1: ; 210dd (8:50dd) - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_08_29_Ch2: ; 210f8 (8:50f8) - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_08_29_Ch3: ; 21113 (8:5113) - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/sfx_08_2a.asm b/audio/sfx/sfx_08_2a.asm deleted file mode 100755 index 8b9aeeaf..00000000 --- a/audio/sfx/sfx_08_2a.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_2a_Ch1: ; 20f70 (8:4f70) - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_08_2a_Ch2: ; 20f7f (8:4f7f) - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_08_2a_Ch3: ; 20f8e (8:4f8e) - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/sfx_08_2b.asm b/audio/sfx/sfx_08_2b.asm deleted file mode 100755 index b35755a4..00000000 --- a/audio/sfx/sfx_08_2b.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_2b_Ch1: ; 21126 (8:5126) - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_08_2b_Ch2: ; 21139 (8:5139) - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_08_2b_Ch3: ; 2114c (8:514c) - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/sfx_08_2c.asm b/audio/sfx/sfx_08_2c.asm deleted file mode 100755 index b2dbc764..00000000 --- a/audio/sfx/sfx_08_2c.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_08_2c_Ch1: ; 21236 (8:5236) - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_08_2c_Ch2: ; 21259 (8:5259) - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_08_2c_Ch3: ; 2127c (8:527c) - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_08_2d.asm b/audio/sfx/sfx_08_2d.asm deleted file mode 100755 index 4f7f5422..00000000 --- a/audio/sfx/sfx_08_2d.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_08_2d_Ch1: ; 20f4e (8:4f4e) - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_08_2d_Ch2: ; 20f5d (8:4f5d) - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_08_2d_Ch3: ; 20f6f (8:4f6f) - endchannel diff --git a/audio/sfx/sfx_08_2e.asm b/audio/sfx/sfx_08_2e.asm deleted file mode 100755 index 7a6e9257..00000000 --- a/audio/sfx/sfx_08_2e.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_08_2e_Ch1: ; 211a7 (8:51a7) - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_08_2e_Ch2: ; 211c2 (8:51c2) - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_08_2e_Ch3: ; 211dd (8:51dd) - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_08_2f.asm b/audio/sfx/sfx_08_2f.asm deleted file mode 100755 index d26e86c0..00000000 --- a/audio/sfx/sfx_08_2f.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_08_2f_Ch1: ; 20f98 (8:4f98) - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_08_2f_Ch2: ; 20faf (8:4faf) - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_08_2f_Ch3: ; 20fc6 (8:4fc6) - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/sfx_08_30.asm b/audio/sfx/sfx_08_30.asm deleted file mode 100755 index 08e7da69..00000000 --- a/audio/sfx/sfx_08_30.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_08_30_Ch1: ; 21159 (8:5159) - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_08_30_Ch2: ; 2117c (8:517c) - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_08_30_Ch3: ; 21197 (8:5197) - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/sfx_08_31.asm b/audio/sfx/sfx_08_31.asm deleted file mode 100755 index 4c06c624..00000000 --- a/audio/sfx/sfx_08_31.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_08_31_Ch1: ; 211f0 (8:51f0) - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_08_31_Ch2: ; 2120b (8:520b) - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_08_31_Ch3: ; 21226 (8:5226) - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_08_32.asm b/audio/sfx/sfx_08_32.asm deleted file mode 100755 index 255d24c7..00000000 --- a/audio/sfx/sfx_08_32.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_08_32_Ch1: ; 21077 (8:5077) - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_08_32_Ch2: ; 2109a (8:509a) - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_08_32_Ch3: ; 210c1 (8:50c1) - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/sfx_08_33.asm b/audio/sfx/sfx_08_33.asm deleted file mode 100755 index 55b09fb1..00000000 --- a/audio/sfx/sfx_08_33.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_33_Ch1: ; 2128f (8:528f) - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_08_33_Ch2: ; 212a2 (8:52a2) - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_08_33_Ch3: ; 212b5 (8:52b5) - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/sfx_08_34.asm b/audio/sfx/sfx_08_34.asm deleted file mode 100755 index cabd1ebe..00000000 --- a/audio/sfx/sfx_08_34.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_34_Ch1: ; 212c2 (8:52c2) - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_08_34_Ch2: ; 212d5 (8:52d5) - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_08_34_Ch3: ; 212e8 (8:52e8) - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/sfx_08_35.asm b/audio/sfx/sfx_08_35.asm deleted file mode 100755 index 732f7a1e..00000000 --- a/audio/sfx/sfx_08_35.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_08_35_Ch1: ; 212f5 (8:52f5) - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_08_35_Ch2: ; 21318 (8:5318) - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_08_35_Ch3: ; 2133a (8:533a) - endchannel diff --git a/audio/sfx/sfx_08_36.asm b/audio/sfx/sfx_08_36.asm deleted file mode 100755 index 47d08af1..00000000 --- a/audio/sfx/sfx_08_36.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_36_Ch1: ; 2133b (8:533b) - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_08_36_Ch2: ; 2134e (8:534e) - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_08_36_Ch3: ; 21361 (8:5361) - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/sfx_08_37.asm b/audio/sfx/sfx_08_37.asm deleted file mode 100755 index 8df47703..00000000 --- a/audio/sfx/sfx_08_37.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_08_37_Ch1: ; 20a2e (8:4a2e) - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_08_37_Ch2: ; 20a45 (8:4a45) - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_08_37_Ch3: ; 20a58 (8:4a58) - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_08_38.asm b/audio/sfx/sfx_08_38.asm deleted file mode 100755 index 77df04e1..00000000 --- a/audio/sfx/sfx_08_38.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_08_38_Ch1: ; 20a65 (8:4a65) - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_08_38_Ch2: ; 20a88 (8:4a88) - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_08_38_Ch3: ; 20aab (8:4aab) - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_08_39.asm b/audio/sfx/sfx_08_39.asm deleted file mode 100755 index a4d0e0a4..00000000 --- a/audio/sfx/sfx_08_39.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_08_39_Ch1: ; 20b13 (8:4b13) - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_08_39_Ch2: ; 20b2a (8:4b2a) - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_08_39_Ch3: ; 20b41 (8:4b41) - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm deleted file mode 100755 index afbc50d4..00000000 --- a/audio/sfx/sfx_08_3a.asm +++ /dev/null @@ -1,63 +0,0 @@ -SFX_08_3a_Ch1: ; 2397d (8:797d) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 6, 11, 4 - octave 4 - F_ 4 - notetype 4, 11, 2 - C_ 2 - F_ 2 - C_ 2 - notetype 6, 11, 3 - D# 2 - D# 2 - E_ 2 - notetype 6, 11, 4 - F_ 8 - endchannel - - -SFX_08_3a_Ch2: ; 23998 (8:7998) - executemusic - vibrato 4, 2, 2 - duty 2 - notetype 6, 12, 4 - octave 4 - A_ 4 - notetype 4, 12, 2 - A_ 2 - A_ 2 - A_ 2 - notetype 6, 12, 4 - A# 2 - A# 2 - A# 2 - notetype 6, 12, 4 - A_ 8 - endchannel - - -SFX_08_3a_Ch3: ; 239b0 (8:79b0) - executemusic - notetype 6, 1, 0 - octave 5 - A_ 4 - notetype 4, 1, 0 - F_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - notetype 6, 1, 0 - G_ 1 - rest 1 - D# 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm deleted file mode 100755 index cb7c9a52..00000000 --- a/audio/sfx/sfx_08_3b.asm +++ /dev/null @@ -1,69 +0,0 @@ -SFX_08_3b_Ch1: ; 239c7 (8:79c7) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - - -SFX_08_3b_Ch2: ; 239e6 (8:79e6) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - - -SFX_08_3b_Ch3: ; 239fe (8:79fe) - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/sfx_08_3c.asm b/audio/sfx/sfx_08_3c.asm deleted file mode 100755 index 0ac2343c..00000000 --- a/audio/sfx/sfx_08_3c.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_08_3c_Ch1: ; 203dd (8:43dd) - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_3d.asm b/audio/sfx/sfx_08_3d.asm deleted file mode 100755 index aa9867a1..00000000 --- a/audio/sfx/sfx_08_3d.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_3d_Ch1: ; 203ee (8:43ee) - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_3e.asm b/audio/sfx/sfx_08_3e.asm deleted file mode 100755 index 30aefce4..00000000 --- a/audio/sfx/sfx_08_3e.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_08_3e_Ch1: ; 203fd (8:43fd) - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_3f.asm b/audio/sfx/sfx_08_3f.asm deleted file mode 100755 index 800684d3..00000000 --- a/audio/sfx/sfx_08_3f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_3f_Ch1: ; 203d6 (8:43d6) - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel diff --git a/audio/sfx/sfx_08_40.asm b/audio/sfx/sfx_08_40.asm deleted file mode 100755 index 7dfae9a7..00000000 --- a/audio/sfx/sfx_08_40.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_40_Ch1: ; 203c3 (8:43c3) - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/sfx_08_41.asm b/audio/sfx/sfx_08_41.asm deleted file mode 100755 index ef5998cd..00000000 --- a/audio/sfx/sfx_08_41.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_08_41_Ch1: ; 2042d (8:442d) - duty 2 - unknownsfx0x10 47 - unknownsfx0x20 15, 242, 128, 7 - endchannel - - -SFX_08_41_Ch2: ; 20436 (8:4436) - duty 2 - unknownsfx0x20 15, 194, 130, 7 - endchannel diff --git a/audio/sfx/sfx_08_42.asm b/audio/sfx/sfx_08_42.asm deleted file mode 100755 index 247a68f3..00000000 --- a/audio/sfx/sfx_08_42.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_08_42_Ch1: ; 2043d (8:443d) - duty 2 - unknownsfx0x10 22 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel - - -SFX_08_42_Ch2: ; 20448 (8:4448) - unknownnoise0x20 15, 162, 34 - endchannel diff --git a/audio/sfx/sfx_08_43.asm b/audio/sfx/sfx_08_43.asm deleted file mode 100755 index 23e3b5f0..00000000 --- a/audio/sfx/sfx_08_43.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_08_43_Ch1: ; 2044c (8:444c) - unknownsfx0x20 15, 209, 0, 2 - unknownsfx0x10 8 - endchannel - - -SFX_08_43_Ch2: ; 20453 (8:4453) - unknownnoise0x20 4, 245, 51 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 - endchannel diff --git a/audio/sfx/sfx_08_44.asm b/audio/sfx/sfx_08_44.asm deleted file mode 100755 index d626f3a1..00000000 --- a/audio/sfx/sfx_08_44.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_08_44_Ch1: ; 2045d (8:445d) - unknownnoise0x20 2, 97, 35 - unknownnoise0x20 2, 161, 51 - unknownnoise0x20 2, 193, 51 - unknownnoise0x20 2, 81, 17 - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 65, 17 - unknownnoise0x20 2, 193, 51 - unknownnoise0x20 2, 49, 17 - unknownnoise0x20 2, 129, 51 - unknownnoise0x20 2, 49, 17 - unknownnoise0x20 8, 65, 51 - endchannel diff --git a/audio/sfx/sfx_08_45.asm b/audio/sfx/sfx_08_45.asm deleted file mode 100755 index 00e5a659..00000000 --- a/audio/sfx/sfx_08_45.asm +++ /dev/null @@ -1,15 +0,0 @@ -SFX_08_45_Ch1: ; 2047f (8:447f) - duty 2 - unknownsfx0x10 68 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel - - -SFX_08_45_Ch2: ; 20490 (8:4490) - duty 2 - unknownsfx0x20 15, 146, 0, 6 - unknownsfx0x20 15, 146, 130, 7 - endchannel diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm deleted file mode 100755 index de64873a..00000000 --- a/audio/sfx/sfx_08_46.asm +++ /dev/null @@ -1,61 +0,0 @@ -SFX_08_46_Ch1: ; 23a13 (8:7a13) - executemusic - tempo 256 - volume 7, 7 - duty 3 - toggleperfectpitch - notetype 6, 11, 2 - octave 3 - E_ 2 - F# 2 - G# 2 - G# 1 - G# 1 - B_ 2 - octave 4 - C# 2 - D# 2 - D# 1 - D# 1 - notetype 6, 11, 5 - E_ 8 - endchannel - - -SFX_08_46_Ch2: ; 23a2e (8:7a2e) - executemusic - duty 2 - notetype 6, 12, 2 - octave 4 - G# 2 - G# 1 - G# 1 - E_ 2 - E_ 1 - E_ 1 - B_ 2 - B_ 1 - B_ 1 - A_ 2 - A_ 1 - A_ 1 - notetype 6, 12, 5 - G# 8 - endchannel - - -SFX_08_46_Ch3: ; 23a44 (8:7a44) - executemusic - notetype 6, 1, 0 - octave 4 - B_ 2 - rest 2 - octave 5 - C# 2 - rest 2 - D# 2 - rest 2 - F# 2 - G_ 2 - G# 4 - endchannel diff --git a/audio/sfx/sfx_08_47.asm b/audio/sfx/sfx_08_47.asm deleted file mode 100755 index 6ca2e38c..00000000 --- a/audio/sfx/sfx_08_47.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_47_Ch1: ; 204aa (8:44aa) - unknownnoise0x20 2, 161, 18 - endchannel diff --git a/audio/sfx/sfx_08_48.asm b/audio/sfx/sfx_08_48.asm deleted file mode 100755 index f974a6f9..00000000 --- a/audio/sfx/sfx_08_48.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_48_Ch1: ; 204ae (8:44ae) - duty 1 - unknownsfx0x10 175 - unknownsfx0x20 15, 242, 128, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_49.asm b/audio/sfx/sfx_08_49.asm deleted file mode 100755 index 0d4ef5e7..00000000 --- a/audio/sfx/sfx_08_49.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_49_Ch1: ; 204b9 (8:44b9) - duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_4a.asm b/audio/sfx/sfx_08_4a.asm deleted file mode 100755 index d79cef4e..00000000 --- a/audio/sfx/sfx_08_4a.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_4a_Ch1: ; 204c4 (8:44c4) - unknownnoise0x20 2, 161, 34 - endchannel diff --git a/audio/sfx/sfx_08_4b.asm b/audio/sfx/sfx_08_4b.asm deleted file mode 100755 index 5b654931..00000000 --- a/audio/sfx/sfx_08_4b.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_4b_Ch1: ; 204c8 (8:44c8) - unknownnoise0x20 8, 241, 84 - endchannel diff --git a/audio/sfx/sfx_08_4c.asm b/audio/sfx/sfx_08_4c.asm deleted file mode 100755 index b80af081..00000000 --- a/audio/sfx/sfx_08_4c.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_4c_Ch1: ; 204cc (8:44cc) - unknownnoise0x20 15, 143, 17 - unknownnoise0x20 4, 255, 18 - unknownnoise0x20 10, 241, 85 - endchannel diff --git a/audio/sfx/sfx_08_4d.asm b/audio/sfx/sfx_08_4d.asm deleted file mode 100755 index 3dc43ae0..00000000 --- a/audio/sfx/sfx_08_4d.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_4d_Ch1: ; 204d6 (8:44d6) - unknownnoise0x20 15, 143, 52 - unknownnoise0x20 8, 242, 53 - unknownnoise0x20 10, 241, 85 - endchannel diff --git a/audio/sfx/sfx_08_4e.asm b/audio/sfx/sfx_08_4e.asm deleted file mode 100755 index db621af9..00000000 --- a/audio/sfx/sfx_08_4e.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_4e_Ch1: ; 204e0 (8:44e0) - unknownnoise0x20 15, 159, 35 - unknownnoise0x20 8, 241, 33 - endchannel diff --git a/audio/sfx/sfx_08_4f.asm b/audio/sfx/sfx_08_4f.asm deleted file mode 100755 index 74337020..00000000 --- a/audio/sfx/sfx_08_4f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_4f_Ch1: ; 204e7 (8:44e7) - unknownnoise0x20 2, 225, 75 - unknownnoise0x20 10, 241, 68 - unknownnoise0x20 2, 225, 58 - unknownnoise0x20 6, 241, 52 - endchannel diff --git a/audio/sfx/sfx_08_50.asm b/audio/sfx/sfx_08_50.asm deleted file mode 100755 index ae3f9974..00000000 --- a/audio/sfx/sfx_08_50.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_50_Ch1: ; 204f4 (8:44f4) - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 2, 244, 20 - unknownnoise0x20 15, 241, 50 - endchannel diff --git a/audio/sfx/sfx_08_51.asm b/audio/sfx/sfx_08_51.asm deleted file mode 100755 index bd4f3b24..00000000 --- a/audio/sfx/sfx_08_51.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_51_Ch1: ; 204fe (8:44fe) - unknownnoise0x20 4, 143, 85 - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 - endchannel diff --git a/audio/sfx/sfx_08_52.asm b/audio/sfx/sfx_08_52.asm deleted file mode 100755 index 9bf7c91d..00000000 --- a/audio/sfx/sfx_08_52.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_52_Ch1: ; 2050b (8:450b) - unknownnoise0x20 8, 79, 35 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 - loopchannel 4, SFX_08_52_Ch1 - endchannel diff --git a/audio/sfx/sfx_08_53.asm b/audio/sfx/sfx_08_53.asm deleted file mode 100755 index c61465e9..00000000 --- a/audio/sfx/sfx_08_53.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_53_Ch1: ; 20519 (8:4519) - unknownnoise0x20 8, 79, 51 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 - unknownnoise0x20 15, 242, 34 - endchannel diff --git a/audio/sfx/sfx_08_54.asm b/audio/sfx/sfx_08_54.asm deleted file mode 100755 index 25a2c4fd..00000000 --- a/audio/sfx/sfx_08_54.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_54_Ch1: ; 20526 (8:4526) - unknownnoise0x20 8, 255, 50 - unknownnoise0x20 8, 244, 67 - unknownnoise0x20 8, 242, 84 - unknownnoise0x20 8, 241, 101 - endchannel diff --git a/audio/sfx/sfx_08_55.asm b/audio/sfx/sfx_08_55.asm deleted file mode 100755 index caecb7ce..00000000 --- a/audio/sfx/sfx_08_55.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_08_55_Ch1: ; 20533 (8:4533) - unknownnoise0x20 1, 194, 51 - unknownnoise0x20 2, 242, 33 - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 1, 194, 50 - unknownnoise0x20 1, 146, 18 - unknownnoise0x20 1, 178, 49 - unknownnoise0x20 12, 145, 16 - unknownnoise0x20 8, 242, 65 - endchannel diff --git a/audio/sfx/sfx_08_56.asm b/audio/sfx/sfx_08_56.asm deleted file mode 100755 index d5653379..00000000 --- a/audio/sfx/sfx_08_56.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_56_Ch1: ; 2054c (8:454c) - unknownnoise0x20 1, 148, 35 - unknownnoise0x20 1, 180, 34 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_08_57.asm b/audio/sfx/sfx_08_57.asm deleted file mode 100755 index 40e0ea8f..00000000 --- a/audio/sfx/sfx_08_57.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_57_Ch1: ; 20556 (8:4556) - unknownnoise0x20 2, 148, 51 - unknownnoise0x20 4, 180, 34 - unknownnoise0x20 4, 241, 68 - unknownnoise0x20 8, 241, 85 - endchannel diff --git a/audio/sfx/sfx_08_58.asm b/audio/sfx/sfx_08_58.asm deleted file mode 100755 index 3cb23fb0..00000000 --- a/audio/sfx/sfx_08_58.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_58_Ch1: ; 20563 (8:4563) - unknownnoise0x20 4, 255, 85 - unknownnoise0x20 8, 241, 101 - endchannel diff --git a/audio/sfx/sfx_08_59.asm b/audio/sfx/sfx_08_59.asm deleted file mode 100755 index c42f6127..00000000 --- a/audio/sfx/sfx_08_59.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_59_Ch1: ; 2056a (8:456a) - unknownnoise0x20 2, 132, 67 - unknownnoise0x20 2, 196, 34 - unknownnoise0x20 8, 242, 52 - endchannel diff --git a/audio/sfx/sfx_08_5a.asm b/audio/sfx/sfx_08_5a.asm deleted file mode 100755 index 282fea80..00000000 --- a/audio/sfx/sfx_08_5a.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_5a_Ch1: ; 20574 (8:4574) - unknownnoise0x20 4, 241, 52 - unknownnoise0x20 15, 242, 100 - endchannel diff --git a/audio/sfx/sfx_08_5b.asm b/audio/sfx/sfx_08_5b.asm deleted file mode 100755 index 7bf3e2c8..00000000 --- a/audio/sfx/sfx_08_5b.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_5b_Ch1: ; 2057b (8:457b) - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 15, 242, 18 - endchannel diff --git a/audio/sfx/sfx_08_5c.asm b/audio/sfx/sfx_08_5c.asm deleted file mode 100755 index 25618291..00000000 --- a/audio/sfx/sfx_08_5c.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_5c_Ch1: ; 20582 (8:4582) - unknownnoise0x20 2, 194, 1 - unknownnoise0x20 15, 244, 1 - unknownnoise0x20 15, 242, 1 - endchannel diff --git a/audio/sfx/sfx_08_5d.asm b/audio/sfx/sfx_08_5d.asm deleted file mode 100755 index 9bd39269..00000000 --- a/audio/sfx/sfx_08_5d.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_5d_Ch1: ; 2058c (8:458c) - unknownnoise0x20 8, 241, 50 - unknownnoise0x20 8, 241, 51 - endchannel diff --git a/audio/sfx/sfx_08_5e.asm b/audio/sfx/sfx_08_5e.asm deleted file mode 100755 index a765d263..00000000 --- a/audio/sfx/sfx_08_5e.asm +++ /dev/null @@ -1,16 +0,0 @@ -SFX_08_5e_Ch1: ; 20593 (8:4593) - duty 0 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel - - -SFX_08_5e_Ch2: ; 205a4 (8:45a4) - unknownnoise0x20 0, 209, 66 - unknownnoise0x20 4, 161, 50 - unknownnoise0x20 0, 209, 34 - unknownnoise0x20 6, 161, 50 - endchannel diff --git a/audio/sfx/sfx_08_5f.asm b/audio/sfx/sfx_08_5f.asm deleted file mode 100755 index 0cb02ba3..00000000 --- a/audio/sfx/sfx_08_5f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_5f_Ch1: ; 205b1 (8:45b1) - unknownnoise0x20 3, 146, 49 - unknownnoise0x20 3, 178, 50 - unknownnoise0x20 3, 194, 51 - unknownnoise0x20 8, 241, 84 - endchannel diff --git a/audio/sfx/sfx_08_60.asm b/audio/sfx/sfx_08_60.asm deleted file mode 100755 index 7aa37833..00000000 --- a/audio/sfx/sfx_08_60.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_60_Ch1: ; 205be (8:45be) - unknownnoise0x20 12, 241, 84 - unknownnoise0x20 8, 241, 100 - endchannel diff --git a/audio/sfx/sfx_08_61.asm b/audio/sfx/sfx_08_61.asm deleted file mode 100755 index 343a5c0c..00000000 --- a/audio/sfx/sfx_08_61.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_61_Ch1: ; 205c5 (8:45c5) - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 193, 50 - unknownnoise0x20 2, 161, 49 - unknownnoise0x20 15, 130, 50 - unknownnoise0x20 8, 241, 52 - endchannel diff --git a/audio/sfx/sfx_08_62.asm b/audio/sfx/sfx_08_62.asm deleted file mode 100755 index a7cfed2d..00000000 --- a/audio/sfx/sfx_08_62.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_62_Ch1: ; 205d5 (8:45d5) - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 - endchannel diff --git a/audio/sfx/sfx_08_63.asm b/audio/sfx/sfx_08_63.asm deleted file mode 100755 index 432d088c..00000000 --- a/audio/sfx/sfx_08_63.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_63_Ch1: ; 205dc (8:45dc) - unknownnoise0x20 2, 242, 67 - unknownnoise0x20 4, 181, 50 - unknownnoise0x20 9, 134, 49 - unknownnoise0x20 7, 100, 0 - unknownnoise0x20 15, 242, 85 - endchannel diff --git a/audio/sfx/sfx_08_64.asm b/audio/sfx/sfx_08_64.asm deleted file mode 100755 index c34d64ce..00000000 --- a/audio/sfx/sfx_08_64.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_08_64_Ch1: ; 205ec (8:45ec) - duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 7 - unknownsfx0x10 8 - endchannel - - -SFX_08_64_Ch2: ; 205f7 (8:45f7) - unknownnoise0x20 15, 63, 34 - unknownnoise0x20 15, 242, 33 - endchannel diff --git a/audio/sfx/sfx_08_65.asm b/audio/sfx/sfx_08_65.asm deleted file mode 100755 index a92539c3..00000000 --- a/audio/sfx/sfx_08_65.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_65_Ch1: ; 205fe (8:45fe) - unknownnoise0x20 15, 79, 65 - unknownnoise0x20 8, 143, 65 - unknownnoise0x20 8, 207, 65 - unknownnoise0x20 8, 242, 66 - unknownnoise0x20 15, 242, 65 - endchannel diff --git a/audio/sfx/sfx_08_66.asm b/audio/sfx/sfx_08_66.asm deleted file mode 100755 index d72b0349..00000000 --- a/audio/sfx/sfx_08_66.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_08_66_Ch1: ; 2060e (8:460e) - unknownnoise0x20 10, 255, 80 - unknownnoise0x20 15, 255, 81 - unknownnoise0x20 8, 242, 81 - unknownnoise0x20 6, 255, 82 - unknownnoise0x20 6, 255, 83 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 242, 84 - endchannel diff --git a/audio/sfx/sfx_08_67.asm b/audio/sfx/sfx_08_67.asm deleted file mode 100755 index 6e94addf..00000000 --- a/audio/sfx/sfx_08_67.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_08_67_Ch1: ; 20624 (8:4624) - duty 2 - unknownsfx0x20 15, 63, 192, 7 - -SFX_08_67_branch_2062a: - unknownsfx0x20 15, 223, 192, 7 - loopchannel 4, SFX_08_67_branch_2062a - unknownsfx0x20 15, 209, 192, 7 - endchannel - - -SFX_08_67_Ch2: ; 20637 (8:4637) - dutycycle 179 - unknownsfx0x20 15, 47, 200, 7 - -SFX_08_67_branch_2063d: - unknownsfx0x20 15, 207, 199, 7 - loopchannel 4, SFX_08_67_branch_2063d - unknownsfx0x20 15, 193, 200, 7 - endchannel - - -SFX_08_67_Ch3: ; 2064a (8:464a) - unknownnoise0x20 3, 151, 18 - unknownnoise0x20 3, 161, 17 - loopchannel 10, SFX_08_67_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_68.asm b/audio/sfx/sfx_08_68.asm deleted file mode 100755 index 691b9b1f..00000000 --- a/audio/sfx/sfx_08_68.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_68_Ch1: ; 20655 (8:4655) - duty 0 - unknownsfx0x20 0, 241, 192, 7 - unknownsfx0x20 0, 241, 0, 7 - loopchannel 12, SFX_08_68_Ch1 - endchannel - - -SFX_08_68_Ch2: ; 20664 (8:4664) - dutycycle 179 - unknownsfx0x20 0, 225, 193, 7 - unknownsfx0x20 0, 225, 1, 7 - loopchannel 12, SFX_08_68_Ch2 - endchannel - - -SFX_08_68_Ch3: ; 20673 (8:4673) - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 - loopchannel 6, SFX_08_68_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_69.asm b/audio/sfx/sfx_08_69.asm deleted file mode 100755 index f202a156..00000000 --- a/audio/sfx/sfx_08_69.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_08_69_Ch1: ; 2067e (8:467e) - dutycycle 201 - unknownsfx0x20 11, 243, 32, 1 - unknownsfx0x20 9, 211, 80, 1 - loopchannel 5, SFX_08_69_Ch1 - unknownsfx0x20 8, 227, 48, 1 - unknownsfx0x20 15, 194, 16, 1 - endchannel - - -SFX_08_69_Ch2: ; 20695 (8:4695) - unknownnoise0x20 10, 243, 53 - unknownnoise0x20 14, 246, 69 - loopchannel 4, SFX_08_69_Ch2 - unknownnoise0x20 12, 244, 188 - unknownnoise0x20 12, 245, 156 - unknownnoise0x20 15, 244, 172 - endchannel diff --git a/audio/sfx/sfx_08_6a.asm b/audio/sfx/sfx_08_6a.asm deleted file mode 100755 index 3076956a..00000000 --- a/audio/sfx/sfx_08_6a.asm +++ /dev/null @@ -1,28 +0,0 @@ -SFX_08_6a_Ch1: ; 206a9 (8:46a9) - dutycycle 57 - unknownsfx0x20 4, 244, 0, 6 - unknownsfx0x20 3, 196, 0, 5 - unknownsfx0x20 5, 181, 0, 6 - unknownsfx0x20 13, 226, 192, 6 - loopchannel 3, SFX_08_6a_Ch1 - unknownsfx0x20 8, 209, 0, 6 - endchannel - - -SFX_08_6a_Ch2: ; 206c4 (8:46c4) - dutycycle 141 - unknownsfx0x20 5, 228, 224, 5 - unknownsfx0x20 4, 180, 224, 4 - unknownsfx0x20 6, 165, 232, 5 - unknownsfx0x20 14, 209, 160, 6 - loopchannel 3, SFX_08_6a_Ch2 - endchannel - - -SFX_08_6a_Ch3: ; 206db (8:46db) - unknownnoise0x20 5, 195, 51 - unknownnoise0x20 3, 146, 67 - unknownnoise0x20 10, 181, 51 - unknownnoise0x20 15, 195, 50 - loopchannel 2, SFX_08_6a_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_6b.asm b/audio/sfx/sfx_08_6b.asm deleted file mode 100755 index 60783be6..00000000 --- a/audio/sfx/sfx_08_6b.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_6b_Ch1: ; 206ec (8:46ec) - dutycycle 210 - unknownsfx0x20 3, 129, 0, 3 - unknownsfx0x20 3, 193, 0, 4 - unknownsfx0x20 3, 241, 0, 5 - unknownsfx0x20 3, 177, 0, 4 - unknownsfx0x20 3, 113, 0, 3 - loopchannel 5, SFX_08_6b_Ch1 - unknownsfx0x20 8, 129, 0, 4 - endchannel - - -SFX_08_6b_Ch2: ; 2070b (8:470b) - unknownnoise0x20 3, 98, 34 - unknownnoise0x20 3, 162, 50 - unknownnoise0x20 3, 210, 51 - unknownnoise0x20 3, 146, 35 - unknownnoise0x20 3, 82, 18 - loopchannel 5, SFX_08_6b_Ch2 - unknownnoise0x20 8, 129, 18 - endchannel diff --git a/audio/sfx/sfx_08_6c.asm b/audio/sfx/sfx_08_6c.asm deleted file mode 100755 index cf83608d..00000000 --- a/audio/sfx/sfx_08_6c.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_08_6c_Ch1: ; 20722 (8:4722) - dutycycle 57 - unknownsfx0x20 15, 244, 0, 5 - unknownsfx0x20 15, 196, 0, 4 - unknownsfx0x20 15, 226, 192, 5 - loopchannel 3, SFX_08_6c_Ch1 - endchannel - - -SFX_08_6c_Ch2: ; 20735 (8:4735) - dutycycle 141 - unknownsfx0x20 7, 228, 48, 4 - unknownsfx0x20 15, 180, 48, 3 - unknownsfx0x20 15, 162, 56, 4 - loopchannel 4, SFX_08_6c_Ch2 - endchannel - - -SFX_08_6c_Ch3: ; 20748 (8:4748) - unknownnoise0x20 9, 244, 68 - unknownnoise0x20 9, 242, 67 - unknownnoise0x20 15, 244, 66 - unknownnoise0x20 15, 244, 65 - loopchannel 3, SFX_08_6c_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_6d.asm b/audio/sfx/sfx_08_6d.asm deleted file mode 100755 index 6971a30e..00000000 --- a/audio/sfx/sfx_08_6d.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_08_6d_Ch1: ; 20759 (8:4759) - dutycycle 161 - unknownsfx0x20 10, 241, 64, 6 - unknownsfx0x20 10, 243, 128, 6 - unknownsfx0x20 10, 242, 32, 6 - loopchannel 4, SFX_08_6d_Ch1 - unknownsfx0x20 10, 241, 64, 6 - endchannel - - -SFX_08_6d_Ch2: ; 20770 (8:4770) - dutycycle 179 - unknownsfx0x20 10, 243, 113, 5 - unknownsfx0x20 7, 227, 49, 5 - unknownsfx0x20 10, 241, 81, 5 - loopchannel 4, SFX_08_6d_Ch2 - unknownsfx0x20 10, 241, 113, 5 - endchannel - - -SFX_08_6d_Ch3: ; 20787 (8:4787) - unknownnoise0x20 2, 209, 74 - unknownnoise0x20 2, 210, 42 - loopchannel 21, SFX_08_6d_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_6e.asm b/audio/sfx/sfx_08_6e.asm deleted file mode 100755 index 00b2c148..00000000 --- a/audio/sfx/sfx_08_6e.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_08_6e_Ch1: ; 20792 (8:4792) - duty 0 - unknownsfx0x20 2, 241, 0, 2 - unknownsfx0x20 3, 241, 0, 7 - unknownsfx0x20 4, 241, 0, 5 - unknownsfx0x20 5, 241, 240, 7 - loopchannel 8, SFX_08_6e_Ch1 - endchannel - - -SFX_08_6e_Ch2: ; 207a9 (8:47a9) - dutycycle 179 - unknownsfx0x20 2, 225, 2, 3 - unknownsfx0x20 3, 225, 242, 7 - unknownsfx0x20 4, 225, 2, 6 - unknownsfx0x20 5, 225, 2, 7 - loopchannel 8, SFX_08_6e_Ch2 - endchannel - - -SFX_08_6e_Ch3: ; 207c0 (8:47c0) - unknownnoise0x20 2, 211, 16 - unknownnoise0x20 3, 211, 17 - unknownnoise0x20 2, 210, 16 - unknownnoise0x20 5, 210, 18 - loopchannel 9, SFX_08_6e_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_6f.asm b/audio/sfx/sfx_08_6f.asm deleted file mode 100755 index 69b85d33..00000000 --- a/audio/sfx/sfx_08_6f.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_6f_Ch1: ; 207d1 (8:47d1) - dutycycle 43 - unknownsfx0x20 3, 241, 240, 7 - unknownsfx0x20 4, 242, 0, 2 - loopchannel 8, SFX_08_6f_Ch1 - endchannel - - -SFX_08_6f_Ch2: ; 207e0 (8:47e0) - dutycycle 179 - unknownsfx0x20 4, 226, 2, 2 - unknownsfx0x20 4, 225, 226, 7 - loopchannel 9, SFX_08_6f_Ch2 - endchannel - - -SFX_08_6f_Ch3: ; 207ef (8:47ef) - unknownnoise0x20 4, 255, 67 - unknownnoise0x20 4, 242, 68 - loopchannel 9, SFX_08_6f_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_70.asm b/audio/sfx/sfx_08_70.asm deleted file mode 100755 index 7a07b340..00000000 --- a/audio/sfx/sfx_08_70.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_08_70_Ch1: ; 207fa (8:47fa) - duty 2 - unknownsfx0x10 247 - unknownsfx0x20 8, 196, 189, 7 - unknownsfx0x20 8, 196, 190, 7 - unknownsfx0x20 8, 196, 191, 7 - unknownsfx0x20 8, 196, 192, 7 - unknownsfx0x20 15, 196, 193, 7 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x10 8 - endchannel - - -SFX_08_70_Ch2: ; 20819 (8:4819) - duty 2 - unknownsfx0x20 8, 196, 112, 7 - unknownsfx0x20 8, 196, 97, 7 - unknownsfx0x20 8, 196, 98, 7 - unknownsfx0x20 8, 196, 99, 7 - unknownsfx0x20 15, 196, 100, 7 - unknownsfx0x20 15, 242, 100, 7 - endchannel - - -SFX_08_70_Ch3: ; 20834 (8:4834) - unknownnoise0x20 15, 63, 20 - unknownnoise0x20 15, 207, 19 - unknownnoise0x20 15, 207, 18 - unknownnoise0x20 15, 207, 17 - unknownnoise0x20 15, 207, 16 - unknownnoise0x20 15, 194, 16 - endchannel diff --git a/audio/sfx/sfx_08_71.asm b/audio/sfx/sfx_08_71.asm deleted file mode 100755 index 7b306557..00000000 --- a/audio/sfx/sfx_08_71.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_08_71_Ch1: ; 20847 (8:4847) - duty 2 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 242, 224, 7 - endchannel - - -SFX_08_71_Ch2: ; 2085e (8:485e) - duty 3 - unknownsfx0x20 15, 255, 226, 7 - unknownsfx0x20 15, 255, 225, 7 - unknownsfx0x20 15, 255, 226, 7 - unknownsfx0x20 15, 255, 225, 7 - unknownsfx0x20 15, 242, 226, 7 - endchannel diff --git a/audio/sfx/sfx_08_72.asm b/audio/sfx/sfx_08_72.asm deleted file mode 100755 index 13000d01..00000000 --- a/audio/sfx/sfx_08_72.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_08_72_Ch1: ; 20875 (8:4875) - duty 2 - unknownsfx0x10 175 - unknownsfx0x20 8, 241, 0, 7 - unknownsfx0x10 8 - endchannel - - -SFX_08_72_Ch2: ; 20880 (8:4880) - duty 3 - unknownsfx0x20 8, 241, 1, 7 - endchannel diff --git a/audio/sfx/sfx_08_73.asm b/audio/sfx/sfx_08_73.asm deleted file mode 100755 index 7829fbcd..00000000 --- a/audio/sfx/sfx_08_73.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_08_73_Ch1: ; 20887 (8:4887) - duty 2 - unknownsfx0x20 6, 241, 0, 5 - unknownsfx0x20 6, 241, 128, 5 - unknownsfx0x20 6, 241, 0, 6 - unknownsfx0x20 6, 241, 128, 6 - unknownsfx0x20 8, 241, 0, 7 - endchannel - - -SFX_08_73_Ch2: ; 2089e (8:489e) - duty 3 - unknownsfx0x20 6, 225, 16, 5 - unknownsfx0x20 6, 225, 144, 5 - unknownsfx0x20 6, 225, 16, 6 - unknownsfx0x20 6, 225, 144, 6 - unknownsfx0x20 8, 225, 16, 7 - endchannel diff --git a/audio/sfx/sfx_08_74.asm b/audio/sfx/sfx_08_74.asm deleted file mode 100755 index f8144908..00000000 --- a/audio/sfx/sfx_08_74.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_08_74_Ch1: ; 208b5 (8:48b5) - dutycycle 237 - unknownsfx0x20 8, 255, 248, 3 - unknownsfx0x20 15, 255, 0, 4 - unknownsfx0x20 15, 243, 0, 4 - endchannel - - -SFX_08_74_Ch2: ; 208c4 (8:48c4) - dutycycle 180 - unknownsfx0x20 8, 239, 192, 3 - unknownsfx0x20 15, 239, 192, 3 - unknownsfx0x20 15, 227, 192, 3 - endchannel - - -SFX_08_74_Ch3: ; 208d3 (8:48d3) - unknownnoise0x20 4, 255, 81 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 255, 85 - unknownnoise0x20 15, 243, 86 - endchannel diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/sfx_08_75.asm deleted file mode 100755 index cda1c65f..00000000 --- a/audio/sfx/sfx_08_75.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_08_75_Ch1: ; 208e0 (8:48e0) - executemusic - vibrato 10, 2, 4 - duty 2 - notetype 10, 8, 7 - octave 5 - G# 8 - octave 6 - F# 4 - E_ 4 - octave 5 - G# 8 - endchannel - - -SFX_08_75_Ch2: ; 208f0 (8:48f0) - executemusic - vibrato 10, 2, 3 - duty 2 - notetype 11, 6, 7 - octave 5 - G# 8 - notetype 10, 6, 7 - octave 6 - F# 4 - E_ 4 - octave 5 - G# 8 - endchannel diff --git a/audio/sfx/sfx_08_76.asm b/audio/sfx/sfx_08_76.asm deleted file mode 100755 index b60e51aa..00000000 --- a/audio/sfx/sfx_08_76.asm +++ /dev/null @@ -1,47 +0,0 @@ -SFX_08_76_Ch1: ; 20902 (8:4902) - duty 0 - unknownsfx0x20 2, 241, 128, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 144, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 160, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 176, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 192, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 208, 7 - -SFX_08_76_branch_20930: - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 224, 7 - loopchannel 12, SFX_08_76_branch_20930 - unknownsfx0x20 15, 241, 0, 7 - endchannel - - -SFX_08_76_Ch2: ; 20941 (8:4941) - dutycycle 179 - unknownsfx0x20 2, 241, 129, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 145, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 161, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 177, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 193, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 209, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 225, 7 - loopchannel 12, SFX_08_76_branch_20930 - unknownsfx0x20 15, 241, 1, 7 - endchannel - - -SFX_08_76_Ch3: ; 20980 (8:4980) - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 - loopchannel 26, SFX_08_76_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_77.asm b/audio/sfx/sfx_08_77.asm deleted file mode 100755 index 840a0ea5..00000000 --- a/audio/sfx/sfx_08_77.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_08_77_Ch1: ; 20412 (8:4412) - duty 0 - unknownsfx0x20 0, 210, 0, 7 - unknownsfx0x20 0, 210, 64, 7 - unknownsfx0x20 0, 210, 128, 7 - unknownsfx0x20 0, 210, 192, 7 - unknownsfx0x20 10, 225, 224, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_01.asm b/audio/sfx/sfx_1f_01.asm deleted file mode 100755 index bd3a2efe..00000000 --- a/audio/sfx/sfx_1f_01.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_01_Ch1: ; 7c2fd (1f:42fd) - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/sfx_1f_02.asm b/audio/sfx/sfx_1f_02.asm deleted file mode 100755 index 9ee8923b..00000000 --- a/audio/sfx/sfx_1f_02.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_02_Ch1: ; 7c301 (1f:4301) - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/sfx_1f_03.asm b/audio/sfx/sfx_1f_03.asm deleted file mode 100755 index 55d249a7..00000000 --- a/audio/sfx/sfx_1f_03.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_03_Ch1: ; 7c305 (1f:4305) - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/sfx_1f_04.asm b/audio/sfx/sfx_1f_04.asm deleted file mode 100755 index 8906de66..00000000 --- a/audio/sfx/sfx_1f_04.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_04_Ch1: ; 7c309 (1f:4309) - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/sfx_1f_05.asm b/audio/sfx/sfx_1f_05.asm deleted file mode 100755 index 9c0e679b..00000000 --- a/audio/sfx/sfx_1f_05.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_1f_05_Ch1: ; 7c30d (1f:430d) - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/sfx_1f_06.asm b/audio/sfx/sfx_1f_06.asm deleted file mode 100755 index 429f18ff..00000000 --- a/audio/sfx/sfx_1f_06.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_06_Ch1: ; 7c320 (1f:4320) - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/sfx_1f_07.asm b/audio/sfx/sfx_1f_07.asm deleted file mode 100755 index 1dd80c9e..00000000 --- a/audio/sfx/sfx_1f_07.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_07_Ch1: ; 7c324 (1f:4324) - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/sfx_1f_08.asm b/audio/sfx/sfx_1f_08.asm deleted file mode 100755 index f741bdf1..00000000 --- a/audio/sfx/sfx_1f_08.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_08_Ch1: ; 7c32b (1f:432b) - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/sfx_1f_09.asm b/audio/sfx/sfx_1f_09.asm deleted file mode 100755 index 73ed88fa..00000000 --- a/audio/sfx/sfx_1f_09.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_09_Ch1: ; 7c32f (1f:432f) - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/sfx_1f_0a.asm b/audio/sfx/sfx_1f_0a.asm deleted file mode 100755 index fb2f620f..00000000 --- a/audio/sfx/sfx_1f_0a.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0a_Ch1: ; 7c333 (1f:4333) - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/sfx_1f_0b.asm b/audio/sfx/sfx_1f_0b.asm deleted file mode 100755 index 46adb73d..00000000 --- a/audio/sfx/sfx_1f_0b.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0b_Ch1: ; 7c337 (1f:4337) - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/sfx_1f_0c.asm b/audio/sfx/sfx_1f_0c.asm deleted file mode 100755 index bd3fb373..00000000 --- a/audio/sfx/sfx_1f_0c.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0c_Ch1: ; 7c33b (1f:433b) - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/sfx_1f_0d.asm b/audio/sfx/sfx_1f_0d.asm deleted file mode 100755 index 2f48df5b..00000000 --- a/audio/sfx/sfx_1f_0d.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0d_Ch1: ; 7c33f (1f:433f) - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/sfx_1f_0e.asm b/audio/sfx/sfx_1f_0e.asm deleted file mode 100755 index 88ba9d30..00000000 --- a/audio/sfx/sfx_1f_0e.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0e_Ch1: ; 7c343 (1f:4343) - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/sfx_1f_0f.asm b/audio/sfx/sfx_1f_0f.asm deleted file mode 100755 index e314bae2..00000000 --- a/audio/sfx/sfx_1f_0f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_0f_Ch1: ; 7c347 (1f:4347) - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/sfx_1f_10.asm b/audio/sfx/sfx_1f_10.asm deleted file mode 100755 index 7c22724d..00000000 --- a/audio/sfx/sfx_1f_10.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_10_Ch1: ; 7c34e (1f:434e) - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm deleted file mode 100755 index b36fd06b..00000000 --- a/audio/sfx/sfx_1f_11.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_11_Ch1: ; 7c355 (1f:4355) - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/sfx_1f_12.asm b/audio/sfx/sfx_1f_12.asm deleted file mode 100755 index 21913c25..00000000 --- a/audio/sfx/sfx_1f_12.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_12_Ch1: ; 7c359 (1f:4359) - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/sfx_1f_13.asm b/audio/sfx/sfx_1f_13.asm deleted file mode 100755 index d9294eaa..00000000 --- a/audio/sfx/sfx_1f_13.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_13_Ch1: ; 7c35d (1f:435d) - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/sfx_1f_14.asm b/audio/sfx/sfx_1f_14.asm deleted file mode 100755 index 4f52b842..00000000 --- a/audio/sfx/sfx_1f_14.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_1f_14_Ch1: ; 7c9fc (1f:49fc) - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b) - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a) - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/sfx_1f_15.asm b/audio/sfx/sfx_1f_15.asm deleted file mode 100755 index 0f16cb0e..00000000 --- a/audio/sfx/sfx_1f_15.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c) - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f) - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_1f_15_Ch3: ; 7cc32 (1f:4c32) - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/sfx_1f_16.asm b/audio/sfx/sfx_1f_16.asm deleted file mode 100755 index 450403b4..00000000 --- a/audio/sfx/sfx_1f_16.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_1f_16_Ch1: ; 7cb81 (1f:4b81) - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_1f_16_Ch2: ; 7cb90 (1f:4b90) - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e) - endchannel diff --git a/audio/sfx/sfx_1f_17.asm b/audio/sfx/sfx_1f_17.asm deleted file mode 100755 index 7f0d0fad..00000000 --- a/audio/sfx/sfx_1f_17.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_1f_17_Ch1: ; 7c91b (1f:491b) - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_1f_17_Ch2: ; 7c93a (1f:493a) - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_1f_17_Ch3: ; 7c959 (1f:4959) - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_1f_18.asm b/audio/sfx/sfx_1f_18.asm deleted file mode 100755 index 066128bb..00000000 --- a/audio/sfx/sfx_1f_18.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_1f_18_Ch1: ; 7ccca (1f:4cca) - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9) - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_1f_18_Ch3: ; 7cd08 (1f:4d08) - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_1f_19.asm b/audio/sfx/sfx_1f_19.asm deleted file mode 100755 index 119a5f9f..00000000 --- a/audio/sfx/sfx_1f_19.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_1f_19_Ch1: ; 7caaa (1f:4aaa) - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_1f_19_Ch2: ; 7cabd (1f:4abd) - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_1f_19_Ch3: ; 7cacf (1f:4acf) - endchannel diff --git a/audio/sfx/sfx_1f_1a.asm b/audio/sfx/sfx_1f_1a.asm deleted file mode 100755 index 38a6df2a..00000000 --- a/audio/sfx/sfx_1f_1a.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54) - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e) - endchannel - - -SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f) - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/sfx_1f_1b.asm b/audio/sfx/sfx_1f_1b.asm deleted file mode 100755 index 12c4a66b..00000000 --- a/audio/sfx/sfx_1f_1b.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82) - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91) - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0) - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/sfx_1f_1c.asm b/audio/sfx/sfx_1f_1c.asm deleted file mode 100755 index 4ed5efc6..00000000 --- a/audio/sfx/sfx_1f_1c.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a) - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_1f_1c_Ch2: ; 7ccad (1f:4cad) - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0) - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_1f_1d.asm b/audio/sfx/sfx_1f_1d.asm deleted file mode 100755 index ce7f4b4c..00000000 --- a/audio/sfx/sfx_1f_1d.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4) - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1) - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/sfx_1f_1e.asm b/audio/sfx/sfx_1f_1e.asm deleted file mode 100755 index 86f88f54..00000000 --- a/audio/sfx/sfx_1f_1e.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f) - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e) - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/sfx_1f_1f.asm b/audio/sfx/sfx_1f_1f.asm deleted file mode 100755 index 2733036b..00000000 --- a/audio/sfx/sfx_1f_1f.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0) - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_1f_1f_Ch2: ; 7cafb (1f:4afb) - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a) - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/sfx_1f_20.asm b/audio/sfx/sfx_1f_20.asm deleted file mode 100755 index 8449e4db..00000000 --- a/audio/sfx/sfx_1f_20.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_1f_20_Ch1: ; 7cb33 (1f:4b33) - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a) - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_1f_20_Ch3: ; 7cb80 (1f:4b80) - endchannel diff --git a/audio/sfx/sfx_1f_21.asm b/audio/sfx/sfx_1f_21.asm deleted file mode 100755 index faf056f2..00000000 --- a/audio/sfx/sfx_1f_21.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f) - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_1f_21_Ch1 - endchannel - - -SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe) - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_1f_21_Ch3: ; 7cbed (1f:4bed) - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/sfx_1f_22.asm b/audio/sfx/sfx_1f_22.asm deleted file mode 100755 index bc9c9690..00000000 --- a/audio/sfx/sfx_1f_22.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_1f_22_Ch1: ; 7ca24 (1f:4a24) - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_1f_22_Ch2: ; 7ca37 (1f:4a37) - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a) - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/sfx_1f_23.asm b/audio/sfx/sfx_1f_23.asm deleted file mode 100755 index 51066146..00000000 --- a/audio/sfx/sfx_1f_23.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_1f_23_Ch1: ; 7c966 (1f:4966) - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_1f_23_Ch2: ; 7c981 (1f:4981) - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_1f_23_Ch3: ; 7c99c (1f:499c) - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/sfx_1f_24.asm b/audio/sfx/sfx_1f_24.asm deleted file mode 100755 index f4d4e4de..00000000 --- a/audio/sfx/sfx_1f_24.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_1f_24_Ch1: ; 7c9ac (1f:49ac) - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_1f_24_Ch2: ; 7c9cf (1f:49cf) - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2) - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/sfx_1f_25.asm b/audio/sfx/sfx_1f_25.asm deleted file mode 100755 index 4b137a75..00000000 --- a/audio/sfx/sfx_1f_25.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_1f_25_Ch1: ; 7c888 (1f:4888) - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7) - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_1f_25_Ch3: ; 7c8ca (1f:48ca) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_1f_26.asm b/audio/sfx/sfx_1f_26.asm deleted file mode 100755 index f3613315..00000000 --- a/audio/sfx/sfx_1f_26.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_26_Ch1: ; 7cda0 (1f:4da0) - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3) - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6) - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/sfx_1f_27.asm b/audio/sfx/sfx_1f_27.asm deleted file mode 100755 index 81ec2ab1..00000000 --- a/audio/sfx/sfx_1f_27.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3) - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_1f_27_Ch2: ; 7cdee (1f:4dee) - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_1f_27_Ch3: ; 7ce09 (1f:4e09) - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_1f_28.asm b/audio/sfx/sfx_1f_28.asm deleted file mode 100755 index 2a510f48..00000000 --- a/audio/sfx/sfx_1f_28.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c) - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b) - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a) - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_1f_29.asm b/audio/sfx/sfx_1f_29.asm deleted file mode 100755 index cb7b5b0c..00000000 --- a/audio/sfx/sfx_1f_29.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa) - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5) - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0) - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/sfx_1f_2a.asm b/audio/sfx/sfx_1f_2a.asm deleted file mode 100755 index fb0d330f..00000000 --- a/audio/sfx/sfx_1f_2a.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d) - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c) - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b) - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/sfx_1f_2b.asm b/audio/sfx/sfx_1f_2b.asm deleted file mode 100755 index 1b588221..00000000 --- a/audio/sfx/sfx_1f_2b.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3) - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06) - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19) - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/sfx_1f_2c.asm b/audio/sfx/sfx_1f_2c.asm deleted file mode 100755 index 9c051799..00000000 --- a/audio/sfx/sfx_1f_2c.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_1f_2c_Ch1: ; 7d003 (1f:5003) - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_1f_2c_Ch2: ; 7d026 (1f:5026) - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_1f_2c_Ch3: ; 7d049 (1f:5049) - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_1f_2d.asm b/audio/sfx/sfx_1f_2d.asm deleted file mode 100755 index c46af9f2..00000000 --- a/audio/sfx/sfx_1f_2d.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b) - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a) - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c) - endchannel diff --git a/audio/sfx/sfx_1f_2e.asm b/audio/sfx/sfx_1f_2e.asm deleted file mode 100755 index 50f9f172..00000000 --- a/audio/sfx/sfx_1f_2e.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74) - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f) - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa) - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_1f_2f.asm b/audio/sfx/sfx_1f_2f.asm deleted file mode 100755 index 10b6698c..00000000 --- a/audio/sfx/sfx_1f_2f.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65) - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c) - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93) - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/sfx_1f_30.asm b/audio/sfx/sfx_1f_30.asm deleted file mode 100755 index 8862b34c..00000000 --- a/audio/sfx/sfx_1f_30.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_1f_30_Ch1: ; 7cf26 (1f:4f26) - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_1f_30_Ch2: ; 7cf49 (1f:4f49) - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_1f_30_Ch3: ; 7cf64 (1f:4f64) - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/sfx_1f_31.asm b/audio/sfx/sfx_1f_31.asm deleted file mode 100755 index 018a0298..00000000 --- a/audio/sfx/sfx_1f_31.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd) - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8) - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3) - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_1f_32.asm b/audio/sfx/sfx_1f_32.asm deleted file mode 100755 index 853b9da3..00000000 --- a/audio/sfx/sfx_1f_32.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_1f_32_Ch1: ; 7ce44 (1f:4e44) - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_1f_32_Ch2: ; 7ce67 (1f:4e67) - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e) - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/sfx_1f_33.asm b/audio/sfx/sfx_1f_33.asm deleted file mode 100755 index a15fb1d6..00000000 --- a/audio/sfx/sfx_1f_33.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_33_Ch1: ; 7d05c (1f:505c) - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_1f_33_Ch2: ; 7d06f (1f:506f) - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_1f_33_Ch3: ; 7d082 (1f:5082) - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/sfx_1f_34.asm b/audio/sfx/sfx_1f_34.asm deleted file mode 100755 index 1bd919ec..00000000 --- a/audio/sfx/sfx_1f_34.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_34_Ch1: ; 7d08f (1f:508f) - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2) - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5) - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/sfx_1f_35.asm b/audio/sfx/sfx_1f_35.asm deleted file mode 100755 index befa3e39..00000000 --- a/audio/sfx/sfx_1f_35.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2) - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5) - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_1f_35_Ch3: ; 7d107 (1f:5107) - endchannel diff --git a/audio/sfx/sfx_1f_36.asm b/audio/sfx/sfx_1f_36.asm deleted file mode 100755 index 9382bb60..00000000 --- a/audio/sfx/sfx_1f_36.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_36_Ch1: ; 7d108 (1f:5108) - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_1f_36_Ch2: ; 7d11b (1f:511b) - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_1f_36_Ch3: ; 7d12e (1f:512e) - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/sfx_1f_37.asm b/audio/sfx/sfx_1f_37.asm deleted file mode 100755 index b8812f2a..00000000 --- a/audio/sfx/sfx_1f_37.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_1f_37_Ch1: ; 7c7fb (1f:47fb) - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_1f_37_Ch2: ; 7c812 (1f:4812) - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_1f_37_Ch3: ; 7c825 (1f:4825) - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_1f_38.asm b/audio/sfx/sfx_1f_38.asm deleted file mode 100755 index 62bd652c..00000000 --- a/audio/sfx/sfx_1f_38.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_1f_38_Ch1: ; 7c832 (1f:4832) - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_1f_38_Ch2: ; 7c855 (1f:4855) - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_1f_38_Ch3: ; 7c878 (1f:4878) - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_1f_39.asm b/audio/sfx/sfx_1f_39.asm deleted file mode 100755 index 30703f3a..00000000 --- a/audio/sfx/sfx_1f_39.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0) - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7) - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_1f_39_Ch3: ; 7c90e (1f:490e) - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm deleted file mode 100755 index f39fe5f6..00000000 --- a/audio/sfx/sfx_1f_3a.asm +++ /dev/null @@ -1,47 +0,0 @@ -SFX_1f_3a_Ch1: ; 7e850 (1f:6850) - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 - octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 - octave 4 - E_ 4 - endchannel - - -SFX_1f_3a_Ch2: ; 7e867 (1f:6867) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 - octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel - - -SFX_1f_3a_Ch3: ; 7e877 (1f:6877) - executemusic - notetype 4, 1, 0 - octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 - octave 4 - B_ 2 - rest 2 - endchannel diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm deleted file mode 100755 index 66e3ba03..00000000 --- a/audio/sfx/sfx_1f_3b.asm +++ /dev/null @@ -1,69 +0,0 @@ -SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - - -SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - - -SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f) - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/sfx_1f_3c.asm b/audio/sfx/sfx_1f_3c.asm deleted file mode 100755 index 688e89d2..00000000 --- a/audio/sfx/sfx_1f_3c.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3) - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_3d.asm b/audio/sfx/sfx_1f_3d.asm deleted file mode 100755 index f5eb6afa..00000000 --- a/audio/sfx/sfx_1f_3d.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_3d_Ch1: ; 7c490 (1f:4490) - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_3e.asm b/audio/sfx/sfx_1f_3e.asm deleted file mode 100755 index 604e553b..00000000 --- a/audio/sfx/sfx_1f_3e.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2) - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_3f.asm b/audio/sfx/sfx_1f_3f.asm deleted file mode 100755 index 68ab34d5..00000000 --- a/audio/sfx/sfx_1f_3f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3) - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel diff --git a/audio/sfx/sfx_1f_40.asm b/audio/sfx/sfx_1f_40.asm deleted file mode 100755 index 04f89afb..00000000 --- a/audio/sfx/sfx_1f_40.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_40_Ch1: ; 7c44b (1f:444b) - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm deleted file mode 100755 index 415d43d5..00000000 --- a/audio/sfx/sfx_1f_41.asm +++ /dev/null @@ -1,77 +0,0 @@ -SFX_1f_41_Ch1: ; 7edda (1f:6dda) - executemusic - tempo 256 - volume 7, 7 - duty 2 - notetype 5, 11, 1 - octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 - octave 4 - C_ 4 - E_ 4 - octave 3 - F_ 4 - endchannel - - -SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) - executemusic - duty 2 - notetype 5, 12, 2 - octave 5 - F_ 2 - E_ 1 - rest 1 - D_ 2 - C_ 1 - rest 1 - octave 4 - A# 2 - octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel - - -SFX_1f_41_Ch3: ; 7ee09 (1f:6e09) - executemusic - notetype 5, 1, 0 - octave 5 - C_ 1 - rest 1 - octave 4 - F_ 2 - octave 5 - C_ 1 - rest 1 - octave 4 - A# 1 - rest 1 - A_ 1 - rest 1 - G_ 1 - rest 1 - F_ 1 - rest 1 - E_ 1 - rest 1 - octave 5 - F_ 1 - rest 3 - C_ 1 - rest 3 - octave 4 - F_ 2 - rest 2 - endchannel diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm deleted file mode 100755 index 103b01c6..00000000 --- a/audio/sfx/sfx_1f_42.asm +++ /dev/null @@ -1,59 +0,0 @@ -SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 - octave 3 - A# 4 - notetype 5, 11, 1 - octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel - - -SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) - executemusic - vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 - octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 - octave 5 - D# 8 - endchannel - - -SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf) - executemusic - notetype 5, 1, 0 - octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel diff --git a/audio/sfx/sfx_1f_43.asm b/audio/sfx/sfx_1f_43.asm deleted file mode 100755 index 1f238fb0..00000000 --- a/audio/sfx/sfx_1f_43.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_1f_43_Ch1: ; 7c49f (1f:449f) - duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_1f_43_Ch1 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_44.asm b/audio/sfx/sfx_1f_44.asm deleted file mode 100755 index fc404eab..00000000 --- a/audio/sfx/sfx_1f_44.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7) - duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_45.asm b/audio/sfx/sfx_1f_45.asm deleted file mode 100755 index f6548431..00000000 --- a/audio/sfx/sfx_1f_45.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6) - duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 64, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 192, 7 - unknownsfx0x20 3, 129, 0, 7 - endchannel diff --git a/audio/sfx/sfx_1f_46.asm b/audio/sfx/sfx_1f_46.asm deleted file mode 100755 index 3cd98880..00000000 --- a/audio/sfx/sfx_1f_46.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_46_Ch1: ; 7c505 (1f:4505) - duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_47.asm b/audio/sfx/sfx_1f_47.asm deleted file mode 100755 index 729369e8..00000000 --- a/audio/sfx/sfx_1f_47.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_47_Ch1: ; 7c518 (1f:4518) - duty 2 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_48.asm b/audio/sfx/sfx_1f_48.asm deleted file mode 100755 index 35aa7ad5..00000000 --- a/audio/sfx/sfx_1f_48.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_48_Ch1: ; 7c52b (1f:452b) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_49.asm b/audio/sfx/sfx_1f_49.asm deleted file mode 100755 index 160979ac..00000000 --- a/audio/sfx/sfx_1f_49.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_1f_49_Ch1: ; 7c546 (1f:4546) - duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_4a.asm b/audio/sfx/sfx_1f_4a.asm deleted file mode 100755 index 187e9b10..00000000 --- a/audio/sfx/sfx_1f_4a.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_1f_4a_Ch1: ; 7c55d (1f:455d) - duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_4b.asm b/audio/sfx/sfx_1f_4b.asm deleted file mode 100755 index b3065b2f..00000000 --- a/audio/sfx/sfx_1f_4b.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_4b_Ch1: ; 7c572 (1f:4572) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_4c.asm b/audio/sfx/sfx_1f_4c.asm deleted file mode 100755 index 56004e05..00000000 --- a/audio/sfx/sfx_1f_4c.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_4c_Ch1: ; 7c58d (1f:458d) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_4d.asm b/audio/sfx/sfx_1f_4d.asm deleted file mode 100755 index c57299c0..00000000 --- a/audio/sfx/sfx_1f_4d.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8) - duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_4e.asm b/audio/sfx/sfx_1f_4e.asm deleted file mode 100755 index 624c2137..00000000 --- a/audio/sfx/sfx_1f_4e.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3) - duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_4f.asm b/audio/sfx/sfx_1f_4f.asm deleted file mode 100755 index 91394f9f..00000000 --- a/audio/sfx/sfx_1f_4f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_4f_Ch1: ; 7c5be (1f:45be) - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_50.asm b/audio/sfx/sfx_1f_50.asm deleted file mode 100755 index 50cc4ee7..00000000 --- a/audio/sfx/sfx_1f_50.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_1f_50_Ch1: ; 7c5cb (1f:45cb) - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_51.asm b/audio/sfx/sfx_1f_51.asm deleted file mode 100755 index 438877f1..00000000 --- a/audio/sfx/sfx_1f_51.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_1f_51_Ch1: ; 7c5fc (1f:45fc) - duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 - endchannel - - -SFX_1f_51_Ch2: ; 7c613 (1f:4613) - duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_52.asm b/audio/sfx/sfx_1f_52.asm deleted file mode 100755 index 98ef0d30..00000000 --- a/audio/sfx/sfx_1f_52.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_52_Ch1: ; 7c626 (1f:4626) - duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_53.asm b/audio/sfx/sfx_1f_53.asm deleted file mode 100755 index 04415233..00000000 --- a/audio/sfx/sfx_1f_53.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_53_Ch1: ; 7c631 (1f:4631) - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_1f_54.asm b/audio/sfx/sfx_1f_54.asm deleted file mode 100755 index faf5304e..00000000 --- a/audio/sfx/sfx_1f_54.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_1f_54_Ch1: ; 7c64a (1f:464a) - duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 - endchannel - - -SFX_1f_54_Ch2: ; 7c669 (1f:4669) - duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 - endchannel diff --git a/audio/sfx/sfx_1f_55.asm b/audio/sfx/sfx_1f_55.asm deleted file mode 100755 index e2fbffae..00000000 --- a/audio/sfx/sfx_1f_55.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_1f_55_Ch1: ; 7c688 (1f:4688) - duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_56.asm b/audio/sfx/sfx_1f_56.asm deleted file mode 100755 index 30de8cd2..00000000 --- a/audio/sfx/sfx_1f_56.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_56_Ch1: ; 7c3ca (1f:43ca) - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_1f_57.asm b/audio/sfx/sfx_1f_57.asm deleted file mode 100755 index b73bb687..00000000 --- a/audio/sfx/sfx_1f_57.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_57_Ch1: ; 7c3da (1f:43da) - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 - endchannel diff --git a/audio/sfx/sfx_1f_58.asm b/audio/sfx/sfx_1f_58.asm deleted file mode 100755 index f5844495..00000000 --- a/audio/sfx/sfx_1f_58.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1) - duty 2 - unknownsfx0x20 8, 225, 64, 7 - endchannel - - -SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8) - duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 - endchannel diff --git a/audio/sfx/sfx_1f_59.asm b/audio/sfx/sfx_1f_59.asm deleted file mode 100755 index 9c17156f..00000000 --- a/audio/sfx/sfx_1f_59.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_1f_59_Ch1: ; 7c404 (1f:4404) - duty 2 - unknownsfx0x20 4, 241, 128, 7 - endchannel - - -SFX_1f_59_Ch2: ; 7c40b (1f:440b) - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 - endchannel diff --git a/audio/sfx/sfx_1f_5a.asm b/audio/sfx/sfx_1f_5a.asm deleted file mode 100755 index 29b947b7..00000000 --- a/audio/sfx/sfx_1f_5a.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_1f_5a_Ch1: ; 7c416 (1f:4416) - duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 - endchannel - - -SFX_1f_5a_Ch2: ; 7c421 (1f:4421) - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 - endchannel diff --git a/audio/sfx/sfx_1f_5b.asm b/audio/sfx/sfx_1f_5b.asm deleted file mode 100755 index bc2e6fef..00000000 --- a/audio/sfx/sfx_1f_5b.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_5b_Ch1: ; 7c430 (1f:4430) - duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_5c.asm b/audio/sfx/sfx_1f_5c.asm deleted file mode 100755 index 8671002c..00000000 --- a/audio/sfx/sfx_1f_5c.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_5c_Ch1: ; 7c43b (1f:443b) - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 - endchannel diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/sfx_1f_5d.asm deleted file mode 100755 index 3a325f27..00000000 --- a/audio/sfx/sfx_1f_5d.asm +++ /dev/null @@ -1,36 +0,0 @@ -SFX_1f_5d_Ch1: ; 7c45e (1f:445e) - duty 2 -IF DEF(_RED) - unknownsfx0x20 4, 244, 0, 7 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 -ELSE - unknownsfx0x20 3, 228, 0, 6 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 15, 242, 224, 7 -ENDC - endchannel - - -SFX_1f_5d_Ch2: ; 7c475 (1f:4475) - duty 2 -IF DEF(_RED) - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 3, 212, 1, 7 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 -ELSE - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 3, 196, 1, 6 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 15, 210, 225, 7 -ENDC - endchannel diff --git a/audio/sfx/sfx_1f_5e.asm b/audio/sfx/sfx_1f_5e.asm deleted file mode 100755 index 6adbb979..00000000 --- a/audio/sfx/sfx_1f_5e.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5) - unknownnoise0x20 6, 32, 16 - unknownnoise0x20 6, 47, 64 - unknownnoise0x20 6, 79, 65 - unknownnoise0x20 6, 143, 65 - unknownnoise0x20 6, 207, 66 - unknownnoise0x20 8, 215, 66 - unknownnoise0x20 15, 231, 67 - unknownnoise0x20 15, 242, 67 - endchannel diff --git a/audio/sfx/sfx_1f_5f.asm b/audio/sfx/sfx_1f_5f.asm deleted file mode 100755 index efc1a5e3..00000000 --- a/audio/sfx/sfx_1f_5f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_5f_Ch1: ; 7c6be (1f:46be) - duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 64, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_60.asm b/audio/sfx/sfx_1f_60.asm deleted file mode 100755 index 907aa79f..00000000 --- a/audio/sfx/sfx_1f_60.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9) - duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 128, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_61.asm b/audio/sfx/sfx_1f_61.asm deleted file mode 100755 index 0afe5055..00000000 --- a/audio/sfx/sfx_1f_61.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4) - unknownnoise0x20 2, 111, 33 - unknownnoise0x20 2, 175, 49 - unknownnoise0x20 15, 242, 65 - endchannel diff --git a/audio/sfx/sfx_1f_62.asm b/audio/sfx/sfx_1f_62.asm deleted file mode 100755 index 8029ff02..00000000 --- a/audio/sfx/sfx_1f_62.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_62_Ch1: ; 7c6de (1f:46de) - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 - endchannel diff --git a/audio/sfx/sfx_1f_63.asm b/audio/sfx/sfx_1f_63.asm deleted file mode 100755 index 2114130a..00000000 --- a/audio/sfx/sfx_1f_63.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5) - unknownnoise0x20 4, 44, 32 - unknownnoise0x20 3, 160, 32 - unknownnoise0x20 3, 176, 33 - unknownnoise0x20 3, 192, 34 - unknownnoise0x20 15, 210, 36 - endchannel diff --git a/audio/sfx/sfx_1f_64.asm b/audio/sfx/sfx_1f_64.asm deleted file mode 100755 index ab5a4c04..00000000 --- a/audio/sfx/sfx_1f_64.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5) - duty 2 - unknownsfx0x20 1, 242, 160, 6 - unknownsfx0x20 1, 242, 224, 6 - unknownsfx0x20 8, 241, 0, 7 - endchannel diff --git a/audio/sfx/sfx_1f_65.asm b/audio/sfx/sfx_1f_65.asm deleted file mode 100755 index dc564910..00000000 --- a/audio/sfx/sfx_1f_65.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_1f_65_Ch1: ; 7c704 (1f:4704) - duty 2 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 8, 129, 224, 7 - endchannel diff --git a/audio/sfx/sfx_1f_66.asm b/audio/sfx/sfx_1f_66.asm deleted file mode 100755 index 068917bb..00000000 --- a/audio/sfx/sfx_1f_66.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_1f_66_Ch1: ; 7c70f (1f:470f) - duty 3 - unknownsfx0x20 5, 225, 0, 7 - unknownsfx0x20 2, 225, 128, 7 - unknownsfx0x20 15, 241, 192, 7 - endchannel - - -SFX_1f_66_Ch2: ; 7c71e (1f:471e) - duty 2 - unknownsfx0x20 4, 193, 193, 6 - unknownsfx0x20 2, 193, 65, 7 - unknownsfx0x20 15, 209, 129, 7 - endchannel diff --git a/audio/sfx/sfx_1f_67.asm b/audio/sfx/sfx_1f_67.asm deleted file mode 100755 index a81d47bf..00000000 --- a/audio/sfx/sfx_1f_67.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_1f_67_Ch1: ; 7c72d (1f:472d) - dutycycle 228 - unknownsfx0x10 47 - unknownsfx0x20 4, 64, 224, 7 - unknownsfx0x20 4, 96, 224, 7 - unknownsfx0x20 4, 128, 224, 7 - unknownsfx0x20 8, 160, 224, 7 - unknownsfx0x20 8, 160, 224, 7 - unknownsfx0x20 8, 128, 224, 7 - unknownsfx0x20 8, 96, 224, 7 - unknownsfx0x20 8, 48, 224, 7 - unknownsfx0x20 15, 18, 224, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm new file mode 100644 index 00000000..2cb831c8 --- /dev/null +++ b/audio/sfx/shooting_star.asm @@ -0,0 +1,14 @@ +SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d) + dutycycle 228 + unknownsfx0x10 47 + unknownsfx0x20 4, 64, 224, 7 + unknownsfx0x20 4, 96, 224, 7 + unknownsfx0x20 4, 128, 224, 7 + unknownsfx0x20 8, 160, 224, 7 + unknownsfx0x20 8, 160, 224, 7 + unknownsfx0x20 8, 128, 224, 7 + unknownsfx0x20 8, 96, 224, 7 + unknownsfx0x20 8, 48, 224, 7 + unknownsfx0x20 15, 18, 224, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm new file mode 100644 index 00000000..61ca1933 --- /dev/null +++ b/audio/sfx/shrink_1.asm @@ -0,0 +1,10 @@ +SFX_Shrink_1_Ch1: ; 854e (2:454e) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 6 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 5 + unknownsfx0x20 15, 71, 128, 4 + unknownsfx0x20 15, 23, 0, 4 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm new file mode 100644 index 00000000..59fe1556 --- /dev/null +++ b/audio/sfx/shrink_3.asm @@ -0,0 +1,10 @@ +SFX_Shrink_3_Ch1: ; 7c52b (1f:452b) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 6 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 5 + unknownsfx0x20 15, 71, 128, 4 + unknownsfx0x20 15, 23, 0, 4 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm new file mode 100644 index 00000000..66e4fe95 --- /dev/null +++ b/audio/sfx/silph_scope.asm @@ -0,0 +1,9 @@ +SFX_Silph_Scope_Ch1: ; 20412 (8:4412) + duty 0 + unknownsfx0x20 0, 210, 0, 7 + unknownsfx0x20 0, 210, 64, 7 + unknownsfx0x20 0, 210, 128, 7 + unknownsfx0x20 0, 210, 192, 7 + unknownsfx0x20 10, 225, 224, 7 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm new file mode 100644 index 00000000..d122517d --- /dev/null +++ b/audio/sfx/slots_new_spin.asm @@ -0,0 +1,14 @@ +SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f) + duty 3 + unknownsfx0x20 5, 225, 0, 7 + unknownsfx0x20 2, 225, 128, 7 + unknownsfx0x20 15, 241, 192, 7 + endchannel + + +SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e) + duty 2 + unknownsfx0x20 4, 193, 193, 6 + unknownsfx0x20 2, 193, 65, 7 + unknownsfx0x20 15, 209, 129, 7 + endchannel diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm new file mode 100644 index 00000000..2400c0df --- /dev/null +++ b/audio/sfx/slots_reward.asm @@ -0,0 +1,5 @@ +SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704) + duty 2 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 8, 129, 224, 7 + endchannel diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm new file mode 100644 index 00000000..e67af4c4 --- /dev/null +++ b/audio/sfx/slots_stop_wheel.asm @@ -0,0 +1,6 @@ +SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5) + duty 2 + unknownsfx0x20 1, 242, 160, 6 + unknownsfx0x20 1, 242, 224, 6 + unknownsfx0x20 8, 241, 0, 7 + endchannel diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm new file mode 100644 index 00000000..3aa0f74e --- /dev/null +++ b/audio/sfx/snare1_1.asm @@ -0,0 +1,3 @@ +SFX_Snare1_1_Ch1: ; 82fd (2:42fd) + unknownnoise0x20 0, 193, 51 + endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm new file mode 100644 index 00000000..7d0c3413 --- /dev/null +++ b/audio/sfx/snare1_2.asm @@ -0,0 +1,3 @@ +SFX_Snare1_2_Ch1: ; 202fd (8:42fd) + unknownnoise0x20 0, 193, 51 + endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm new file mode 100644 index 00000000..8d92bff6 --- /dev/null +++ b/audio/sfx/snare1_3.asm @@ -0,0 +1,3 @@ +SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd) + unknownnoise0x20 0, 193, 51 + endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm new file mode 100644 index 00000000..7636a4f3 --- /dev/null +++ b/audio/sfx/snare2_1.asm @@ -0,0 +1,3 @@ +SFX_Snare2_1_Ch1: ; 8301 (2:4301) + unknownnoise0x20 0, 177, 51 + endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm new file mode 100644 index 00000000..4c34e91a --- /dev/null +++ b/audio/sfx/snare2_2.asm @@ -0,0 +1,3 @@ +SFX_Snare2_2_Ch1: ; 20301 (8:4301) + unknownnoise0x20 0, 177, 51 + endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm new file mode 100644 index 00000000..eb816f54 --- /dev/null +++ b/audio/sfx/snare2_3.asm @@ -0,0 +1,3 @@ +SFX_Snare2_3_Ch1: ; 7c301 (1f:4301) + unknownnoise0x20 0, 177, 51 + endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm new file mode 100644 index 00000000..b7e319b2 --- /dev/null +++ b/audio/sfx/snare3_1.asm @@ -0,0 +1,3 @@ +SFX_Snare3_1_Ch1: ; 8305 (2:4305) + unknownnoise0x20 0, 161, 51 + endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm new file mode 100644 index 00000000..ce889e55 --- /dev/null +++ b/audio/sfx/snare3_2.asm @@ -0,0 +1,3 @@ +SFX_Snare3_2_Ch1: ; 20305 (8:4305) + unknownnoise0x20 0, 161, 51 + endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm new file mode 100644 index 00000000..c94f436f --- /dev/null +++ b/audio/sfx/snare3_3.asm @@ -0,0 +1,3 @@ +SFX_Snare3_3_Ch1: ; 7c305 (1f:4305) + unknownnoise0x20 0, 161, 51 + endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm new file mode 100644 index 00000000..20c62731 --- /dev/null +++ b/audio/sfx/snare4_1.asm @@ -0,0 +1,3 @@ +SFX_Snare4_1_Ch1: ; 8309 (2:4309) + unknownnoise0x20 0, 129, 51 + endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm new file mode 100644 index 00000000..da38dd62 --- /dev/null +++ b/audio/sfx/snare4_2.asm @@ -0,0 +1,3 @@ +SFX_Snare4_2_Ch1: ; 20309 (8:4309) + unknownnoise0x20 0, 129, 51 + endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm new file mode 100644 index 00000000..4496260b --- /dev/null +++ b/audio/sfx/snare4_3.asm @@ -0,0 +1,3 @@ +SFX_Snare4_3_Ch1: ; 7c309 (1f:4309) + unknownnoise0x20 0, 129, 51 + endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm new file mode 100644 index 00000000..e0ae8b4c --- /dev/null +++ b/audio/sfx/snare5_1.asm @@ -0,0 +1,8 @@ +SFX_Snare5_1_Ch1: ; 830d (2:430d) + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 + endchannel diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm new file mode 100644 index 00000000..649463cc --- /dev/null +++ b/audio/sfx/snare5_2.asm @@ -0,0 +1,8 @@ +SFX_Snare5_2_Ch1: ; 2030d (8:430d) + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 + endchannel diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm new file mode 100644 index 00000000..33a169b9 --- /dev/null +++ b/audio/sfx/snare5_3.asm @@ -0,0 +1,8 @@ +SFX_Snare5_3_Ch1: ; 7c30d (1f:430d) + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 + endchannel diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm new file mode 100644 index 00000000..4779226f --- /dev/null +++ b/audio/sfx/snare6_1.asm @@ -0,0 +1,3 @@ +SFX_Snare6_1_Ch1: ; 832b (2:432b) + unknownnoise0x20 0, 129, 16 + endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm new file mode 100644 index 00000000..36359d02 --- /dev/null +++ b/audio/sfx/snare6_2.asm @@ -0,0 +1,3 @@ +SFX_Snare6_2_Ch1: ; 2032b (8:432b) + unknownnoise0x20 0, 129, 16 + endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm new file mode 100644 index 00000000..d4807ff6 --- /dev/null +++ b/audio/sfx/snare6_3.asm @@ -0,0 +1,3 @@ +SFX_Snare6_3_Ch1: ; 7c32b (1f:432b) + unknownnoise0x20 0, 129, 16 + endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm new file mode 100644 index 00000000..c53642ed --- /dev/null +++ b/audio/sfx/snare7_1.asm @@ -0,0 +1,3 @@ +SFX_Snare7_1_Ch1: ; 832f (2:432f) + unknownnoise0x20 0, 130, 35 + endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm new file mode 100644 index 00000000..066aaa53 --- /dev/null +++ b/audio/sfx/snare7_2.asm @@ -0,0 +1,3 @@ +SFX_Snare7_2_Ch1: ; 2032f (8:432f) + unknownnoise0x20 0, 130, 35 + endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm new file mode 100644 index 00000000..1b058a9b --- /dev/null +++ b/audio/sfx/snare7_3.asm @@ -0,0 +1,3 @@ +SFX_Snare7_3_Ch1: ; 7c32f (1f:432f) + unknownnoise0x20 0, 130, 35 + endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm new file mode 100644 index 00000000..6269c7dc --- /dev/null +++ b/audio/sfx/snare8_1.asm @@ -0,0 +1,3 @@ +SFX_Snare8_1_Ch1: ; 8333 (2:4333) + unknownnoise0x20 0, 130, 37 + endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm new file mode 100644 index 00000000..4c5bb18e --- /dev/null +++ b/audio/sfx/snare8_2.asm @@ -0,0 +1,3 @@ +SFX_Snare8_2_Ch1: ; 20333 (8:4333) + unknownnoise0x20 0, 130, 37 + endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm new file mode 100644 index 00000000..d1f0edc0 --- /dev/null +++ b/audio/sfx/snare8_3.asm @@ -0,0 +1,3 @@ +SFX_Snare8_3_Ch1: ; 7c333 (1f:4333) + unknownnoise0x20 0, 130, 37 + endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm new file mode 100644 index 00000000..44b2e8c7 --- /dev/null +++ b/audio/sfx/snare9_1.asm @@ -0,0 +1,3 @@ +SFX_Snare9_1_Ch1: ; 8337 (2:4337) + unknownnoise0x20 0, 130, 38 + endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm new file mode 100644 index 00000000..1d20de2d --- /dev/null +++ b/audio/sfx/snare9_2.asm @@ -0,0 +1,3 @@ +SFX_Snare9_2_Ch1: ; 20337 (8:4337) + unknownnoise0x20 0, 130, 38 + endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm new file mode 100644 index 00000000..849f4404 --- /dev/null +++ b/audio/sfx/snare9_3.asm @@ -0,0 +1,3 @@ +SFX_Snare9_3_Ch1: ; 7c337 (1f:4337) + unknownnoise0x20 0, 130, 38 + endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm new file mode 100644 index 00000000..3989c148 --- /dev/null +++ b/audio/sfx/ss_anne_horn_1.asm @@ -0,0 +1,22 @@ +SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d) + duty 2 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 242, 0, 5 + endchannel + + +SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c) + duty 3 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 242, 130, 4 + endchannel diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm new file mode 100644 index 00000000..c671b6cb --- /dev/null +++ b/audio/sfx/ss_anne_horn_3.asm @@ -0,0 +1,22 @@ +SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a) + duty 2 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 242, 0, 5 + endchannel + + +SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669) + duty 3 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 242, 130, 4 + endchannel diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm new file mode 100644 index 00000000..350b08ce --- /dev/null +++ b/audio/sfx/start_menu_1.asm @@ -0,0 +1,4 @@ +SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3) + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 + endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm new file mode 100644 index 00000000..aabd41ce --- /dev/null +++ b/audio/sfx/start_menu_2.asm @@ -0,0 +1,4 @@ +SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6) + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 + endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm new file mode 100644 index 00000000..566f11f4 --- /dev/null +++ b/audio/sfx/start_menu_3.asm @@ -0,0 +1,4 @@ +SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3) + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 + endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm new file mode 100644 index 00000000..6759ef6a --- /dev/null +++ b/audio/sfx/super_effective.asm @@ -0,0 +1,4 @@ +SFX_Super_Effective_Ch1: ; 20574 (8:4574) + unknownnoise0x20 4, 241, 52 + unknownnoise0x20 15, 242, 100 + endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm new file mode 100644 index 00000000..c96d8522 --- /dev/null +++ b/audio/sfx/swap_1.asm @@ -0,0 +1,11 @@ +SFX_Swap_1_Ch1: ; 83f8 (2:43f8) + duty 2 + unknownsfx0x20 8, 225, 64, 7 + endchannel + + +SFX_Swap_1_Ch2: ; 83ff (2:43ff) + duty 2 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 8, 177, 65, 7 + endchannel diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm new file mode 100644 index 00000000..95aa3f19 --- /dev/null +++ b/audio/sfx/swap_3.asm @@ -0,0 +1,11 @@ +SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1) + duty 2 + unknownsfx0x20 8, 225, 64, 7 + endchannel + + +SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8) + duty 2 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 8, 177, 65, 7 + endchannel diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm new file mode 100644 index 00000000..040e95aa --- /dev/null +++ b/audio/sfx/switch_1.asm @@ -0,0 +1,8 @@ +SFX_Switch_1_Ch1: ; 8569 (2:4569) + duty 2 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 2, 241, 128, 6 + unknownsfx0x20 1, 0, 0, 0 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 0, 0, 0 + endchannel diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm new file mode 100644 index 00000000..cbe6c8b2 --- /dev/null +++ b/audio/sfx/switch_3.asm @@ -0,0 +1,8 @@ +SFX_Switch_3_Ch1: ; 7c546 (1f:4546) + duty 2 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 2, 241, 128, 6 + unknownsfx0x20 1, 0, 0, 0 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 0, 0, 0 + endchannel diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm new file mode 100644 index 00000000..f9fc5ee2 --- /dev/null +++ b/audio/sfx/teleport_enter1_1.asm @@ -0,0 +1,10 @@ +SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 7 + unknownsfx0x20 15, 183, 128, 6 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 5 + unknownsfx0x20 15, 23, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm new file mode 100644 index 00000000..24220173 --- /dev/null +++ b/audio/sfx/teleport_enter1_3.asm @@ -0,0 +1,10 @@ +SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 7 + unknownsfx0x20 15, 183, 128, 6 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 5 + unknownsfx0x20 15, 23, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm new file mode 100644 index 00000000..c3c593b2 --- /dev/null +++ b/audio/sfx/teleport_enter2_1.asm @@ -0,0 +1,6 @@ +SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1) + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 1, 0, 0 + endchannel diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm new file mode 100644 index 00000000..628bb9fa --- /dev/null +++ b/audio/sfx/teleport_enter2_3.asm @@ -0,0 +1,6 @@ +SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be) + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 1, 0, 0 + endchannel diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm new file mode 100644 index 00000000..46ba29cf --- /dev/null +++ b/audio/sfx/teleport_exit1_1.asm @@ -0,0 +1,10 @@ +SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 5 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 6 + unknownsfx0x20 15, 23, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm new file mode 100644 index 00000000..8d203212 --- /dev/null +++ b/audio/sfx/teleport_exit1_3.asm @@ -0,0 +1,10 @@ +SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 5 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 6 + unknownsfx0x20 15, 23, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm new file mode 100644 index 00000000..37159083 --- /dev/null +++ b/audio/sfx/teleport_exit2_1.asm @@ -0,0 +1,6 @@ +SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb) + duty 1 + unknownsfx0x10 22 + unknownsfx0x20 15, 210, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm new file mode 100644 index 00000000..c7ad054b --- /dev/null +++ b/audio/sfx/teleport_exit2_3.asm @@ -0,0 +1,6 @@ +SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8) + duty 1 + unknownsfx0x10 22 + unknownsfx0x20 15, 210, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm new file mode 100644 index 00000000..a8099ae1 --- /dev/null +++ b/audio/sfx/tink_1.asm @@ -0,0 +1,8 @@ +SFX_Tink_1_Ch1: ; 840a (2:440a) + duty 2 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm new file mode 100644 index 00000000..cca37381 --- /dev/null +++ b/audio/sfx/tink_2.asm @@ -0,0 +1,8 @@ +SFX_Tink_2_Ch1: ; 203dd (8:43dd) + duty 2 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm new file mode 100644 index 00000000..7299b7ae --- /dev/null +++ b/audio/sfx/tink_3.asm @@ -0,0 +1,8 @@ +SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3) + duty 2 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm new file mode 100644 index 00000000..ce2bbc0a --- /dev/null +++ b/audio/sfx/trade_machine_1.asm @@ -0,0 +1,7 @@ +SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee) + duty 2 + unknownsfx0x10 21 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm new file mode 100644 index 00000000..f7515ffb --- /dev/null +++ b/audio/sfx/trade_machine_3.asm @@ -0,0 +1,7 @@ +SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7) + duty 2 + unknownsfx0x10 21 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm new file mode 100644 index 00000000..fded5b94 --- /dev/null +++ b/audio/sfx/triangle1_1.asm @@ -0,0 +1,3 @@ +SFX_Triangle1_1_Ch1: ; 8320 (2:4320) + unknownnoise0x20 0, 81, 42 + endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm new file mode 100644 index 00000000..4f4474ee --- /dev/null +++ b/audio/sfx/triangle1_2.asm @@ -0,0 +1,3 @@ +SFX_Triangle1_2_Ch1: ; 20320 (8:4320) + unknownnoise0x20 0, 81, 42 + endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm new file mode 100644 index 00000000..d1ad9390 --- /dev/null +++ b/audio/sfx/triangle1_3.asm @@ -0,0 +1,3 @@ +SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320) + unknownnoise0x20 0, 81, 42 + endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm new file mode 100644 index 00000000..f9c4bc6a --- /dev/null +++ b/audio/sfx/triangle2_1.asm @@ -0,0 +1,4 @@ +SFX_Triangle2_1_Ch1: ; 8324 (2:4324) + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 + endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm new file mode 100644 index 00000000..feddf1af --- /dev/null +++ b/audio/sfx/triangle2_2.asm @@ -0,0 +1,4 @@ +SFX_Triangle2_2_Ch1: ; 20324 (8:4324) + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 + endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm new file mode 100644 index 00000000..a4acff1b --- /dev/null +++ b/audio/sfx/triangle2_3.asm @@ -0,0 +1,4 @@ +SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324) + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 + endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm new file mode 100644 index 00000000..e4c3c919 --- /dev/null +++ b/audio/sfx/triangle3_1.asm @@ -0,0 +1,4 @@ +SFX_Triangle3_1_Ch1: ; 834e (2:434e) + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 + endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm new file mode 100644 index 00000000..7a642878 --- /dev/null +++ b/audio/sfx/triangle3_2.asm @@ -0,0 +1,4 @@ +SFX_Triangle3_2_Ch1: ; 2034e (8:434e) + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 + endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm new file mode 100644 index 00000000..73ad42ce --- /dev/null +++ b/audio/sfx/triangle3_3.asm @@ -0,0 +1,4 @@ +SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e) + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 + endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm new file mode 100644 index 00000000..7b4e999d --- /dev/null +++ b/audio/sfx/turn_off_pc_1.asm @@ -0,0 +1,7 @@ +SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528) + duty 2 + unknownsfx0x20 4, 240, 0, 6 + unknownsfx0x20 4, 240, 0, 4 + unknownsfx0x20 4, 240, 0, 2 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm new file mode 100644 index 00000000..057ab9a4 --- /dev/null +++ b/audio/sfx/turn_off_pc_3.asm @@ -0,0 +1,7 @@ +SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505) + duty 2 + unknownsfx0x20 4, 240, 0, 6 + unknownsfx0x20 4, 240, 0, 4 + unknownsfx0x20 4, 240, 0, 2 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm new file mode 100644 index 00000000..b537791c --- /dev/null +++ b/audio/sfx/turn_on_pc_1.asm @@ -0,0 +1,13 @@ +SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd) + duty 2 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 3, 161, 128, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 64, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 128, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 192, 7 + unknownsfx0x20 8, 161, 0, 7 + endchannel diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm new file mode 100644 index 00000000..df654cfa --- /dev/null +++ b/audio/sfx/turn_on_pc_3.asm @@ -0,0 +1,14 @@ +SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6) + duty 2 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 3, 129, 128, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 64, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 128, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 192, 7 + unknownsfx0x20 3, 129, 0, 7 + endchannel diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm new file mode 100644 index 00000000..c1e610b6 --- /dev/null +++ b/audio/sfx/vine_whip.asm @@ -0,0 +1,10 @@ +SFX_Vine_Whip_Ch1: ; 20533 (8:4533) + unknownnoise0x20 1, 194, 51 + unknownnoise0x20 2, 242, 33 + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 1, 194, 50 + unknownnoise0x20 1, 146, 18 + unknownnoise0x20 1, 178, 49 + unknownnoise0x20 12, 145, 16 + unknownnoise0x20 8, 242, 65 + endchannel diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm new file mode 100644 index 00000000..bb7a8d6e --- /dev/null +++ b/audio/sfx/withdraw_deposit_1.asm @@ -0,0 +1,12 @@ +SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab) + duty 1 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 4, 226, 0, 5 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 7 + unknownsfx0x10 34 + unknownsfx0x20 15, 226, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm new file mode 100644 index 00000000..99e47fee --- /dev/null +++ b/audio/sfx/withdraw_deposit_3.asm @@ -0,0 +1,12 @@ +SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688) + duty 1 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 4, 226, 0, 5 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 7 + unknownsfx0x10 34 + unknownsfx0x20 15, 226, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 6812e312..d8c62dda 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -56,175 +56,175 @@ ENDM music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer ; AUDIO_1 AUDIO_2 AUDIO_3 - music_const SFX_SNARE_1, SFX_02_01 - music_const SFX_SNARE_2, SFX_02_02 - music_const SFX_SNARE_3, SFX_02_03 - music_const SFX_SNARE_4, SFX_02_04 - music_const SFX_SNARE_5, SFX_02_05 - music_const SFX_TRIANGLE_1, SFX_02_06 - music_const SFX_TRIANGLE_2, SFX_02_07 - music_const SFX_SNARE_6, SFX_02_08 - music_const SFX_SNARE_7, SFX_02_09 - music_const SFX_SNARE_8, SFX_02_0a - music_const SFX_SNARE_9, SFX_02_0b - music_const SFX_CYMBAL_1, SFX_02_0c - music_const SFX_CYMBAL_2, SFX_02_0d - music_const SFX_CYMBAL_3, SFX_02_0e - music_const SFX_MUTED_SNARE_1, SFX_02_0f - music_const SFX_TRIANGLE_3, SFX_02_10 - music_const SFX_MUTED_SNARE_2, SFX_02_11 - music_const SFX_MUTED_SNARE_3, SFX_02_12 - music_const SFX_MUTED_SNARE_4, SFX_02_13 - music_const SFX_CRY_00, SFX_02_14 - music_const SFX_CRY_01, SFX_02_15 - music_const SFX_CRY_02, SFX_02_16 - music_const SFX_CRY_03, SFX_02_17 - music_const SFX_CRY_04, SFX_02_18 - music_const SFX_CRY_05, SFX_02_19 - music_const SFX_CRY_06, SFX_02_1a - music_const SFX_CRY_07, SFX_02_1b - music_const SFX_CRY_08, SFX_02_1c - music_const SFX_CRY_09, SFX_02_1d - music_const SFX_CRY_0A, SFX_02_1e - music_const SFX_CRY_0B, SFX_02_1f - music_const SFX_CRY_0C, SFX_02_20 - music_const SFX_CRY_0D, SFX_02_21 - music_const SFX_CRY_0E, SFX_02_22 - music_const SFX_CRY_0F, SFX_02_23 - music_const SFX_CRY_10, SFX_02_24 - music_const SFX_CRY_11, SFX_02_25 - music_const SFX_CRY_12, SFX_02_26 - music_const SFX_CRY_13, SFX_02_27 - music_const SFX_CRY_14, SFX_02_28 - music_const SFX_CRY_15, SFX_02_29 - music_const SFX_CRY_16, SFX_02_2a - music_const SFX_CRY_17, SFX_02_2b - music_const SFX_CRY_18, SFX_02_2c - music_const SFX_CRY_19, SFX_02_2d - music_const SFX_CRY_1A, SFX_02_2e - music_const SFX_CRY_1B, SFX_02_2f - music_const SFX_CRY_1C, SFX_02_30 - music_const SFX_CRY_1D, SFX_02_31 - music_const SFX_CRY_1E, SFX_02_32 - music_const SFX_CRY_1F, SFX_02_33 - music_const SFX_CRY_20, SFX_02_34 - music_const SFX_CRY_21, SFX_02_35 - music_const SFX_CRY_22, SFX_02_36 - music_const SFX_CRY_23, SFX_02_37 - music_const SFX_CRY_24, SFX_02_38 - music_const SFX_CRY_25, SFX_02_39 + music_const SFX_SNARE_1, SFX_Snare1_1 + music_const SFX_SNARE_2, SFX_Snare2_1 + music_const SFX_SNARE_3, SFX_Snare3_1 + music_const SFX_SNARE_4, SFX_Snare4_1 + music_const SFX_SNARE_5, SFX_Snare5_1 + music_const SFX_TRIANGLE_1, SFX_Triangle1_1 + music_const SFX_TRIANGLE_2, SFX_Triangle2_1 + music_const SFX_SNARE_6, SFX_Snare6_1 + music_const SFX_SNARE_7, SFX_Snare7_1 + music_const SFX_SNARE_8, SFX_Snare8_1 + music_const SFX_SNARE_9, SFX_Snare9_1 + music_const SFX_CYMBAL_1, SFX_Cymbal1_1 + music_const SFX_CYMBAL_2, SFX_Cymbal2_1 + music_const SFX_CYMBAL_3, SFX_Cymbal3_1 + music_const SFX_MUTED_SNARE_1, SFX_Muted_Snare1_1 + music_const SFX_TRIANGLE_3, SFX_Triangle3_1 + music_const SFX_MUTED_SNARE_2, SFX_Muted_Snare2_1 + music_const SFX_MUTED_SNARE_3, SFX_Muted_Snare3_1 + music_const SFX_MUTED_SNARE_4, SFX_Muted_Snare4_1 + music_const SFX_CRY_00, SFX_Cry00_1 + music_const SFX_CRY_01, SFX_Cry01_1 + music_const SFX_CRY_02, SFX_Cry02_1 + music_const SFX_CRY_03, SFX_Cry03_1 + music_const SFX_CRY_04, SFX_Cry04_1 + music_const SFX_CRY_05, SFX_Cry05_1 + music_const SFX_CRY_06, SFX_Cry06_1 + music_const SFX_CRY_07, SFX_Cry07_1 + music_const SFX_CRY_08, SFX_Cry08_1 + music_const SFX_CRY_09, SFX_Cry09_1 + music_const SFX_CRY_0A, SFX_Cry0A_1 + music_const SFX_CRY_0B, SFX_Cry0B_1 + music_const SFX_CRY_0C, SFX_Cry0C_1 + music_const SFX_CRY_0D, SFX_Cry0D_1 + music_const SFX_CRY_0E, SFX_Cry0E_1 + music_const SFX_CRY_0F, SFX_Cry0F_1 + music_const SFX_CRY_10, SFX_Cry10_1 + music_const SFX_CRY_11, SFX_Cry11_1 + music_const SFX_CRY_12, SFX_Cry12_1 + music_const SFX_CRY_13, SFX_Cry13_1 + music_const SFX_CRY_14, SFX_Cry14_1 + music_const SFX_CRY_15, SFX_Cry15_1 + music_const SFX_CRY_16, SFX_Cry16_1 + music_const SFX_CRY_17, SFX_Cry17_1 + music_const SFX_CRY_18, SFX_Cry18_1 + music_const SFX_CRY_19, SFX_Cry19_1 + music_const SFX_CRY_1A, SFX_Cry1A_1 + music_const SFX_CRY_1B, SFX_Cry1B_1 + music_const SFX_CRY_1C, SFX_Cry1C_1 + music_const SFX_CRY_1D, SFX_Cry1D_1 + music_const SFX_CRY_1E, SFX_Cry1E_1 + music_const SFX_CRY_1F, SFX_Cry1F_1 + music_const SFX_CRY_20, SFX_Cry20_1 + music_const SFX_CRY_21, SFX_Cry21_1 + music_const SFX_CRY_22, SFX_Cry22_1 + music_const SFX_CRY_23, SFX_Cry23_1 + music_const SFX_CRY_24, SFX_Cry24_1 + music_const SFX_CRY_25, SFX_Cry25_1 - music_const SFX_GET_ITEM_2, SFX_02_3b - music_const SFX_TINK, SFX_02_3c - music_const SFX_HEAL_HP, SFX_02_3d - music_const SFX_HEAL_AILMENT, SFX_02_3e - music_const SFX_START_MENU, SFX_02_3f - music_const SFX_PRESS_AB, SFX_02_40 + music_const SFX_GET_ITEM_2, SFX_Get_Item2_1 + music_const SFX_TINK, SFX_Tink_1 + music_const SFX_HEAL_HP, SFX_Heal_HP_1 + music_const SFX_HEAL_AILMENT, SFX_Heal_Ailment_1 + music_const SFX_START_MENU, SFX_Start_Menu_1 + music_const SFX_PRESS_AB, SFX_Press_AB_1 ; AUDIO_1 AUDIO_3 - music_const SFX_GET_ITEM_1, SFX_02_3a + music_const SFX_GET_ITEM_1, SFX_Get_Item1_1 - music_const SFX_POKEDEX_RATING, SFX_02_41 - music_const SFX_GET_KEY_ITEM, SFX_02_42 - music_const SFX_POISONED, SFX_02_43 - music_const SFX_TRADE_MACHINE, SFX_02_44 - music_const SFX_TURN_ON_PC, SFX_02_45 - music_const SFX_TURN_OFF_PC, SFX_02_46 - music_const SFX_ENTER_PC, SFX_02_47 - music_const SFX_SHRINK, SFX_02_48 - music_const SFX_SWITCH, SFX_02_49 - music_const SFX_HEALING_MACHINE, SFX_02_4a - music_const SFX_TELEPORT_1, SFX_02_4b - music_const SFX_TELEPORT_2, SFX_02_4c - music_const SFX_TELEPORT_3, SFX_02_4d - music_const SFX_LEDGE, SFX_02_4e - music_const SFX_FLY_1, SFX_02_4f - music_const SFX_FLY_2, SFX_02_50 - music_const SFX_DENIED, SFX_02_51 - music_const SFX_ARROW_TILES, SFX_02_52 - music_const SFX_PUSH_BOULDER, SFX_02_53 - music_const SFX_SS_ANNE_HORN, SFX_02_54 - music_const SFX_WITHDRAW_DEPOSIT, SFX_02_55 - music_const SFX_CUT, SFX_02_56 - music_const SFX_GO_INSIDE, SFX_02_57 - music_const SFX_SWAP, SFX_02_58 - music_const SFX_59, SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL - music_const SFX_PURCHASE, SFX_02_5a - music_const SFX_COLLISION, SFX_02_5b - music_const SFX_GO_OUTSIDE, SFX_02_5c - music_const SFX_SAVE, SFX_02_5d + music_const SFX_POKEDEX_RATING, SFX_Pokedex_Rating_1 + music_const SFX_GET_KEY_ITEM, SFX_Get_Key_Item_1 + music_const SFX_POISONED, SFX_Poisoned_1 + music_const SFX_TRADE_MACHINE, SFX_Trade_Machine_1 + music_const SFX_TURN_ON_PC, SFX_Turn_On_PC_1 + music_const SFX_TURN_OFF_PC, SFX_Turn_Off_PC_1 + music_const SFX_ENTER_PC, SFX_Enter_PC_1 + music_const SFX_SHRINK, SFX_Shrink_1 + music_const SFX_SWITCH, SFX_Switch_1 + music_const SFX_HEALING_MACHINE, SFX_Healing_Machine_1 + music_const SFX_TELEPORT_EXIT_1, SFX_Teleport_Exit1_1 + music_const SFX_TELEPORT_ENTER_1, SFX_Teleport_Enter1_1 + music_const SFX_TELEPORT_EXIT_2, SFX_Teleport_Exit2_1 + music_const SFX_LEDGE, SFX_Ledge_1 + music_const SFX_TELEPORT_ENTER_2, SFX_Teleport_Enter2_1 + music_const SFX_FLY, SFX_Fly_1 + music_const SFX_DENIED, SFX_Denied_1 + music_const SFX_ARROW_TILES, SFX_Arrow_Tiles_1 + music_const SFX_PUSH_BOULDER, SFX_Push_Boulder_1 + music_const SFX_SS_ANNE_HORN, SFX_SS_Anne_Horn_1 + music_const SFX_WITHDRAW_DEPOSIT, SFX_Withdraw_Deposit_1 + music_const SFX_CUT, SFX_Cut_1 + music_const SFX_GO_INSIDE, SFX_Go_Inside_1 + music_const SFX_SWAP, SFX_Swap_1 + music_const SFX_59, SFX_59_1 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL + music_const SFX_PURCHASE, SFX_Purchase_1 + music_const SFX_COLLISION, SFX_Collision_1 + music_const SFX_GO_OUTSIDE, SFX_Go_Outside_1 + music_const SFX_SAVE, SFX_Save_1 ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_02_5e - music_const SFX_SAFARI_ZONE_PA, SFX_02_5f + music_const SFX_POKEFLUE, SFX_Pokeflute + music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA ; AUDIO_2 - music_const SFX_LEVEL_UP, SFX_08_3a + music_const SFX_LEVEL_UP, SFX_Level_Up - music_const SFX_BALL_TOSS, SFX_08_41 - music_const SFX_BALL_POOF, SFX_08_42 - music_const SFX_FAINT_THUD, SFX_08_43 - music_const SFX_RUN, SFX_08_44 - music_const SFX_DEX_PAGE_ADDED, SFX_08_45 - music_const SFX_CAUGHT_MON, SFX_08_46 - music_const SFX_PECK, SFX_08_47 - music_const SFX_FAINT_FALL, SFX_08_48 - music_const SFX_BATTLE_09, SFX_08_49 - music_const SFX_POUND, SFX_08_4a - music_const SFX_BATTLE_0B, SFX_08_4b - music_const SFX_BATTLE_0C, SFX_08_4c - music_const SFX_BATTLE_0D, SFX_08_4d - music_const SFX_BATTLE_0E, SFX_08_4e - music_const SFX_BATTLE_0F, SFX_08_4f - music_const SFX_DAMAGE, SFX_08_50 - music_const SFX_NOT_VERY_EFFECTIVE, SFX_08_51 - music_const SFX_BATTLE_12, SFX_08_52 - music_const SFX_BATTLE_13, SFX_08_53 - music_const SFX_BATTLE_14, SFX_08_54 - music_const SFX_VINE_WHIP, SFX_08_55 - music_const SFX_BATTLE_16, SFX_08_56 ; unused? - music_const SFX_BATTLE_17, SFX_08_57 - music_const SFX_BATTLE_18, SFX_08_58 - music_const SFX_BATTLE_19, SFX_08_59 - music_const SFX_SUPER_EFFECTIVE, SFX_08_5a - music_const SFX_BATTLE_1B, SFX_08_5b - music_const SFX_BATTLE_1C, SFX_08_5c - music_const SFX_DOUBLESLAP, SFX_08_5d - music_const SFX_BATTLE_1E, SFX_08_5e - music_const SFX_HORN_DRILL, SFX_08_5f - music_const SFX_BATTLE_20, SFX_08_60 - music_const SFX_BATTLE_21, SFX_08_61 - music_const SFX_BATTLE_22, SFX_08_62 - music_const SFX_BATTLE_23, SFX_08_63 - music_const SFX_BATTLE_24, SFX_08_64 - music_const SFX_BATTLE_25, SFX_08_65 - music_const SFX_BATTLE_26, SFX_08_66 - music_const SFX_BATTLE_27, SFX_08_67 - music_const SFX_BATTLE_28, SFX_08_68 - music_const SFX_BATTLE_29, SFX_08_69 - music_const SFX_BATTLE_2A, SFX_08_6a - music_const SFX_BATTLE_2B, SFX_08_6b - music_const SFX_BATTLE_2C, SFX_08_6c - music_const SFX_PSYBEAM, SFX_08_6d - music_const SFX_BATTLE_2E, SFX_08_6e - music_const SFX_BATTLE_2F, SFX_08_6f - music_const SFX_PSYCHIC_M, SFX_08_70 - music_const SFX_BATTLE_31, SFX_08_71 - music_const SFX_BATTLE_32, SFX_08_72 - music_const SFX_BATTLE_33, SFX_08_73 - music_const SFX_BATTLE_34, SFX_08_74 - music_const SFX_BATTLE_35, SFX_08_75 - music_const SFX_BATTLE_36, SFX_08_76 - music_const SFX_SILPH_SCOPE, SFX_08_77 + music_const SFX_BALL_TOSS, SFX_Ball_Toss + music_const SFX_BALL_POOF, SFX_Ball_Poof + music_const SFX_FAINT_THUD, SFX_Faint_Thud + music_const SFX_RUN, SFX_Run + music_const SFX_DEX_PAGE_ADDED, SFX_Dex_Page_Added + music_const SFX_CAUGHT_MON, SFX_Caught_Mon + music_const SFX_PECK, SFX_Peck + music_const SFX_FAINT_FALL, SFX_Faint_Fall + music_const SFX_BATTLE_09, SFX_Battle_09 + music_const SFX_POUND, SFX_Pound + music_const SFX_BATTLE_0B, SFX_Battle_0B + music_const SFX_BATTLE_0C, SFX_Battle_0C + music_const SFX_BATTLE_0D, SFX_Battle_0D + music_const SFX_BATTLE_0E, SFX_Battle_0E + music_const SFX_BATTLE_0F, SFX_Battle_0F + music_const SFX_DAMAGE, SFX_Damage + music_const SFX_NOT_VERY_EFFECTIVE, SFX_Not_Very_Effective + music_const SFX_BATTLE_12, SFX_Battle_12 + music_const SFX_BATTLE_13, SFX_Battle_13 + music_const SFX_BATTLE_14, SFX_Battle_14 + music_const SFX_VINE_WHIP, SFX_Vine_Whip + music_const SFX_BATTLE_16, SFX_Battle_16 ; unused? + music_const SFX_BATTLE_17, SFX_Battle_17 + music_const SFX_BATTLE_18, SFX_Battle_18 + music_const SFX_BATTLE_19, SFX_Battle_19 + music_const SFX_SUPER_EFFECTIVE, SFX_Super_Effective + music_const SFX_BATTLE_1B, SFX_Battle_1B + music_const SFX_BATTLE_1C, SFX_Battle_1C + music_const SFX_DOUBLESLAP, SFX_Doubleslap + music_const SFX_BATTLE_1E, SFX_Battle_1E + music_const SFX_HORN_DRILL, SFX_Horn_Drill + music_const SFX_BATTLE_20, SFX_Battle_20 + music_const SFX_BATTLE_21, SFX_Battle_21 + music_const SFX_BATTLE_22, SFX_Battle_22 + music_const SFX_BATTLE_23, SFX_Battle_23 + music_const SFX_BATTLE_24, SFX_Battle_24 + music_const SFX_BATTLE_25, SFX_Battle_25 + music_const SFX_BATTLE_26, SFX_Battle_26 + music_const SFX_BATTLE_27, SFX_Battle_27 + music_const SFX_BATTLE_28, SFX_Battle_28 + music_const SFX_BATTLE_29, SFX_Battle_29 + music_const SFX_BATTLE_2A, SFX_Battle_2A + music_const SFX_BATTLE_2B, SFX_Battle_2B + music_const SFX_BATTLE_2C, SFX_Battle_2C + music_const SFX_PSYBEAM, SFX_Psybeam + music_const SFX_BATTLE_2E, SFX_Battle_2E + music_const SFX_BATTLE_2F, SFX_Battle_2F + music_const SFX_PSYCHIC_M, SFX_Psychic_M + music_const SFX_BATTLE_31, SFX_Battle_31 + music_const SFX_BATTLE_32, SFX_Battle_32 + music_const SFX_BATTLE_33, SFX_Battle_33 + 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 ; AUDIO_3 - music_const SFX_INTRO_LUNGE, SFX_1f_5e - music_const SFX_INTRO_HIP, SFX_1f_5f - music_const SFX_INTRO_HOP, SFX_1f_60 - music_const SFX_INTRO_RAISE, SFX_1f_61 - music_const SFX_INTRO_CRASH, SFX_1f_62 - music_const SFX_INTRO_WHOOSH, SFX_1f_63 - music_const SFX_SLOTS_STOP_WHEEL, SFX_1f_64 - music_const SFX_SLOTS_REWARD, SFX_1f_65 - music_const SFX_SLOTS_NEW_SPIN, SFX_1f_66 - music_const SFX_SHOOTING_STAR, SFX_1f_67 + music_const SFX_INTRO_LUNGE, SFX_Intro_Lunge + music_const SFX_INTRO_HIP, SFX_Intro_Hip + music_const SFX_INTRO_HOP, SFX_Intro_Hop + music_const SFX_INTRO_RAISE, SFX_Intro_Raise + music_const SFX_INTRO_CRASH, SFX_Intro_Crash + music_const SFX_INTRO_WHOOSH, SFX_Intro_Whoosh + music_const SFX_SLOTS_STOP_WHEEL, SFX_Slots_Stop_Wheel + music_const SFX_SLOTS_REWARD, SFX_Slots_Reward + music_const SFX_SLOTS_NEW_SPIN, SFX_Slots_New_Spin + music_const SFX_SHOOTING_STAR, SFX_Shooting_Star diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 8893e496..34d7f64d 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -67,7 +67,7 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0) ld [wMusicHeaderPointer], a dec a call PlaySound - ld c, BANK(SFX_02_5f) + ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .asm_1e9c2 diff --git a/engine/items/items.asm b/engine/items/items.asm index f2c41ef6..a62f75d2 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1719,7 +1719,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215) ld a,$ff call PlaySound ; turn off music ld a, SFX_POKEFLUE - ld c, BANK(SFX_02_5e) + ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing ld a,[wc028] diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 2f22f78e..76eb7450 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -139,7 +139,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ; play pokemon cry .choseCry ld a,[wd11e] - call GetCryData ; get cry data + call GetCryData call PlaySound jr .handleMenuInput .choseArea diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 09a38012..eb62fee7 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -17,7 +17,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) add d ld [hSCY], a push bc - ld c, BANK(SFX_02_5b) + ld c, BANK(SFX_Collision_1) ld a, SFX_COLLISION call PlayMusic pop bc @@ -29,7 +29,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld [hSCY], a ld a, $ff call PlaySound - ld c, BANK(SFX_02_5f) + ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 5ce2b2a6..a9aa2cf2 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -9,7 +9,7 @@ EnterMapAnim: ; 70510 (1c:4510) bit 7, [hl] ; used fly out of battle? res 7, [hl] jr nz, .flyAnimation - ld a, SFX_TELEPORT_2 + ld a, SFX_TELEPORT_ENTER_1 call PlaySound ld hl, wd732 bit 4, [hl] ; used dungeon warp? @@ -17,7 +17,7 @@ EnterMapAnim: ; 70510 (1c:4510) pop hl jr nz, .dungeonWarpAnimation call PlayerSpinWhileMovingDown - ld a, SFX_FLY_1 + ld a, SFX_TELEPORT_ENTER_2 call PlaySound call IsPlayerStandingOnWarpPadOrHole ld a, b @@ -50,7 +50,7 @@ EnterMapAnim: ; 70510 (1c:4510) ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData call LoadBirdSpriteGraphics - ld a, SFX_FLY_2 + ld a, SFX_FLY call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list @@ -99,7 +99,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) dec a jp nz, LeaveMapThroughHoleAnim .spinWhileMovingUp - ld a, SFX_TELEPORT_1 + ld a, SFX_TELEPORT_EXIT_1 call PlaySound ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY ld a, -$10 @@ -133,7 +133,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta xor a ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue - ld [hl], SFX_TELEPORT_3 ; wPlayerSpinInPlaceAnimSoundID + ld [hl], SFX_TELEPORT_EXIT_2 ; wPlayerSpinInPlaceAnimSoundID ld hl, wFacingDirectionList call PlayerSpinInPlace jr .spinWhileMovingUp @@ -146,7 +146,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wFlyAnimCounter ld [hl], $c ; wFlyAnimBirdSpriteImageIndex call DoFlyAnimation - ld a, SFX_FLY_2 + ld a, SFX_FLY call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list diff --git a/home/init.asm b/home/init.asm index 3e8d1d2b..848a81a3 100644 --- a/home/init.asm +++ b/home/init.asm @@ -97,7 +97,7 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB - ld a, BANK(SFX_1f_67) + ld a, BANK(SFX_Shooting_Star) ld [wc0ef], a ld [wc0f0], a ld a, $9c -- cgit v1.3.1-sl0p From 56d75db28ad827d514f3c2c52da0fe4ba2759610 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 27 Jul 2015 18:48:44 -0700 Subject: constants for PrintNumber --- constants/misc_constants.asm | 8 ++++++++ engine/battle/core.asm | 8 ++++---- engine/hall_of_fame.asm | 4 ++-- engine/hp_bar.asm | 2 +- engine/menu/league_pc.asm | 2 +- engine/menu/main_menu.asm | 8 ++++---- engine/menu/pokedex.asm | 18 +++++++++--------- engine/menu/start_sub_menus.asm | 4 ++-- engine/menu/status_screen.asm | 18 +++++++++--------- engine/slot_machine.asm | 2 +- engine/trade2.asm | 8 ++++---- home.asm | 15 ++++++--------- home/text.asm | 2 +- main.asm | 12 ++++++------ 14 files changed, 58 insertions(+), 53 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index b5d889d4..ef9e6ba3 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -149,6 +149,14 @@ TEXT_BLACKED_OUT EQU $d1 TEXT_REPEL_WORE_OFF EQU $d2 TEXT_SAFARI_GAME_OVER EQU $d3 +; PrintNumber + +BIT_LEFT_ALIGN EQU 6 +BIT_LEADING_ZEROES EQU 7 + +LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) +LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) + ; serial ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 335108f7..fe7066e2 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2141,7 +2141,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) Coorda 13, 16 coord hl, 7, 14 ld de, W_NUMSAFARIBALLS - ld bc, $102 + lb bc, 1, 2 call PrintNumber ld b, $1 ; top menu item X .leftColumn_WaitForInput @@ -2174,7 +2174,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) Coorda 1, 16 ; clear lower cursor position in left column coord hl, 7, 14 ld de, W_NUMSAFARIBALLS - ld bc, $102 + lb bc, 1, 2 call PrintNumber ld b, $d ; top menu item X .rightColumn_WaitForInput @@ -2951,11 +2951,11 @@ PrintMenuItem: ; 3d4b6 (f:54b6) ld [hl], "/" coord hl, 5, 11 ld de, wcd6d - ld bc, $102 + lb bc, 1, 2 call PrintNumber coord hl, 8, 11 ld de, wd11e - ld bc, $102 + lb bc, 1, 2 call PrintNumber call GetCurrentMove coord hl, 2, 10 diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 1fc2c5c5..28f03bf5 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -225,12 +225,12 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377) call PlaceString coord hl, 5, 7 ld de, W_PLAYTIMEHOURS + 1 - ld bc, $103 + lb bc, 1, 3 call PrintNumber ld [hl], $6d inc hl ld de, W_PLAYTIMEMINUTES + 1 - ld bc, $8102 + lb bc, LEADING_ZEROES | 1, 2 call PrintNumber coord hl, 1, 9 ld de, HoFMoneyText diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index d1367b4e..112e65a3 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -228,7 +228,7 @@ UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5) ld [hli], a pop hl ld de, wHPBarTempHP - ld bc, $203 + lb bc, 2, 3 call PrintNumber call DelayFrame pop hl diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 1f5cf8e0..b4c7f774 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -108,7 +108,7 @@ LeaguePCShowMon: ; 76610 (1d:6610) call PlaceString coord hl, 16, 15 ld de, wHoFTeamNo - ld bc, $0103 + lb bc, 1, 3 call PrintNumber jpba HoFDisplayMonInfo diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 994841d3..f99e5b80 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -396,7 +396,7 @@ PrintNumBadges: ; 5e2f (1:5e2f) call CountSetBits pop hl ld de, wd11e - ld bc, $102 + lb bc, 1, 2 jp PrintNumber PrintNumOwnedMons: ; 5e42 (1:5e42) @@ -406,17 +406,17 @@ PrintNumOwnedMons: ; 5e42 (1:5e42) call CountSetBits pop hl ld de, wd11e - ld bc, $103 + lb bc, 1, 3 jp PrintNumber PrintPlayTime: ; 5e55 (1:5e55) ld de, W_PLAYTIMEHOURS + 1 - ld bc, $103 + lb bc, 1, 3 call PrintNumber ld [hl], $6d inc hl ld de, W_PLAYTIMEMINUTES + 1 - ld bc, $8102 + lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber SaveScreenInfoText: ; 5e6a (1:5e6a) diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 76eb7450..4b350379 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -171,14 +171,14 @@ HandlePokedexListMenu: ; 40111 (10:4111) call CountSetBits ld de,wd11e coord hl, 16, 3 - ld bc,$0103 + lb bc, 1, 3 call PrintNumber ; print number of seen pokemon ld hl,wPokedexOwned ld b,wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld de,wd11e coord hl, 16, 6 - ld bc,$0103 + lb bc, 1, 3 call PrintNumber ; print number of owned pokemon coord hl, 16, 2 ld de,PokedexSeenText @@ -233,12 +233,12 @@ HandlePokedexListMenu: ; 40111 (10:4111) push af push de push hl - ld de,-20 + ld de,-SCREEN_WIDTH add hl,de ld de,wd11e - ld bc,$8103 + lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; print the pokedex number - ld de,20 + ld de,SCREEN_WIDTH add hl,de dec hl push hl @@ -466,7 +466,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld a,$f2 ld [hli],a ld de,wd11e - ld bc,$8103 + lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; print pokedex number ld hl,wPokedexOwned call IsPokemonBitSet @@ -496,14 +496,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) inc de ; de = address of feet (height) ld a,[de] ; reads feet, but a is overwritten without being used coord hl, 12, 6 - ld bc,$0102 + lb bc, 1, 2 call PrintNumber ; print feet (height) ld a,$60 ; feet symbol tile (one tick) ld [hl],a inc de inc de ; de = address of inches (height) coord hl, 15, 6 - ld bc,$8102 + lb bc, LEADING_ZEROES | 1, 2 call PrintNumber ; print inches (height) ld a,$61 ; inches symbol tile (two ticks) ld [hl],a @@ -525,7 +525,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld [hl],a ; store lower byte of weight in [hDexWeight + 1] ld de,hDexWeight coord hl, 11, 8 - ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits + lb bc, 2, 5 ; 2 bytes, 5 digits call PrintNumber ; print weight coord hl, 14, 8 ld a,[hDexWeight + 1] diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 0895258c..683930d1 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -602,12 +602,12 @@ DrawTrainerInfo: ; 1349a (4:749a) call PrintBCDNumber coord hl, 9, 6 ld de,W_PLAYTIMEHOURS + 1 ; hours - ld bc,$4103 + lb bc, LEFT_ALIGN | 1, 3 call PrintNumber ld [hl],$d6 ; colon tile ID inc hl ld de,W_PLAYTIMEMINUTES + 1 ; minutes - ld bc,$8102 + lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber TrainerInfo_FarCopyData: ; 1357f (4:757f) diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 3bf3464a..c6550217 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -50,12 +50,12 @@ DrawHP_: ; 128fb (4:68fb) .printFraction add hl, bc ld de, wLoadedMonHP - ld bc, $203 + lb bc, 2, 3 call PrintNumber ld a, "/" ld [hli], a ld de, wLoadedMonMaxHP - ld bc, $203 + lb bc, 2, 3 call PrintNumber pop hl pop de @@ -144,7 +144,7 @@ StatusScreen: ; 12953 (4:6953) predef IndexToPokedex coord hl, 3, 7 ld de, wd11e - ld bc, $8103 ; Zero-padded, 3 + lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; Pokémon no. coord hl, 11, 10 predef PrintMonType @@ -162,7 +162,7 @@ StatusScreen: ; 12953 (4:6953) call PlaceString ; OT coord hl, 12, 14 ld de, wLoadedMonOTID - ld bc, $8205 ; 5 + lb bc, LEADING_ZEROES | 2, 5 call PrintNumber ; ID Number ld d, $0 call PrintStatsBox @@ -270,7 +270,7 @@ PrintStatsBox: ; 12ae4 (4:6ae4) pop bc add hl, bc ld de, wLoadedMonAttack - ld bc, $0203 ; three digits + lb bc, 2, 3 call PrintStat ld de, wLoadedMonDefense call PrintStat @@ -367,12 +367,12 @@ StatusScreen2: ; 12b57 (4:6b57) ld l, e push hl ld de, wStatusScreenCurrentPP - ld bc, $0102 + lb bc, 1, 2 call PrintNumber ld a, "/" ld [hli], a ld de, wd11e - ld bc, $0102 + lb bc, 1, 2 call PrintNumber pop hl ld de, SCREEN_WIDTH * 2 @@ -405,12 +405,12 @@ StatusScreen2: ; 12b57 (4:6b57) ld [wLoadedMonLevel], a ld de, wLoadedMonExp coord hl, 12, 4 - ld bc, $0307 + lb bc, 3, 7 call PrintNumber ; exp call CalcExpToLevelUp ld de, wLoadedMonExp coord hl, 7, 6 - ld bc, $0307 + lb bc, 3, 7 call PrintNumber ; exp needed to level up coord hl, 9, 0 call StatusScreen_ClearName diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 8e98f662..3345a9dc 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -649,7 +649,7 @@ SlotMachine_PrintCreditCoins: ; 37754 (d:7754) SlotMachine_PrintPayoutCoins: ; 3775f (d:775f) coord hl, 11, 1 ld de, wPayoutCoins - ld bc, $8204 ; 2 bytes, 4 digits, leading zeroes + lb bc, LEADING_ZEROES | 2, 4 ; 2 bytes, 4 digits jp PrintNumber SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b) diff --git a/engine/trade2.asm b/engine/trade2.asm index d7a16716..10bef792 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -7,7 +7,7 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) predef IndexToPokedex coord hl, 9, 0 ld de,wd11e - ld bc,$8103 + lb bc, LEADING_ZEROES | 1, 3 call PrintNumber coord hl, 5, 2 ld de,wcf4b @@ -17,7 +17,7 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) call PlaceString coord hl, 8, 6 ld de,wTradedPlayerMonOTID - ld bc,$8205 + lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) @@ -29,7 +29,7 @@ Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) predef IndexToPokedex coord hl, 9, 10 ld de,wd11e - ld bc,$8103 + lb bc, LEADING_ZEROES | 1, 3 call PrintNumber coord hl, 5, 12 ld de,wcd6d @@ -39,7 +39,7 @@ Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) call PlaceString coord hl, 8, 16 ld de,wTradedEnemyMonOTID - ld bc,$8205 + lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber Trade_MonInfoText: ; 427e5 (10:67e5) diff --git a/home.asm b/home.asm index 6f52f914..449666df 100644 --- a/home.asm +++ b/home.asm @@ -539,7 +539,7 @@ PrintLevelFull:: ; 151b (0:151b) PrintLevelCommon:: ; 1523 (0:1523) ld [wd11e],a ld de,wd11e - ld b,$41 ; no leading zeroes, left-aligned, one byte + ld b,LEFT_ALIGN | 1 ; 1 byte jp PrintNumber GetwMoves:: ; 152e (0:152e) @@ -1668,7 +1668,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) coord hl, 9, 10 .printQuantity ld de,wItemQuantity ; current quantity - ld bc,$8102 ; print leading zeroes, 1 byte, 2 digits + lb bc,LEADING_ZEROES | 1, 2 ; 1 byte, 2 digits call PrintNumber jp .waitForKeyPressLoop .buttonAPressed ; the player chose to make the transaction @@ -1855,7 +1855,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) push de ld de,wd11e ld [de],a - ld bc,$0102 + lb bc, 1, 2 call PrintNumber pop de pop af @@ -4197,9 +4197,6 @@ PrintNumber:: ; 3c5f ; the value to char "0" instead of calling PrintNumber. ; Flags LEADING_ZEROES and LEFT_ALIGN can be given ; in bits 7 and 6 of b respectively. -LEADING_ZEROES EQU 7 -LEFT_ALIGN EQU 6 - push bc xor a ld [H_PASTLEADINGZEROES], a @@ -4392,7 +4389,7 @@ endm ret .PrintLeadingZero: - bit LEADING_ZEROES, d + bit BIT_LEADING_ZEROES, d ret z ld [hl], "0" ret @@ -4401,9 +4398,9 @@ endm ; Increment unless the number is left-aligned, ; leading zeroes are not printed, and no digits ; have been printed yet. - bit LEADING_ZEROES, d + bit BIT_LEADING_ZEROES, d jr nz, .inc - bit LEFT_ALIGN, d + bit BIT_LEFT_ALIGN, d jr z, .inc ld a, [H_PASTLEADINGZEROES] and a diff --git a/home/text.asm b/home/text.asm index 366dfd73..97ff2859 100644 --- a/home/text.asm +++ b/home/text.asm @@ -561,7 +561,7 @@ TextCommand09:: ; 1bff (0:1bff) ld a,b and a,$f0 swap a - set 6,a + set BIT_LEFT_ALIGN,a ld b,a call PrintNumber ld b,h diff --git a/main.asm b/main.asm index c8cb3b63..10317d4f 100755 --- a/main.asm +++ b/main.asm @@ -2314,12 +2314,12 @@ PrintSafariZoneSteps: ; c52f (3:452f) cp UNKNOWN_DUNGEON_2 ret nc coord hl, 0, 0 - ld b, $3 - ld c, $7 + ld b, 3 + ld c, 7 call TextBoxBorder coord hl, 1, 1 ld de, wSafariSteps - ld bc, $203 + lb bc, 2, 3 call PrintNumber coord hl, 4, 1 ld de, SafariSteps @@ -2328,15 +2328,15 @@ PrintSafariZoneSteps: ; c52f (3:452f) ld de, SafariBallText call PlaceString ld a, [W_NUMSAFARIBALLS] - cp $a + cp 10 jr nc, .asm_c56d coord hl, 5, 3 - ld a, $7f + ld a, " " ld [hl], a .asm_c56d coord hl, 6, 3 ld de, W_NUMSAFARIBALLS - ld bc, $102 + lb bc, 1, 2 jp PrintNumber SafariSteps: ; c579 (3:4579) -- cgit v1.3.1-sl0p From f8a9c37a0019eb085c22c6e3ae53b16ff0cd4f6a Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 5 Aug 2015 16:20:29 -0500 Subject: Use more lb and other clean up --- engine/HoF_room_pc.asm | 4 +-- engine/battle/battle_transitions.asm | 2 +- engine/battle/core.asm | 58 ++++++++++++++++----------------- engine/battle/draw_hud_pokeball_gfx.asm | 2 +- engine/battle/ghost_marowak_anim.asm | 4 +-- engine/battle/trainer_ai.asm | 2 +- engine/cable_club.asm | 6 ++-- engine/clear_save.asm | 2 +- engine/evolution.asm | 2 +- engine/evos_moves.asm | 2 +- engine/gamefreak.asm | 8 ++--- engine/hall_of_fame.asm | 4 +-- engine/hidden_object_functions17.asm | 2 +- engine/hp_bar.asm | 2 +- engine/in_game_trades.asm | 18 +++++----- engine/intro.asm | 2 +- engine/items/items.asm | 32 +++++++++--------- engine/learn_move.asm | 6 ++-- engine/load_pokedex_tiles.asm | 4 +-- engine/menu/bills_pc.asm | 2 +- engine/menu/diploma.asm | 4 +-- engine/menu/league_pc.asm | 2 +- engine/menu/naming_screen.asm | 18 +++++----- engine/menu/pokedex.asm | 12 +++---- engine/menu/start_sub_menus.asm | 20 ++++++------ engine/menu/status_screen.asm | 16 ++++----- engine/oak_speech.asm | 18 +++++----- engine/oak_speech2.asm | 2 +- engine/overworld/cut.asm | 6 ++-- engine/overworld/emotion_bubbles.asm | 2 +- engine/overworld/healing_machine.asm | 2 +- engine/overworld/ledges.asm | 4 +-- engine/overworld/player_animations.asm | 8 ++--- engine/overworld/pokemart.asm | 6 ++-- engine/overworld/ssanne.asm | 2 +- engine/save.asm | 6 ++-- engine/slot_machine.asm | 2 +- engine/titlescreen.asm | 4 +-- engine/town_map.asm | 18 +++++----- engine/trade.asm | 10 +++--- home.asm | 41 +++++++++++------------ home/copy2.asm | 4 +-- home/overworld.asm | 4 +-- home/text.asm | 4 +-- main.asm | 22 ++++++------- scripts/agatha.asm | 2 +- scripts/bikeshop.asm | 2 +- scripts/billshouse.asm | 2 +- scripts/blueshouse.asm | 2 +- scripts/bruno.asm | 2 +- scripts/celadoncity.asm | 2 +- scripts/celadondiner.asm | 2 +- scripts/celadongamecorner.asm | 8 ++--- scripts/celadongym.asm | 2 +- scripts/celadonmansion5.asm | 2 +- scripts/celadonmart3.asm | 2 +- scripts/celadonmartroof.asm | 6 ++-- scripts/ceruleancity.asm | 2 +- scripts/ceruleangym.asm | 2 +- scripts/cinnabargym.asm | 2 +- scripts/copycatshouse2f.asm | 2 +- scripts/fanclub.asm | 2 +- scripts/fuchsiagym.asm | 2 +- scripts/fuchsiahouse2.asm | 2 +- scripts/fuchsiahouse3.asm | 2 +- scripts/lab3.asm | 2 +- scripts/lance.asm | 4 +-- scripts/lavenderhouse1.asm | 2 +- scripts/lorelei.asm | 2 +- scripts/mansion1.asm | 16 ++++----- scripts/mansion2.asm | 12 +++---- scripts/mtmoon3.asm | 4 +-- scripts/mtmoonpokecenter.asm | 2 +- scripts/museum1f.asm | 2 +- scripts/oakslab.asm | 2 +- scripts/pewtergym.asm | 2 +- scripts/rockethideout1.asm | 2 +- scripts/rockethideout4.asm | 2 +- scripts/route1.asm | 2 +- scripts/route12gateupstairs.asm | 2 +- scripts/route12house.asm | 2 +- scripts/route16house.asm | 2 +- scripts/route24.asm | 2 +- scripts/safarizoneentrance-yellow.asm | 2 +- scripts/safarizonesecrethouse.asm | 2 +- scripts/saffrongym.asm | 2 +- scripts/saffronhouse2.asm | 2 +- scripts/silphco10.asm | 9 ++--- scripts/silphco11.asm | 11 ++++--- scripts/silphco2.asm | 14 ++++---- scripts/silphco3.asm | 12 ++++--- scripts/silphco4.asm | 12 ++++--- scripts/silphco5.asm | 15 +++++---- scripts/silphco6.asm | 10 +++--- scripts/silphco7.asm | 17 ++++++---- scripts/silphco8.asm | 9 ++--- scripts/silphco9.asm | 18 ++++++---- scripts/ssanne7.asm | 2 +- scripts/vermiliongym.asm | 4 +-- scripts/vermilionhouse2.asm | 2 +- scripts/victoryroad1.asm | 2 +- scripts/victoryroad2.asm | 4 +-- scripts/victoryroad3.asm | 2 +- scripts/viridiancity.asm | 2 +- scripts/viridiangym.asm | 2 +- scripts/viridianmart.asm | 2 +- 106 files changed, 346 insertions(+), 326 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 15ea1524..704fea16 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -164,7 +164,7 @@ FillFourRowsWithBlack: ; 7417b (1d:417b) FillMiddleOfScreenWithWhite: ; 74183 (1d:4183) coord hl, 0, 4 ld bc, SCREEN_WIDTH * 10 - ld a, $7f ; blank white tile + ld a, " " jp FillMemory Credits: ; 7418e (1d:418e) @@ -246,7 +246,7 @@ Credits: ; 7418e (1d:418e) pop de ld de, TheEndGfx ld hl, vChars2 + $600 - ld bc, (BANK(TheEndGfx) << 8) + $0a + lb bc, BANK(TheEndGfx), $0a call CopyVideoData coord hl, 4, 8 ld de, TheEndTextString diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index e64cbabb..e9e247f9 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -184,7 +184,7 @@ DungeonMaps2: ; 70a44 (1c:4a44) LoadBattleTransitionTile: ; 70a4d (1c:4a4d) ld hl, vChars1 + $7f0 ld de, BattleTransitionTile - ld bc, (BANK(BattleTransitionTile) << 8) + $01 + lb bc, BANK(BattleTransitionTile), $01 jp CopyVideoData BattleTransitionTile: ; 70a59 (1c:4a59) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fe7066e2..65549f7b 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -102,7 +102,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld [wTextBoxID], a call DisplayTextBoxID coord hl, 1, 5 - ld bc, $307 + lb bc, 3, 7 call ClearScreenArea call DisableLCD call LoadFontTilePatterns @@ -110,7 +110,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld hl, vBGMap0 ld bc, $400 .clearBackgroundLoop - ld a, $7f + ld a, " " ld [hli], a dec bc ld a, b @@ -717,8 +717,8 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3) ld [wHPBarMaxHP+1], a ld a, [hl] ld [wHPBarMaxHP], a - ld de, $fff2 - add hl, de ; skip back fomr max hp to current hp + ld de, wBattleMonHP - wBattleMonMaxHP + add hl, de ; skip back from max hp to current hp ld a, [hl] ld [wHPBarOldHP], a ; add bc to current HP add c @@ -852,7 +852,7 @@ FaintEnemyPokemon: ; 0x3c567 coord de, 12, 6 call SlideDownFaintedMonPic coord hl, 0, 0 - ld bc, $40b + lb bc, 4, 11 call ClearScreenArea ld a, [W_ISINBATTLE] dec a @@ -1100,7 +1100,7 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741) ld [wBattleMonStatus], a call ReadPlayerMonCurHPAndStatus coord hl, 9, 7 - ld bc, $50b + lb bc, 5, 11 call ClearScreenArea coord hl, 1, 10 coord de, 1, 11 @@ -1132,7 +1132,7 @@ DoUseNextMonDialogue: ; 3c79b (f:479b) call PrintText .displayYesNoBox coord hl, 13, 9 - ld bc, $a0e + lb bc, 10, 14 ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID @@ -1209,7 +1209,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) cp $c8 + SONY1 jr nz, .notSony1Battle coord hl, 0, 0 ; sony 1 battle - ld bc, $815 + lb bc, 8, 21 call ClearScreenArea call ScrollTrainerPicAfterBattle ld c, 40 @@ -1449,7 +1449,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) ld hl, TrainerAboutToUseText call PrintText coord hl, 0, 7 - ld bc,$0801 + lb bc, 8, 1 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID @@ -1484,7 +1484,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) .next4 call ClearSprites coord hl, 0, 0 - ld bc,$040B + lb bc, 4, 11 call ClearScreenArea ld b,1 call GoPAL_SET @@ -1886,7 +1886,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 9, 7 - ld bc, $50b + lb bc, 5, 11 call ClearScreenArea callab PlacePlayerHUDTiles coord hl, 18, 9 @@ -1947,7 +1947,7 @@ DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 0, 0 - ld bc, $40c + lb bc, 4, 12 call ClearScreenArea callab PlaceEnemyHUDTiles ld de, wEnemyMonNick @@ -2055,11 +2055,11 @@ CenterMonName: ; 3ce9c (f:4e9c) .loop inc de ld a, [de] - cp $50 + cp "@" jr z, .done inc de ld a, [de] - cp $50 + cp "@" jr z, .done dec hl dec b @@ -2091,7 +2091,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) ; the following happens for the old man tutorial ld hl, wPlayerName ld de, W_GRASSRATE - ld bc, $b + ld bc, 11 call CopyData ; temporarily save the player name in unused space, ; which is supposed to get overwritten when entering a ; map with wild Pokémon. Due to an oversight, the data @@ -2099,14 +2099,14 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) ; Missingno. glitch can show up. ld hl, .oldManName ld de, wPlayerName - ld bc, $b + ld bc, 11 call CopyData ; the following simulates the keystrokes by drawing menus on screen coord hl, 9, 14 ld [hl], "▶" ld c, 80 call DelayFrames - ld [hl], $7f + ld [hl], " " coord hl, 9, 16 ld [hl], "▶" ld c, 50 @@ -2395,7 +2395,7 @@ PartyMenuOrRockOrRun: .partyMonDeselected coord hl, 11, 11 ld bc, $81 - ld a, $7f + ld a, " " call FillMemory xor a ; NORMAL_PARTY_MENU ld [wPartyMenuTypeOrMessageID], a @@ -2585,7 +2585,7 @@ MoveSelectionMenu: ; 3d219 (f:5219) .relearnmenu ld a, [wWhichPokemon] ld hl, wPartyMon1Moves - ld bc, $2c + ld bc, wPartyMon2 - wPartyMon1 call AddNTimes call .loadmoves coord hl, 4, 7 @@ -2662,7 +2662,7 @@ SelectMenuItem: ; 3d2fe (f:52fe) jr z, .select coord hl, 5, 13 dec a - ld bc, $14 + ld bc, SCREEN_WIDTH call AddNTimes ld [hl], $ec .select @@ -2862,7 +2862,7 @@ SwapMovesInMenu: ; 3d435 (f:5435) push hl call .swapBytes ; swap moves pop hl - ld bc, $15 + ld bc, wPartyMon1PP - wPartyMon1Moves add hl, bc call .swapBytes ; swap move PP xor a @@ -6318,7 +6318,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) call GetMonName ld hl, wcd6d ld de, wEnemyMonNick - ld bc, $b + ld bc, 11 call CopyData ld a, [wEnemyMonSpecies2] ld [wd11e], a @@ -6718,11 +6718,11 @@ LoadHudTilePatterns: ; 3ee5b (f:6e5b) .lcdEnabled ld de, BattleHudTiles1 ld hl, vChars2 + $6d0 - ld bc, (BANK(BattleHudTiles1) << 8) + $03 + lb bc, BANK(BattleHudTiles1), $03 call CopyVideoDataDouble ld de, BattleHudTiles2 ld hl, vChars2 + $730 - ld bc, (BANK(BattleHudTiles2) << 8) + $06 + lb bc, BANK(BattleHudTiles2), $06 jp CopyVideoDataDouble PrintEmptyString: ; 3ee94 (f:6e94) @@ -6942,10 +6942,10 @@ InitBattle_Common: ; 3efeb (f:6feb) ld [H_AUTOBGTRANSFERDEST + 1], a call LoadScreenTilesFromBuffer1 coord hl, 9, 7 - ld bc, $50a + lb bc, 5, 10 call ClearScreenArea coord hl, 1, 0 - ld bc, $40a + lb bc, 4, 10 call ClearScreenArea call ClearSprites ld a, [W_ISINBATTLE] @@ -7089,8 +7089,8 @@ LoadMonBackPic: ; 3f103 (f:7103) ld a, [wBattleMonSpecies2] ld [wcf91], a coord hl, 1, 5 - ld b, $7 - ld c, $8 + ld b, 7 + ld c, 8 call ClearScreenArea ld hl, W_MONHBACKSPRITE - W_MONHEADER call UncompressMonSprite @@ -7928,7 +7928,7 @@ FellText: ; 3f683 (f:7683) PrintStatText: ; 3f688 (f:7688) ld hl, StatsTextStrings - ld c, $50 + ld c, "@" .asm_3f68d dec b jr z, .asm_3f696 diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 1e229b1c..7198d984 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -13,7 +13,7 @@ DrawEnemyPokeballs: ; 3a857 (e:6857) LoadPartyPokeballGfx: ; 3a85d (e:685d) ld de, PokeballTileGraphics ld hl, vSprites + $310 - ld bc, (BANK(PokeballTileGraphics) << 8) + $04 + lb bc, BANK(PokeballTileGraphics), $04 jp CopyVideoData SetupOwnPartyPokeballs: ; 3a869 (e:6869) diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 96e65f70..d76f3f41 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -5,7 +5,7 @@ MarowakAnim: ; 708ca (1c:48ca) call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap coord hl, 12, 0 - ld bc, $707 + lb bc, 7, 7 call ClearScreenArea call Delay3 xor a @@ -59,7 +59,7 @@ CopyMonPicFromBGToSpriteVRAM: ; 7092a (1c:492a) ld a, $70 ld [W_BASECOORDX], a ld hl, wOAMBuffer - ld bc, $606 + lb bc, 6, 6 ld d, $8 .oamLoop push bc diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index fb932035..9102b2d8 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -665,7 +665,7 @@ AISwitchIfEnoughMons: ; 3a72a (e:672a) inc d .Fainted push bc - ld bc,$2C + ld bc, wEnemyMon2 - wEnemyMon1 add hl,bc pop bc dec c diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 9ccffdbb..07284d13 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -96,7 +96,7 @@ CableClub_DoBattleOrTradeAgain: ; 5345 ld a, SERIAL_PATCH_LIST_PART_TERMINATOR ld [de], a ; end of part 1 inc de - ld bc, $100 + lb bc, 1, 0 jr .patchPartyMonsLoop .finishedPatchingPlayerData ld a, SERIAL_PATCH_LIST_PART_TERMINATOR @@ -400,7 +400,7 @@ TradeCenter_SelectMon: ld a, 1 ld [wTopMenuItemX], a coord hl, 1, 1 - ld bc, $0601 + lb bc, 6, 1 call ClearScreenArea .playerMonMenu_HandleInput ld hl, hFlags_0xFFF6 @@ -713,7 +713,7 @@ TradeCenter_Trade: call TextCommandProcessor call SaveScreenTilesToBuffer1 coord hl, 10, 7 - ld bc, $080b + lb bc, 8, 11 ld a, TRADE_CANCEL_MENU ld [wTwoOptionMenuID], a ld a, TWO_OPTION_MENU diff --git a/engine/clear_save.asm b/engine/clear_save.asm index 2febb123..d4f05071 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -6,7 +6,7 @@ DoClearSaveDialogue: ; 1c98a (7:498a) ld hl, ClearSaveDataText call PrintText coord hl, 14, 7 - ld bc, $80f + lb bc, 8, 15 ld a, NO_YES_MENU ld [wTwoOptionMenuID], a ld a, TWO_OPTION_MENU diff --git a/engine/evolution.asm b/engine/evolution.asm index a39f5a97..720e77cd 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -48,7 +48,7 @@ EvolveMon: ; 7bde9 (1e:7de9) call DelayFrames ld c, $1 call EvolutionSetWholeScreenPalette - ld bc, $110 + lb bc, $1, $10 .animLoop push bc call Evolution_CheckForCancel diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 137b75e0..16e893e5 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -278,7 +278,7 @@ RenameEvolvedMon: ; 3aef7 (e:6ef7) cp $50 jr nz, .compareNamesLoop ld a, [wWhichPokemon] - ld bc, $b + ld bc, 11 ld hl, wPartyMonNicks call AddNTimes push hl diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index 49c938f7..73e4f074 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -5,15 +5,15 @@ LoadShootingStarGraphics: ; 70000 (1c:4000) ld [rOBP1], a ld de, AnimationTileset2 + $30 ; star tile (top left quadrant) ld hl, vChars1 + $200 - ld bc, (BANK(AnimationTileset2) << 8) + $01 + lb bc, BANK(AnimationTileset2), $01 call CopyVideoData ld de, AnimationTileset2 + $130 ; star tile (bottom left quadrant) ld hl, vChars1 + $210 - ld bc, (BANK(AnimationTileset2) << 8) + $01 + lb bc, BANK(AnimationTileset2), $01 call CopyVideoData ld de, FallingStar ld hl, vChars1 + $220 - ld bc, (BANK(FallingStar) << 8) + $01 + lb bc, BANK(FallingStar), $01 call CopyVideoData ld hl, GameFreakLogoOAMData ld de, wOAMBuffer + $60 @@ -31,7 +31,7 @@ AnimateShootingStar: ; 70044 (1c:4044) ; Move the big star down and left across the screen. ld hl, wOAMBuffer - ld bc, $a004 + lb bc, $a0, $4 .bigStarLoop push hl push bc diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 28f03bf5..ce1430e3 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -8,7 +8,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) call DisableLCD ld hl,vBGMap0 ld bc, $800 - ld a, $7f + ld a, " " call FillMemory call EnableLCD ld hl, rLCDC @@ -187,7 +187,7 @@ HoFLoadPlayerPics: ; 7033e (1c:433e) ld a, BANK(RedPicFront) call UncompressSpriteFromDE ld hl, S_SPRITEBUFFER1 - ld de, $a000 + ld de, S_SPRITEBUFFER0 ld bc, $310 call CopyData ld de, vFrontPic diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index aad8c468..a2167b54 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -194,7 +194,7 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) ld hl, wd730 set 6, [hl] coord hl, 0, 0 - ld bc, $060a + lb bc, 6, 10 call TextBoxBorder coord hl, 1, 2 ld de, StatusAilmentText1 diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index 112e65a3..792661ab 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -222,7 +222,7 @@ UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5) .next add hl, de push hl - ld a, $7f + ld a, " " ld [hli], a ld [hli], a ld [hli], a diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index 96c37ab0..b4a73e59 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -17,7 +17,7 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) ld a,[hli] push af ld de,wInGameTradeMonNick - ld bc,$000b + ld bc, 11 call CopyData pop af ld l,a @@ -81,7 +81,7 @@ InGameTrade_GetMonName: ; 71b6a (1c:5b6a) call GetMonName ld hl,wcd6d pop de - ld bc,$b + ld bc, 11 jp CopyData INCLUDE "data/trades.asm" @@ -105,7 +105,7 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) jr nz,.tradeFailed ; jump if the selected mon's species is not the required one ld a,[wWhichPokemon] ld hl,wPartyMon1Level - ld bc,$002c + ld bc, wPartyMon2 - wPartyMon1 call AddNTimes ld a,[hl] ld [W_CURENEMYLVL],a @@ -168,11 +168,11 @@ InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1) ld a, [wInGameTradeReceiveMonSpecies] ld [hl], a ; wTradedEnemyMonSpecies ld hl, wPartyMonOT - ld bc, $b + ld bc, 11 ld a, [wWhichPokemon] call AddNTimes ld de, wTradedPlayerMonOT - ld bc, $b + ld bc, 11 call InGameTrade_CopyData ld hl, InGameTrade_TrainerString ld de, wTradedEnemyMonOT @@ -201,16 +201,16 @@ InGameTrade_CopyData: ; 71d11 (1c:5d11) InGameTrade_CopyDataToReceivedMon: ; 71d19 (1c:5d19) ld hl, wPartyMonNicks - ld bc, $b + ld bc, 11 call InGameTrade_GetReceivedMonPointer ld hl, wInGameTradeMonNick - ld bc, $b + ld bc, 11 call CopyData ld hl, wPartyMonOT - ld bc, $b + ld bc, 11 call InGameTrade_GetReceivedMonPointer ld hl, InGameTrade_TrainerString - ld bc, $b + ld bc, 11 call CopyData ld hl, wPartyMon1OTID ld bc, wPartyMon2 - wPartyMon1 diff --git a/engine/intro.asm b/engine/intro.asm index c7c4a04d..154c41fd 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -28,7 +28,7 @@ PlayIntroScene: ; 4169d (10:569d) ld [W_BASECOORDX], a ld a, 80 ld [W_BASECOORDY], a - ld bc, $606 + lb bc, 6, 6 call InitIntroNidorinoOAM ld de, $28ff ; move Nidorino right by 80 pixels call IntroMoveMon diff --git a/engine/items/items.asm b/engine/items/items.asm index 2cbe6a02..364570da 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -734,22 +734,22 @@ ItemUseMedicine: ; dabb (3:5abb) ld bc,4 add hl,bc ; hl now points to status ld a,[wcf91] - ld bc, (ANTIDOTE_MSG << 8) | (1 << PSN) + lb bc, ANTIDOTE_MSG, 1 << PSN cp a,ANTIDOTE jr z,.checkMonStatus - ld bc, (BURN_HEAL_MSG << 8) | (1 << BRN) + lb bc, BURN_HEAL_MSG, 1 << BRN cp a,BURN_HEAL jr z,.checkMonStatus - ld bc, (ICE_HEAL_MSG << 8) | (1 << FRZ) + lb bc, ICE_HEAL_MSG, 1 << FRZ cp a,ICE_HEAL jr z,.checkMonStatus - ld bc, (AWAKENING_MSG << 8) | SLP + lb bc, AWAKENING_MSG, SLP cp a,AWAKENING jr z,.checkMonStatus - ld bc, (PARALYZ_HEAL_MSG << 8) | (1 << PAR) + lb bc, PARALYZ_HEAL_MSG, 1 << PAR cp a,PARLYZ_HEAL jr z,.checkMonStatus - ld bc, (FULL_HEAL_MSG << 8) | $ff ; Full Heal + lb bc, FULL_HEAL_MSG, $ff ; Full Heal .checkMonStatus ld a,[hl] ; pokemon's status and c ; does the pokemon have a status ailment the item can cure? @@ -1737,7 +1737,7 @@ CoinCaseNumCoinsText: ; e247 (3:6247) ItemUseOldRod: ; e24c (3:624c) call FishingInit jp c, ItemUseNotTime - ld bc, (5 << 8) | MAGIKARP + lb bc, 5, MAGIKARP ld a, $1 ; set bite jr RodResponse @@ -2088,7 +2088,7 @@ ItemUseTMHM: ; e479 (3:6479) ld hl,TeachMachineMoveText call PrintText coord hl, 14, 7 - ld bc,$080f + lb bc, 8, 15 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu @@ -2479,7 +2479,7 @@ TossItem_: ; e6f1 (3:66f1) ld hl,IsItOKToTossItemText call PrintText coord hl, 14, 7 - ld bc,$080f + lb bc, 8, 15 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu @@ -2578,14 +2578,14 @@ SendNewMonToBox: ; e7a4 (3:67a4) jr nz, .asm_e7b1 call GetMonHeader ld hl, wBoxMonOT - ld bc, $b + ld bc, 11 ld a, [W_NUMINBOX] dec a jr z, .asm_e7ee dec a call AddNTimes push hl - ld bc, $b + ld bc, 11 add hl, bc ld d, h ld e, l @@ -2596,7 +2596,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) .asm_e7db push bc push hl - ld bc, $b + ld bc, 11 call CopyData pop hl ld d, h @@ -2609,17 +2609,17 @@ SendNewMonToBox: ; e7a4 (3:67a4) .asm_e7ee ld hl, wPlayerName ld de, wBoxMonOT - ld bc, $b + ld bc, 11 call CopyData ld a, [W_NUMINBOX] dec a jr z, .asm_e82a ld hl, wBoxMonNicks - ld bc, $b + ld bc, 11 dec a call AddNTimes push hl - ld bc, $b + ld bc, 11 add hl, bc ld d, h ld e, l @@ -2630,7 +2630,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) .asm_e817 push bc push hl - ld bc, $b + ld bc, 11 call CopyData pop hl ld d, h diff --git a/engine/learn_move.asm b/engine/learn_move.asm index 66d27a40..88dedd3d 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -5,7 +5,7 @@ LearnMove: ; 6e43 (1:6e43) call GetPartyMonName ld hl, wcd6d ld de, wd036 - ld bc, $b + ld bc, 11 call CopyData DontAbandonLearning: ; 6e5b (1:6e5b) @@ -77,7 +77,7 @@ AbandonLearning: ; 6eda (1:6eda) ld hl, AbandonLearningText call PrintText coord hl, 14, 7 - ld bc, $80f + lb bc, 8, 15 ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu @@ -100,7 +100,7 @@ TryingToLearn: ; 6f07 (1:6f07) ld hl, TryingToLearnText call PrintText coord hl, 14, 7 - ld bc, $80f + lb bc, 8, 15 ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu diff --git a/engine/load_pokedex_tiles.asm b/engine/load_pokedex_tiles.asm index 5c1f1c93..f4e45247 100755 --- a/engine/load_pokedex_tiles.asm +++ b/engine/load_pokedex_tiles.asm @@ -3,9 +3,9 @@ LoadPokedexTilePatterns: ; 17840 (5:7840) call LoadHpBarAndStatusTilePatterns ld de,PokedexTileGraphics ld hl,vChars2 + $600 - ld bc,(BANK(PokedexTileGraphics) << 8) + $12 + lb bc, BANK(PokedexTileGraphics), $12 call CopyVideoData ld de,PokeballTileGraphics ld hl,vChars2 + $720 - ld bc,(BANK(PokeballTileGraphics) << 8) + $01 + lb bc, BANK(PokeballTileGraphics), $01 jp CopyVideoData ; load pokeball tile for marking caught mons diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index a810afd2..072a19d3 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -116,7 +116,7 @@ BillsPCMenu: ; 214e8 (8:54e8) ld [wCurrentMenuItem], a ld hl, vChars2 + $780 ld de, PokeballTileGraphics - ld bc, (BANK(PokeballTileGraphics) << 8) + $01 + lb bc, BANK(PokeballTileGraphics), $01 call CopyVideoData call LoadScreenTilesFromBuffer2DisableBGTransfer coord hl, 0, 0 diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 56373dd3..3e28bc93 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -13,7 +13,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ld a, BANK(CircleTile) call FarCopyData2 coord hl, 0, 0 - ld bc, $1012 + lb bc, 16, 18 predef Diploma_TextBoxBorder ld hl, DiplomaTextPointersAndCoords ld c, $5 @@ -41,7 +41,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ; Move the player 33 pixels right and set the priority bit so he appears ; behind the background layer. ld hl, wOAMBuffer + $01 - ld bc, $8028 + lb bc, $80, $28 .adjustPlayerGfxLoop ld a, [hl] ; X add 33 diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index b4c7f774..21c3f9e7 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -90,7 +90,7 @@ LeaguePCShowMon: ; 76610 (1d:6610) ld a, [hli] ld [wHoFMonLevel], a ld de, wcd6d - ld bc, $000B + ld bc, 11 call CopyData ld b, $0B ld c, 0 diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 20745c58..967f11e8 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -5,8 +5,8 @@ AskName: ; 64eb (1:64eb) ld a, [W_ISINBATTLE] dec a coord hl, 0, 0 - ld b, $4 - ld c, $b + ld b, 4 + ld c, 11 call z, ClearScreenArea ; only if in wild batle ld a, [wcf91] ld [wd11e], a @@ -14,7 +14,7 @@ AskName: ; 64eb (1:64eb) ld hl, DoYouWantToNicknameText call PrintText coord hl, 14, 7 - ld bc, $80f + lb bc, 8, 15 ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID @@ -64,10 +64,10 @@ DisplayNameRaterScreen: ; 655c (1:655c) call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal ld a, [wcf4b] - cp $50 + cp "@" jr z, .playerCancelled ld hl, wPartyMonNicks - ld bc, $b + ld bc, 11 ld a, [wWhichPokemon] call AddNTimes ld e, l @@ -269,7 +269,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ret z call CalcStringLength dec hl - ld [hl], $50 + ld [hl], "@" ret .pressedRight ld a, [wCurrentMenuItem] @@ -342,7 +342,7 @@ PrintAlphabet: ; 676f (1:676f) ld de, UpperCaseAlphabet .lowercase coord hl, 2, 5 - ld bc, $509 ; 5 rows, 9 columns + lb bc, 5, 9 ; 5 rows, 9 columns .outerLoop push bc .innerLoop @@ -373,7 +373,7 @@ PrintNicknameAndUnderscores: ; 680e (1:680e) ld a, c ld [wNamingScreenNameLength], a coord hl, 10, 2 - ld bc, $10a + lb bc, 1, 10 call ClearScreenArea coord hl, 10, 2 ld de, wcf4b @@ -458,7 +458,7 @@ CalcStringLength: ; 68eb (1:68eb) ld c, $0 .loop ld a, [hl] - cp $50 + cp "@" ret z inc hl inc c diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 4b350379..ead2c359 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -120,7 +120,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) push bc coord hl, 0, 3 ld de,20 - ld bc,$7f0d ; 13 blank tiles + lb bc, " ", 13 call DrawTileLine ; cover up the menu cursor in the pokemon list pop bc ret @@ -128,7 +128,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) push bc coord hl, 15, 10 ld de,20 - ld bc,$7f07 ; 7 blank tiles + lb bc, " ", 7 call DrawTileLine ; cover up the menu cursor in the side menu pop bc jr .exitSideMenu @@ -212,7 +212,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) xor a ld [H_AUTOBGTRANSFERENABLED],a coord hl, 4, 2 - ld bc,$0e0a + lb bc, 14, 10 call ClearScreenArea coord hl, 1, 3 ld a,[wListScrollOffset] @@ -413,14 +413,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld [hTilesetType],a coord hl, 0, 0 ld de,1 - ld bc,$6414 + lb bc, $64, SCREEN_WIDTH call DrawTileLine ; draw top border coord hl, 0, 17 - ld b,$6f + ld b, $6f call DrawTileLine ; draw bottom border coord hl, 0, 1 ld de,20 - ld bc,$6610 + lb bc, $66, $10 call DrawTileLine ; draw left border coord hl, 19, 1 ld b,$67 diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 683930d1..f061fbf6 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -34,7 +34,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) ld [wTextBoxID],a call DisplayTextBoxID ; display pokemon menu options ld hl,wFieldMoves - ld bc,$020c ; max menu item ID, top menu item Y + lb bc, $02, $0c ; max menu item ID, top menu item Y ld e,5 .adjustMenuVariablesLoop dec e @@ -523,7 +523,7 @@ StartMenu_TrainerInfo: ; 13460 (4:7460) ; loads tile patterns and draws everything except for gym leader faces / badges DrawTrainerInfo: ; 1349a (4:749a) ld de,RedPicFront - ld bc,(BANK(RedPicFront) << 8) | $01 + lb bc, BANK(RedPicFront), $01 predef DisplayPicCenteredOrUpperRight call DisableLCD coord hl, 0, 2 @@ -632,7 +632,7 @@ TrainerInfo_BadgesText: ; 13597 (4:7597) ; [wTrainerInfoTextBoxNextRowOffset] = distance from the end of a text box row to the start of the next TrainerInfo_DrawTextBox: ; 135a0 (4:75a0) ld a,$79 ; upper left corner tile ID - ld de,$7a7b ; top edge and upper right corner tile ID's + lb de, $7a, $7b ; top edge and upper right corner tile ID's call TrainerInfo_DrawHorizontalEdge ; draw top edge call TrainerInfo_NextTextBoxRow ld a,[wTrainerInfoTextBoxWidthPlus1] @@ -647,7 +647,7 @@ TrainerInfo_DrawTextBox: ; 135a0 (4:75a0) dec c jr nz,.loop ld a,$7d ; lower left corner tile ID - ld de,$777e ; bottom edge and lower right corner tile ID's + lb de,$77, $7e ; bottom edge and lower right corner tile ID's TrainerInfo_DrawHorizontalEdge: ; 135c3 (4:75c3) ld [hli],a ; place left corner tile @@ -813,36 +813,36 @@ SwitchPartyMon_InitVarOrSwapData: ; 13653 (4:7653) call SkipFixedLengthTextEntries push hl ld de, wSwitchPartyMonTempBuffer - ld bc, $b + ld bc, 11 call CopyData ld hl, wPartyMonOT ld a, [wMenuItemToSwap] call SkipFixedLengthTextEntries pop de push hl - ld bc, $b + ld bc, 11 call CopyData pop de ld hl, wSwitchPartyMonTempBuffer - ld bc, $b + ld bc, 11 call CopyData ld hl, wPartyMonNicks ld a, [wCurrentMenuItem] call SkipFixedLengthTextEntries push hl ld de, wSwitchPartyMonTempBuffer - ld bc, $b + ld bc, 11 call CopyData ld hl, wPartyMonNicks ld a, [wMenuItemToSwap] call SkipFixedLengthTextEntries pop de push hl - ld bc, $b + ld bc, 11 call CopyData pop de ld hl, wSwitchPartyMonTempBuffer - ld bc, $b + ld bc, 11 call CopyData ld a, [wMenuItemToSwap] ld [wSwappedMenuItem], a diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index c6550217..d8a504bb 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -87,34 +87,34 @@ StatusScreen: ; 12953 (4:6953) call LoadHpBarAndStatusTilePatterns ld de, BattleHudTiles1 ; source ld hl, vChars2 + $6d0 ; dest - ld bc, (BANK(BattleHudTiles1) << 8) + $03 ; bank bytes/8 + lb bc, BANK(BattleHudTiles1), $03 call CopyVideoDataDouble ; ·│ :L and halfarrow line end ld de, BattleHudTiles2 ld hl, vChars2 + $780 - ld bc, (BANK(BattleHudTiles2) << 8) + $01 + lb bc, BANK(BattleHudTiles2), $01 call CopyVideoDataDouble ; │ ld de, BattleHudTiles3 ld hl, vChars2 + $760 - ld bc, (BANK(BattleHudTiles3) << 8) + $02 + lb bc, BANK(BattleHudTiles3), $02 call CopyVideoDataDouble ; ─┘ ld de, PTile ld hl, vChars2 + $720 - ld bc,(BANK(PTile) << 8 | $01) + lb bc, BANK(PTile), $01 call CopyVideoDataDouble ; P (for PP), inline ld a, [hTilesetType] push af xor a ld [hTilesetType], a coord hl, 19, 1 - ld bc, $060a + lb bc, 6, 10 call DrawLineBox ; Draws the box around name, HP and status - ld de, $fffa + ld de, -6 add hl, de ld [hl], $f2 ; . after No ("." is a different one) dec hl ld [hl], "№" coord hl, 19, 9 - ld bc, $0806 + lb bc, 8, 6 call DrawLineBox ; Draws the box around types, ID No. and OT coord hl, 10, 9 ld de, Type1Text @@ -224,7 +224,7 @@ OKText: ; 12ac4 (4:6ac4) ; Draws a line starting from hl high b and wide c DrawLineBox: ; 0x12ac7 - ld de, $0014 ; New line + ld de, SCREEN_WIDTH ; New line .PrintVerticalLine ld [hl], $78 ; │ add hl, de diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 5b6c29e1..98499d7f 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -24,11 +24,11 @@ SetDefaultNames: ; 60ca (1:60ca) call z, InitOptions ld hl, NintenText ld de, wPlayerName - ld bc, $b + ld bc, 11 call CopyData ld hl, SonyText ld de, W_RIVALNAME - ld bc, $b + ld bc, 11 jp CopyData OakSpeech: ; 6115 (1:6115) @@ -57,7 +57,7 @@ OakSpeech: ; 6115 (1:6115) bit 1,a ; possibly a debug mode bit jp nz,.skipChoosingNames ld de,ProfOakPic - ld bc, (Bank(ProfOakPic) << 8) | $00 + lb bc, Bank(ProfOakPic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl,OakSpeechText1 @@ -76,7 +76,7 @@ OakSpeech: ; 6115 (1:6115) call GBFadeOutToWhite call ClearScreen ld de,RedPicFront - ld bc,(Bank(RedPicFront) << 8) | $00 + lb bc, Bank(RedPicFront), $00 call IntroDisplayPicCenteredOrUpperRight call MovePicLeft ld hl,IntroducePlayerText @@ -85,7 +85,7 @@ OakSpeech: ; 6115 (1:6115) call GBFadeOutToWhite call ClearScreen ld de,Rival1Pic - ld bc,(Bank(Rival1Pic) << 8) | $00 + lb bc, Bank(Rival1Pic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl,IntroduceRivalText @@ -95,7 +95,7 @@ OakSpeech: ; 6115 (1:6115) call GBFadeOutToWhite call ClearScreen ld de,RedPicFront - ld bc,(Bank(RedPicFront) << 8) | $00 + lb bc, Bank(RedPicFront), $00 call IntroDisplayPicCenteredOrUpperRight call GBFadeInFromWhite ld a,[wd72d] @@ -115,15 +115,15 @@ OakSpeech: ; 6115 (1:6115) call DelayFrames ld de,RedSprite ld hl,vSprites - ld bc,(BANK(RedSprite) << 8) | $0C + lb bc, BANK(RedSprite), $0C call CopyVideoData ld de,ShrinkPic1 - ld bc,(BANK(ShrinkPic1) << 8) | $00 + lb bc, BANK(ShrinkPic1), $00 call IntroDisplayPicCenteredOrUpperRight ld c,4 call DelayFrames ld de,ShrinkPic2 - ld bc,(BANK(ShrinkPic2) << 8) | $00 + lb bc, BANK(ShrinkPic2), $00 call IntroDisplayPicCenteredOrUpperRight call ResetPlayerSpriteData ld a,[H_LOADEDROMBANK] diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index bdc4d38f..50e3708c 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -73,7 +73,7 @@ OakSpeechSlidePicLeft: ; 69ec (1:69ec) call DelayFrames pop de ld hl, wcd6d - ld bc, $b + ld bc, 11 call CopyData call Delay3 coord hl, 12, 4 diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 2056bbb0..30aedbc1 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -82,11 +82,11 @@ InitCutAnimOAM: ; eff7 (3:6ff7) ; tree ld de, Overworld_GFX + $2d0 ; cuttable tree sprite top row ld hl, vChars1 + $7c0 - ld bc, (BANK(Overworld_GFX) << 8) + $02 + lb bc, BANK(Overworld_GFX), $02 call CopyVideoData ld de, Overworld_GFX + $3d0 ; cuttable tree sprite bottom row ld hl, vChars1 + $7e0 - ld bc, (BANK(Overworld_GFX) << 8) + $02 + lb bc, BANK(Overworld_GFX), $02 call CopyVideoData jr WriteCutOrBoulderDustAnimationOAMBlock .grass @@ -113,7 +113,7 @@ InitCutAnimOAM: ; eff7 (3:6ff7) LoadCutGrassAnimationTilePattern: ; f04c (3:704c) ld de, AnimationTileset2 + $60 ; tile depicting a leaf - ld bc, (BANK(AnimationTileset2) << 8) + $01 + lb bc, BANK(AnimationTileset2), $01 jp CopyVideoData WriteCutOrBoulderDustAnimationOAMBlock: ; f055 (3:7055) diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index 22dfb24f..ebd441aa 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -9,7 +9,7 @@ EmotionBubble: ; 17c47 (5:7c47) inc hl ld d, [hl] ld hl, vChars1 + $780 - ld bc, (BANK(EmotionBubblesPointerTable) << 8) + $04 + lb bc, BANK(EmotionBubblesPointerTable), $04 call CopyVideoData ld a, [wUpdateSpritesEnabled] push af diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index b123f33f..d3513b0d 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,7 +1,7 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld de, PokeCenterFlashingMonitorAndHealBall ld hl, vChars0 + $7c0 - ld bc, (BANK(PokeCenterFlashingMonitorAndHealBall) << 8) + $03 + lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03 call CopyVideoData ld hl, wUpdateSpritesEnabled ld a, [hl] diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index 51819802..5a3bfbe0 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -69,10 +69,10 @@ LedgeTiles: ; 1a6cf (6:66cf) LoadHoppingShadowOAM: ; 1a6f0 (6:66f0) ld hl, vChars1 + $7f0 ld de, LedgeHoppingShadow - ld bc, (BANK(LedgeHoppingShadow) << 8) + $01 + lb bc, BANK(LedgeHoppingShadow), $01 call CopyVideoDataDouble ld a, $9 - ld bc, $5448 ; b, c = y, x coordinates of shadow + lb bc, $54, $48 ; b, c = y, x coordinates of shadow ld de, LedgeHoppingShadowOAM call WriteOAMBlock ret diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 1a3d374f..74762b00 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -47,7 +47,7 @@ EnterMapAnim: ; 70510 (1c:4510) pop hl ld de, BirdSprite ld hl, vNPCSprites - ld bc, (BANK(BirdSprite) << 8) + $0c + lb bc, BANK(BirdSprite), $0c call CopyVideoData call LoadBirdSpriteGraphics ld a, SFX_FLY @@ -250,11 +250,11 @@ DoFlyAnimation: ; 706ae (1c:46ae) LoadBirdSpriteGraphics: ; 706d7 (1c:46d7) ld de, BirdSprite ld hl, vNPCSprites - ld bc, (BANK(BirdSprite) << 8) + $0c + lb bc, BANK(BirdSprite), $0c call CopyVideoData ld de, BirdSprite + $c0 ; moving animation sprite ld hl, vNPCSprites2 - ld bc, (BANK(BirdSprite) << 8) + $0c + lb bc, BANK(BirdSprite), $0c jp CopyVideoData InitFacingDirectionList: ; 706ef (1c:46ef) @@ -388,7 +388,7 @@ FishingAnim: ; 707b6 (1c:47b6) set 6, [hl] ; reserve the last 4 OAM entries ld de, RedSprite ld hl, vNPCSprites - ld bc, (BANK(RedSprite) << 8) + $0c + lb bc, BANK(RedSprite), $0c call CopyVideoData ld a, $4 ld hl, RedFishingTiles diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index d59b2dc7..ae96c4a9 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -82,10 +82,10 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) inc a jr z,.sellMenuLoop ; if the player closed the choose quantity menu with the B button ld hl,PokemartTellSellPriceText - ld bc,$0e01 + lb bc, 14, 1 ; location that PrintText always prints to, this is useless call PrintText coord hl, 14, 7 - ld bc,$080f + lb bc, 08, 15 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu @@ -163,7 +163,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld hl,PokemartTellBuyPriceText call PrintText coord hl, 14, 7 - ld bc,$080f + lb bc, 8, 15 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm index 8c5485e2..1dccd026 100755 --- a/engine/overworld/ssanne.asm +++ b/engine/overworld/ssanne.asm @@ -85,7 +85,7 @@ LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0) LoadSmokeTile: ; 79fd4 (1e:5fd4) ld de, SSAnneSmokePuffTile - ld bc, (BANK(SSAnneSmokePuffTile) << 8) + $01 + lb bc, BANK(SSAnneSmokePuffTile), $01 jp CopyVideoData SSAnneSmokePuffTile: ; 79fdd (1e:5fdd) diff --git a/engine/save.asm b/engine/save.asm index 70295044..dfc50616 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -155,8 +155,8 @@ SaveSAV: ; 7370a (1c:770a) .save call SaveSAVtoSRAM coord hl, 1, 13 - ld bc,$0412 - call ClearScreenArea ; clear area 4x12 starting at 13,1 + lb bc, 4, 18 + call ClearScreenArea coord hl, 1, 14 ld de,NowSavingString call PlaceString @@ -176,7 +176,7 @@ NowSavingString: SaveSAVConfirm: ; 73768 (1c:7768) call PrintText coord hl, 0, 7 - ld bc,$0801 + lb bc, 8, 1 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 3345a9dc..3b392dde 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -134,7 +134,7 @@ MainSlotMachineLoop: ; 37395 (d:7395) ld hl, OneMoreGoSlotMachineText call PrintText coord hl, 14, 12 - ld bc, $0d0f + lb bc, 13, 15 xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a ld a, TWO_OPTION_MENU diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 84c0cdf7..df47275b 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -1,6 +1,6 @@ ; copy text of fixed length $b (like player name, rival name, mon names, ...) CopyFixedLengthText: ; 42b1 (1:42b1) - ld bc, $b + ld bc, 11 jp CopyData SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) @@ -377,7 +377,7 @@ LoadCopyrightAndTextBoxTiles: ; 4538 (1:4538) LoadCopyrightTiles: ; 4541 (1:4541) ld de, NintendoCopyrightLogoGraphics ld hl, vChars2 + $600 - ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c + lb bc, BANK(NintendoCopyrightLogoGraphics), $1c call CopyVideoData coord hl, 2, 7 ld de, CopyrightTextString diff --git a/engine/town_map.asm b/engine/town_map.asm index f5a047c3..037a59fa 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -20,7 +20,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) call CopyData ld hl, vSprites + $40 ld de, TownMapCursor - ld bc, (BANK(TownMapCursor) << 8) + $04 + lb bc, BANK(TownMapCursor), $04 call CopyVideoDataDouble xor a ld [wWhichTownMapLocation], a @@ -29,7 +29,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) .townMapLoop coord hl, 0, 0 - ld bc, $114 + lb bc, 1, 20 call ClearScreenArea ld hl, TownMapOrder ld a, [wWhichTownMapLocation] @@ -140,11 +140,11 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) call LoadFontTilePatterns ld de, BirdSprite ld hl, vSprites + $40 - ld bc, (BANK(BirdSprite) << 8) + $0c + lb bc, BANK(BirdSprite), $0c call CopyVideoData ld de, TownMapUpArrow ld hl, vChars1 + $6d0 - ld bc, (BANK(TownMapUpArrow) << 8) + $01 + lb bc, BANK(TownMapUpArrow), $01 call CopyVideoDataDouble call BuildFlyLocationsList ld hl, wUpdateSpritesEnabled @@ -161,12 +161,12 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) ld hl, wFlyLocationsList coord de, 18, 0 .townMapFlyLoop - ld a, $7f + ld a, " " ld [de], a push hl push hl coord hl, 3, 0 - ld bc, $10f + lb bc, 1, 15 call ClearScreenArea pop hl ld a, [hl] @@ -442,8 +442,8 @@ WritePlayerOrBirdSpriteOAM: ; 7126d (1c:526d) WriteTownMapSpriteOAM: ; 71279 (1c:5279) push hl - ld hl, $fcfc - add hl, bc ; subtract 4 from c (X coord) and 3 from b (Y coord) + lb hl, -4, -4 + add hl, bc ; subtract 4 from c (X coord) and 4 from b (Y coord) ld b, h ld c, l pop hl @@ -451,7 +451,7 @@ WriteTownMapSpriteOAM: ; 71279 (1c:5279) WriteAsymmetricMonPartySpriteOAM: ; 71281 (1c:5281) ; Writes 4 OAM blocks for a helix mon party sprite, since it does not have ; a vertical line of symmetry. - ld de, $202 + lb de, 2, 2 .loop push de push bc diff --git a/engine/trade.asm b/engine/trade.asm index 74fd3434..1a0e5f61 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -371,7 +371,7 @@ Trade_ShowEnemyMon: ; 41336 (10:5336) call PlayCry call Trade_Delay100 coord hl, 4, 10 - ld bc, $80c + lb bc, 8, 12 call ClearScreenArea jp PrintTradeTakeCareText @@ -647,14 +647,14 @@ Trade_AnimMonMoveVertical: ; 41525 (10:5525) and a jr z, .movingLeft ; moving right - ld bc, $400 ; move right + lb bc, 4, 0 ; move right call .doAnim - ld bc, $a ; move down + lb bc, 0, 10 ; move down jr .doAnim .movingLeft - ld bc, $f6 ; move up + lb bc, 0, -10 ; move up call .doAnim - ld bc, $fc00 ; move left + lb bc, -4, 0 ; move left .doAnim ld a, b ld [W_BASECOORDX], a diff --git a/home.asm b/home.asm index 449666df..2753307b 100644 --- a/home.asm +++ b/home.asm @@ -1402,7 +1402,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6) call UpdateSprites ; disable sprites behind the text box ; the code up to .skipMovingSprites appears to be useless coord hl, 4, 2 ; coordinates of upper left corner of menu text box - ld de,$090e ; height and width of menu text box + lb de, 9, 14 ; height and width of menu text box ld a,[wListMenuID] and a ; is it a PC pokemon list? jr nz,.skipMovingSprites @@ -1668,7 +1668,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) coord hl, 9, 10 .printQuantity ld de,wItemQuantity ; current quantity - lb bc,LEADING_ZEROES | 1, 2 ; 1 byte, 2 digits + lb bc, LEADING_ZEROES | 1, 2 ; 1 byte, 2 digits call PrintNumber jp .waitForKeyPressLoop .buttonAPressed ; the player chose to make the transaction @@ -1705,8 +1705,8 @@ ExitListMenu:: ; 2e3b (0:2e3b) PrintListMenuEntries:: ; 2e5a (0:2e5a) coord hl, 5, 3 - ld b,$09 - ld c,$0e + ld b,9 + ld c,14 call ClearScreenArea ld a,[wListPointer] ld e,a @@ -1786,7 +1786,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) ld [wcf91],a call GetItemPrice ; get price pop hl - ld bc,20 + 5 ; 1 row down and 5 columns right + ld bc, SCREEN_WIDTH + 5 ; 1 row down and 5 columns right add hl,bc ld c,$a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes call PrintBCDNumber @@ -1815,7 +1815,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) ld a,[wListScrollOffset] add b ld [hl],a - call LoadMonData ; load pokemon info + call LoadMonData ld a,[wMonDataLocation] and a ; is it a list of party pokemon or box pokemon? jr z,.skipCopyingLevel @@ -1826,7 +1826,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) pop hl ld bc,$001c add hl,bc - call PrintLevel ; print level + call PrintLevel pop af ld [wd11e],a .skipPrintingPokemonLevel @@ -1844,7 +1844,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) and a ; is the item unsellable? jr nz,.skipPrintingItemQuantity ; if so, don't print the quantity push hl - ld bc,20 + 8 ; 1 row down and 8 columns right + ld bc, SCREEN_WIDTH + 8 ; 1 row down and 8 columns right add hl,bc ld a,"×" ld [hli],a @@ -1877,7 +1877,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) ld a,$ec ; unfilled right arrow menu cursor to indicate an item being swapped ld [hli],a .nextListEntry - ld bc,2 * 20 ; 2 rows + ld bc,2 * SCREEN_WIDTH ; 2 rows add hl,bc pop bc inc c @@ -1899,12 +1899,12 @@ GetMonName:: ; 2f9e (0:2f9e) push hl ld a,[H_LOADEDROMBANK] push af - ld a,BANK(MonsterNames) ; 07 + ld a,BANK(MonsterNames) ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a ld a,[wd11e] dec a - ld hl,MonsterNames ; 421E + ld hl,MonsterNames ld c,10 ld b,0 call AddNTimes @@ -1972,7 +1972,7 @@ GetMachineName:: ; 2ff3 (0:2ff3) ; now get the machine number and convert it to text ld a,[wd11e] sub TM_01 - 1 - ld b,$F6 ; "0" + ld b, "0" .FirstDigit sub 10 jr c,.SecondDigit @@ -1985,7 +1985,7 @@ GetMachineName:: ; 2ff3 (0:2ff3) ld [de],a inc de pop af - ld b,$F6 ; "0" + ld b, "0" add b ld [de],a inc de @@ -2134,6 +2134,7 @@ IsKeyItem:: ; 30d9 (0:30d9) ; function to draw various text boxes ; INPUT: ; [wTextBoxID] = text box ID +; b, c = y, x cursor position (TWO_OPTION_MENU only) DisplayTextBoxID:: ; 30e8 (0:30e8) ld a,[H_LOADEDROMBANK] push af @@ -3002,7 +3003,7 @@ YesNoChoicePokeCenter:: ; 360a (0:360a) ld a, HEAL_CANCEL_MENU ld [wTwoOptionMenuID], a coord hl, 11, 6 - ld bc, $80c + lb bc, 8, 12 jr DisplayYesNoChoice Func_361a:: ; 361a (0:361a) @@ -3010,7 +3011,7 @@ Func_361a:: ; 361a (0:361a) ld a, WIDE_YES_NO_MENU ld [wTwoOptionMenuID], a coord hl, 12, 7 - ld bc, $080d + lb bc, 8, 13 DisplayYesNoChoice:: ; 3628 (0:3628) ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -3097,7 +3098,7 @@ LoadFontTilePatterns:: .on ld de, FontGraphics ld hl, vFont - ld bc, BANK(FontGraphics) << 8 | $80 + lb bc, BANK(FontGraphics), $80 jp CopyVideoDataDouble ; if LCD is on, transfer during V-blank LoadTextBoxTilePatterns:: @@ -3113,7 +3114,7 @@ LoadTextBoxTilePatterns:: .on ld de, TextBoxGraphics ld hl, vChars2 + $600 - ld bc, BANK(TextBoxGraphics) << 8 | $20 + lb bc, BANK(TextBoxGraphics), $20 jp CopyVideoData ; if LCD is on, transfer during V-blank LoadHpBarAndStatusTilePatterns:: @@ -3129,7 +3130,7 @@ LoadHpBarAndStatusTilePatterns:: .on ld de, HpBarAndStatusGraphics ld hl, vChars2 + $620 - ld bc, BANK(HpBarAndStatusGraphics) << 8 | $1e + lb bc, BANK(HpBarAndStatusGraphics), $1e jp CopyVideoData ; if LCD is on, transfer during V-blank @@ -3824,12 +3825,12 @@ MoveMon:: ; 3a68 (0:3a68) ld [MBC1RomBank], a ret -; skips a text entries, each of size $b (like trainer name, OT name, rival name, ...) +; skips a text entries, each of size 11 (like trainer name, OT name, rival name, ...) ; hl: base pointer, will be incremented by $b * a SkipFixedLengthTextEntries:: ; 3a7d (0:3a7d) and a ret z - ld bc, $b + ld bc, 11 .skipLoop add hl, bc dec a diff --git a/home/copy2.asm b/home/copy2.asm index 3f7a4400..830440b0 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -161,7 +161,7 @@ CopyVideoDataDouble:: ClearScreenArea:: ; Clear tilemap area cxb at hl. - ld a, $7f ; blank tile + ld a, " " ; blank tile ld de, 20 ; screen width .y push hl @@ -218,7 +218,7 @@ ClearScreen:: ld bc, 20 * 18 inc b coord hl, 0, 0 - ld a, $7f + ld a, " " .loop ld [hli], a dec c diff --git a/home/overworld.asm b/home/overworld.asm index 3675eca8..f8d6e7e1 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1995,7 +1995,7 @@ LoadBikePlayerSpriteGraphics:: ; 105d (0:105d) LoadPlayerSpriteGraphicsCommon:: ; 1063 (0:1063) push de push hl - ld bc,(BANK(RedSprite) << 8) + $0c + lb bc, BANK(RedSprite), $0c call CopyVideoData pop hl pop de @@ -2006,7 +2006,7 @@ LoadPlayerSpriteGraphicsCommon:: ; 1063 (0:1063) inc d .noCarry set 3,h - ld bc,$050c + lb bc, BANK(RedSprite), $0c jp CopyVideoData ; function to load data from the map header diff --git a/home/text.asm b/home/text.asm index 97ff2859..238af447 100644 --- a/home/text.asm +++ b/home/text.asm @@ -291,7 +291,7 @@ Char51:: ; 1ab4 (0:1ab4) call ProtectedDelay3 call ManualTextScroll coord hl, 1, 13 - ld bc,$0412 + lb bc, 4, 18 call ClearScreenArea ld c,20 call DelayFrames @@ -306,7 +306,7 @@ Char49:: ; 1ad5 (0:1ad5) call ProtectedDelay3 call ManualTextScroll coord hl, 1, 10 - ld bc,$0712 + lb bc, 7, 18 call ClearScreenArea ld c,20 call DelayFrames diff --git a/main.asm b/main.asm index 10317d4f..8def2f85 100755 --- a/main.asm +++ b/main.asm @@ -590,7 +590,7 @@ INCLUDE "engine/cable_club.asm" LoadTrainerInfoTextBoxTiles: ; 5ae6 (1:5ae6) ld de, TrainerInfoTextBoxTileGraphics ld hl, vChars2 + $760 - ld bc, (BANK(TrainerInfoTextBoxTileGraphics) << 8) +$09 + lb bc, BANK(TrainerInfoTextBoxTileGraphics), $09 jp CopyVideoData INCLUDE "engine/menu/main_menu.asm" @@ -1435,8 +1435,8 @@ DisplayMoneyBox: ; 74ba (1:74ba) ld [wTextBoxID], a call DisplayTextBoxID coord hl, 13, 1 - ld b, $1 - ld c, $6 + ld b, 1 + ld c, 6 call ClearScreenArea coord hl, 12, 1 ld de, wPlayerMoney @@ -1967,7 +1967,7 @@ _RemovePokemon: ; 7b68 (1:7b68) .asm_7ba6 ld d, h ld e, l - ld bc, $b + ld bc, 11 add hl, bc ld bc, wPartyMonNicks ld a, [wRemoveMonFromBox] @@ -2007,12 +2007,12 @@ _RemovePokemon: ; 7b68 (1:7b68) jr z, .asm_7bfa ld hl, wBoxMonNicks .asm_7bfa - ld bc, $b + ld bc, 11 ld a, [wWhichPokemon] call AddNTimes ld d, h ld e, l - ld bc, $b + ld bc, 11 add hl, bc ld bc, wPokedexOwned ld a, [wRemoveMonFromBox] @@ -3587,7 +3587,7 @@ _AddPartyMon: ; f2e5 (3:72e5) ld d, h ld e, l ld hl, wPlayerName - ld bc, $b + ld bc, 11 call CopyData ld a, [wMonDataLocation] and a @@ -3858,7 +3858,7 @@ _AddEnemyMonToPlayerParty: ; f49d (3:749d) ld hl, wEnemyMonOT ld a, [wWhichPokemon] call SkipFixedLengthTextEntries - ld bc, $000b + ld bc, 11 call CopyData ; write new mon's OT name (from an enemy mon) ld hl, wPartyMonNicks ld a, [wPartyCount] @@ -3869,7 +3869,7 @@ _AddEnemyMonToPlayerParty: ; f49d (3:749d) ld hl, wEnemyMonNicks ld a, [wWhichPokemon] call SkipFixedLengthTextEntries - ld bc, $000b + ld bc, 11 call CopyData ; write new mon's nickname (from an enemy mon) ld a, [wcf91] ld [wd11e], a @@ -4000,7 +4000,7 @@ _MoveMon: ; f51e (3:751e) ld a, [wWhichPokemon] call SkipFixedLengthTextEntries .asm_f5ec - ld bc, $b + ld bc, 11 call CopyData ld a, [wMoveMonType] cp PARTY_TO_DAYCARE @@ -4030,7 +4030,7 @@ _MoveMon: ; f51e (3:751e) ld a, [wWhichPokemon] call SkipFixedLengthTextEntries .asm_f62a - ld bc, $b + ld bc, 11 call CopyData pop hl ld a, [wMoveMonType] diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 60ddf606..1e34c99c 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -22,7 +22,7 @@ AgathaScript_76443: ; 76443 (1d:6443) AgathaScript_76459: ; 76459 (1d:6459) ld [wNewTileBlockID], a - ld bc, $2 + lb bc, 0, 2 predef_jump ReplaceTileBlock AgathaScript_76464: ; 76464 (1d:6464) diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index f0bdf615..cf717b43 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -19,7 +19,7 @@ BikeShopText1: ; 1d745 (7:5745) jr z, .asm_41190 ld hl, BikeShopText_1d81f call PrintText - ld bc, (BICYCLE << 8) | 1 + lb bc, BICYCLE, 1 call GiveItem jr nc, .BagFull ld a, BIKE_VOUCHER diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index e4cfc031..08ac98d6 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -163,7 +163,7 @@ BillsHouseText2: ; 1e874 (7:6874) jr nz, .asm_1e8a9 ld hl, BillThankYouText call PrintText - ld bc, (S_S__TICKET << 8) | 1 + lb bc, S_S__TICKET, 1 call GiveItem jr nc, .BagFull ld hl, SSTicketReceivedText diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 0e29d64c..6aa2eaec 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -36,7 +36,7 @@ BluesHouseText1: ; 19b5d (6:5b5d) .GiveMap ld hl,DaisyOfferMapText call PrintText - ld bc,(TOWN_MAP << 8) | 1 + lb bc, TOWN_MAP, 1 call GiveItem jr nc, .BagFull ld a,HS_TOWN_MAP diff --git a/scripts/bruno.asm b/scripts/bruno.asm index c39656b9..bdfd7e24 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -22,7 +22,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec) BrunoScript_76302: ; 76302 (1d:6302) ld [wNewTileBlockID], a - ld bc, $2 + lb bc, 0, 2 predef_jump ReplaceTileBlock BrunoScript_7630d: ; 7630d (1d:630d) diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index ce0c4731..cfc8f197 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -46,7 +46,7 @@ CeladonCityText5: ; 1999e (6:599e) jr nz, .asm_7053f ld hl, TM41PreText call PrintText - ld bc, (TM_41 << 8) | 1 + lb bc, TM_41, 1 call GiveItem jr c, .Success ld hl, TM41NoRoomText diff --git a/scripts/celadondiner.asm b/scripts/celadondiner.asm index a37bc558..be1ed4c8 100755 --- a/scripts/celadondiner.asm +++ b/scripts/celadondiner.asm @@ -31,7 +31,7 @@ CeladonDinerText5: ; 49173 (12:5173) jr nz, .asm_eb14d ld hl, CeladonDinerText_491a7 call PrintText - ld bc, (COIN_CASE << 8) | 1 + lb bc, COIN_CASE, 1 call GiveItem jr nc, .BagFull SetEvent EVENT_GOT_COIN_CASE diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index e8917434..787a2f3d 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -32,7 +32,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec) ret nz ld a, $2a ld [wNewTileBlockID], a - ld bc, $0208 + lb bc, 2, 8 predef_jump ReplaceTileBlock CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) @@ -452,7 +452,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd) SetEvent EVENT_FOUND_ROCKET_HIDEOUT ld a, $43 ld [wNewTileBlockID], a - ld bc, $0208 + lb bc, 2, 8 predef ReplaceTileBlock jp TextScriptEnd @@ -477,8 +477,8 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) call TextBoxBorder call UpdateSprites coord hl, 12, 1 - ld b, $4 - ld c, $7 + ld b, 4 + ld c, 7 call ClearScreenArea coord hl, 12, 2 ld de, GameCornerMoneyText diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 5dc328c7..64e85ff7 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -47,7 +47,7 @@ CeladonGymText_48963: ; 48963 (12:4963) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_ERIKA - ld bc, (TM_21 << 8) | 1 + lb bc, TM_21, 1 call GiveItem jr nc, .BagFull ld a, $a diff --git a/scripts/celadonmansion5.asm b/scripts/celadonmansion5.asm index 60d2cc92..6d979e04 100755 --- a/scripts/celadonmansion5.asm +++ b/scripts/celadonmansion5.asm @@ -11,7 +11,7 @@ CeladonMansion5Text1: ; 1dd41 (7:5d41) CeladonMansion5Text2: ; 1dd46 (7:5d46) TX_ASM - ld bc,(EEVEE << 8) | 25 + lb bc, EEVEE, 25 call GivePokemon jr nc, .asm_24365 ld a, HS_CELADON_MANSION_5_GIFT diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index f525d0af..c6c6ecc7 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -26,7 +26,7 @@ CeladonMart3Text1: ; 4824a (12:424a) jr nz, .asm_a5463 ld hl, TM18PreReceiveText call PrintText - ld bc, (TM_18 << 8) | 1 + lb bc, TM_18, 1 call GiveItem jr nc, .BagFull SetEvent EVENT_GOT_TM18 diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 113044cd..8eeb5d2b 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -88,7 +88,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) ld hl, CeladonMartRoofText_48515 call PrintText call RemoveItemByIDBank12 - ld bc, (TM_49 << 8) | 1 + lb bc, TM_49, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedTM49Text @@ -101,7 +101,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) ld hl, CeladonMartRoofText_48504 call PrintText call RemoveItemByIDBank12 - ld bc, (TM_48 << 8) | 1 + lb bc, TM_48, 1 call GiveItem jr nc, .BagFull ld hl, CeladonMartRoofText_4850a @@ -114,7 +114,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) ld hl, CeladonMartRoofText_484f3 call PrintText call RemoveItemByIDBank12 - ld bc, (TM_13 << 8) | 1 + lb bc, TM_13, 1 call GiveItem jr nc, .BagFull ld hl, CeladonMartRoofText_484f9 diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index c13e66e2..158a683d 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -299,7 +299,7 @@ CeruleanCityText2: ; 1967c (6:567c) .asm_4ca20 ld hl, CeruleanCityText_196f3 call PrintText - ld bc, (TM_28 << 8) + 1 + lb bc, TM_28, 1 call GiveItem jr c, .Success ld hl, TM28NoRoomText diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index a7845c68..ca1c2c7d 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -47,7 +47,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_MISTY - ld bc, (TM_11 << 8) | 1 + lb bc, TM_11, 1 call GiveItem jr nc, .BagFull ld a, $6 diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 60df9338..5bbb94a9 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -144,7 +144,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_BLAINE - ld bc, (TM_38 << 8) | 1 + lb bc, TM_38, 1 call GiveItem jr nc, .BagFull ld a, $b diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index 953c7126..74dbb1c5 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -23,7 +23,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82) jr z, .asm_62ecd ld hl, TM31PreReceiveText call PrintText - ld bc, (TM_31 << 8) | 1 + lb bc, TM_31, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedTM31Text diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index adde809f..cbafc034 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -113,7 +113,7 @@ FanClubText5: ; tell the story ld hl, .storytext call PrintText - ld bc, (BIKE_VOUCHER << 8) | 1 + lb bc, BIKE_VOUCHER, 1 call GiveItem jr nc, .BagFull ld hl, .receivedvouchertext diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 9bbc38a8..3ec89256 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -47,7 +47,7 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_KOGA - ld bc, (TM_06 << 8) | 1 + lb bc, TM_06, 1 call GiveItem jr nc, .BagFull ld a, $a diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index 37aebd23..76b5e91f 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -38,7 +38,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2) .asm_60cba ld hl, WardenThankYouText call PrintText - ld bc,(HM_04 << 8) | 1 + lb bc, HM_04, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedHM04Text diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm index 8c83b779..2aabb9c2 100755 --- a/scripts/fuchsiahouse3.asm +++ b/scripts/fuchsiahouse3.asm @@ -18,7 +18,7 @@ FuchsiaHouse3Text1: ; 56181 (15:6181) and a jr nz, .refused - ld bc, (GOOD_ROD << 8) | 1 + lb bc, GOOD_ROD, 1 call GiveItem jr nc, .full diff --git a/scripts/lab3.asm b/scripts/lab3.asm index 59b04b8c..cbb5f53f 100755 --- a/scripts/lab3.asm +++ b/scripts/lab3.asm @@ -14,7 +14,7 @@ Lab3Text1: ; 75c94 (1d:5c94) jr nz, .asm_e551a ld hl, TM35PreReceiveText call PrintText - ld bc, (TM_35 << 8) | 1 + lb bc, TM_35, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedTM35Text diff --git a/scripts/lance.asm b/scripts/lance.asm index 9fa621da..e2c43614 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -25,12 +25,12 @@ LanceScript_5a2c4: ; 5a2c4 (16:62c4) LanceScript_5a2de: ; 5a2de (16:62de) push bc ld [wNewTileBlockID], a - ld bc, $602 + lb bc, 6, 2 call LanceScript_5a2f0 pop bc ld a, b ld [wNewTileBlockID], a - ld bc, $603 + lb bc, 6, 3 LanceScript_5a2f0: ; 5a2f0 (16:62f0) predef_jump ReplaceTileBlock diff --git a/scripts/lavenderhouse1.asm b/scripts/lavenderhouse1.asm index 556e94a3..ccf9cef1 100755 --- a/scripts/lavenderhouse1.asm +++ b/scripts/lavenderhouse1.asm @@ -72,7 +72,7 @@ LavenderHouse1Text5: ; 1d918 (7:5918) jr nz, .asm_15ac2 ld hl, LavenderHouse1Text_1d94c call PrintText - ld bc, (POKE_FLUTE << 8) | 1 + lb bc, POKE_FLUTE, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedFluteText diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 3c639d1e..43eee966 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -23,7 +23,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) ld a, $24 .asm_761ab ld [wNewTileBlockID], a - ld bc, $2 + lb bc, 0, 2 predef_jump ReplaceTileBlock LoreleiScript_761b6: ; 761b6 (1d:61b6) diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 88bdd3ed..bbfb0a0b 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -15,22 +15,22 @@ Mansion1Subscript1: ; 442c5 (11:42c5) ret z CheckEvent EVENT_MANSION_SWITCH_ON jr nz, .asm_442ec - ld bc, $060c + lb bc, 6, 12 call Mansion1Script_4430b - ld bc, $0308 + lb bc, 3, 8 call Mansion1Script_44304 - ld bc, $080a + lb bc, 8, 10 call Mansion1Script_44304 - ld bc, $0d0d + lb bc, 13, 13 jp Mansion1Script_44304 .asm_442ec - ld bc, $060c + lb bc, 6, 12 call Mansion1Script_44304 - ld bc, $0308 + lb bc, 3, 8 call Mansion1Script_4430b - ld bc, $080a + lb bc, 8, 10 call Mansion1Script_4430b - ld bc, $0d0d + lb bc, 13, 13 jp Mansion1Script_4430b Mansion1Script_44304: ; 44304 (11:4304) diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index cb697b94..22bc2b12 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -16,24 +16,24 @@ Mansion2Script_51fee: ; 51fee (14:5fee) CheckEvent EVENT_MANSION_SWITCH_ON jr nz, .asm_52016 ld a, $e - ld bc, $204 + lb bc, 2, 4 call Mansion2Script_5202f ld a, $54 - ld bc, $409 + lb bc, 4, 9 call Mansion2Script_5202f ld a, $5f - ld bc, $b03 + lb bc, 11, 3 call Mansion2Script_5202f ret .asm_52016 ld a, $5f - ld bc, $204 + lb bc, 2, 4 call Mansion2Script_5202f ld a, $e - ld bc, $409 + lb bc, 4, 9 call Mansion2Script_5202f ld a, $e - ld bc, $b03 + lb bc, 11, 3 call Mansion2Script_5202f ret diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 21c959aa..84c00981 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -271,7 +271,7 @@ MtMoon3Text6: ; 49ee9 (12:5ee9) ld a, [wCurrentMenuItem] and a jr nz, .asm_49f21 - ld bc,(DOME_FOSSIL << 8) | 1 + lb bc, DOME_FOSSIL, 1 call GiveItem jp nc, MtMoon3Script_49f76 call MtMoon3Script_49f69 @@ -299,7 +299,7 @@ MtMoon3Text7: ; 49f29 (12:5f29) ld a, [wCurrentMenuItem] and a jr nz, .asm_49f61 - ld bc, (HELIX_FOSSIL << 8) | 1 + lb bc, HELIX_FOSSIL, 1 call GiveItem jp nc, MtMoon3Script_49f76 call MtMoon3Script_49f69 diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 63cc06e4..fd3e4e53 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -43,7 +43,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) ld hl, MtMoonPokecenterText_49366 jr .printText .enoughMoney - ld bc,(MAGIKARP << 8) | 5 + lb bc, MAGIKARP, 5 call GivePokemon jr nc, .done xor a diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 4c209eb8..ac552c6d 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -191,7 +191,7 @@ Museum1FText3: ; 5c256 (17:4256) jr nz, .asm_5c285 ld hl, Museum1FText_5c28e call PrintText - ld bc, (OLD_AMBER << 8) | 1 + lb bc, OLD_AMBER, 1 call GiveItem jr nc, .BagFull SetEvent EVENT_GOT_OLD_AMBER diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 93f87657..996ab754 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -1022,7 +1022,7 @@ OaksLabText5: ; 1d248 (7:5248) .asm_1d2d0 CheckAndSetEvent EVENT_GOT_POKEBALLS_FROM_OAK jr nz, .asm_1d2e7 - ld bc, (POKE_BALL << 8) | 5 + lb bc, POKE_BALL, 5 call GiveItem ld hl, OaksLabGivePokeballsText call PrintText diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 81fcb600..831403bb 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -47,7 +47,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_BROCK - ld bc, (TM_34 << 8) | 1 + lb bc, TM_34, 1 call GiveItem jr nc, .BagFull ld a, $5 diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index c658596e..82561577 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -27,7 +27,7 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0) ld a, $e .asm_44c03 ld [wNewTileBlockID], a - ld bc, $080c + lb bc, 8, 12 predef_jump ReplaceTileBlock RocketHideout1ScriptPointers: ; 44c0e (11:4c0e) diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 62d6f6bb..a71e444c 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -27,7 +27,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473) ld a, $e .asm_45498 ld [wNewTileBlockID], a - ld bc, $050c + lb bc, 5, 12 predef_jump ReplaceTileBlock RocketHideout4Script_454a3: ; 454a3 (11:54a3) diff --git a/scripts/route1.asm b/scripts/route1.asm index 6c00e555..926ffd20 100755 --- a/scripts/route1.asm +++ b/scripts/route1.asm @@ -12,7 +12,7 @@ Route1Text1: ; 1cab8 (7:4ab8) jr nz, .asm_1cada ld hl, Route1ViridianMartSampleText call PrintText - ld bc, (POTION << 8) | 1 + lb bc, POTION, 1 call GiveItem jr nc, .BagFull ld hl, Route1Text_1cae8 diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index f651d373..e7ad5cbf 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -12,7 +12,7 @@ Route12GateUpstairsText1: ; 49569 (12:5569) jr c, .asm_0ad3c ld hl, TM39PreReceiveText call PrintText - ld bc, (TM_39 << 8) | 1 + lb bc, TM_39, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedTM39Text diff --git a/scripts/route12house.asm b/scripts/route12house.asm index 6b3e17fc..bb065f1c 100755 --- a/scripts/route12house.asm +++ b/scripts/route12house.asm @@ -15,7 +15,7 @@ Route12HouseText1: ; 56484 (15:6484) ld a, [wCurrentMenuItem] and a jr nz, .asm_a2d76 - ld bc, (SUPER_ROD << 8) | 1 + lb bc, SUPER_ROD, 1 call GiveItem jr nc, .BagFull ld hl, wd728 diff --git a/scripts/route16house.asm b/scripts/route16house.asm index 4a0ac0c3..ee23fd89 100755 --- a/scripts/route16house.asm +++ b/scripts/route16house.asm @@ -12,7 +12,7 @@ Route16HouseText1: ; 1e5ff (7:65ff) jr nz, .asm_13616 ld hl, Route16HouseText3 call PrintText - ld bc, (HM_02 << 8) | 1 + lb bc, HM_02, 1 call GiveItem jr nc, .BagFull SetEvent EVENT_GOT_HM02 diff --git a/scripts/route24.asm b/scripts/route24.asm index 4e83a5cd..6eba1d35 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -149,7 +149,7 @@ Route24Text1: ; 514a4 (14:54a4) jr nz, .asm_514f9 ld hl, Route24Text_51510 call PrintText - ld bc, (NUGGET << 8) | 1 + lb bc, NUGGET, 1 call GiveItem jr nc, .BagFull SetEvent EVENT_GOT_NUGGET diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm index 9d354cff..4a37f0e6 100644 --- a/scripts/safarizoneentrance-yellow.asm +++ b/scripts/safarizoneentrance-yellow.asm @@ -54,7 +54,7 @@ ld hl,.MakePaymentText call PrintText ld a,30 - ld hl,(502 / $100) << 8 | (502 % $100) + lb hl, (502 / $100), (502 % $100) .xf1ff2 ld [W_NUMSAFARIBALLS],a ld a,h diff --git a/scripts/safarizonesecrethouse.asm b/scripts/safarizonesecrethouse.asm index 6cf17b9d..8881472b 100755 --- a/scripts/safarizonesecrethouse.asm +++ b/scripts/safarizonesecrethouse.asm @@ -10,7 +10,7 @@ SafariZoneSecretHouseText1: ; 4a31c (12:631c) jr nz, .asm_20a9b ld hl, SafariZoneSecretHouseText_4a350 call PrintText - ld bc, (HM_03 << 8) | 1 + lb bc, HM_03, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedHM03Text diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 9ee632f7..140b1130 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -47,7 +47,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_SABRINA - ld bc, (TM_46 << 8) | 1 + lb bc, TM_46, 1 call GiveItem jr nc, .BagFull ld a, $b diff --git a/scripts/saffronhouse2.asm b/scripts/saffronhouse2.asm index f3ec4c99..2c159190 100755 --- a/scripts/saffronhouse2.asm +++ b/scripts/saffronhouse2.asm @@ -10,7 +10,7 @@ SaffronHouse2Text1: ; 1de41 (7:5e41) jr nz, .asm_9e72b ld hl, TM29PreReceiveText call PrintText - ld bc,(TM_29 << 8) | 1 + lb bc, TM_29, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedTM29Text diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index fb419a22..a6f2f860 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -13,18 +13,19 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f) bit 5, [hl] res 5, [hl] ret z - ld hl, DataTable_5a173 + ld hl, SilphCo10GateCoords call SilphCo2Script_59d43 call SilphCo10Text_5a176 CheckEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR ret nz ld a, $54 ld [wNewTileBlockID], a - ld bc, $405 + lb bc, 4, 5 predef_jump ReplaceTileBlock -DataTable_5a173: ; 5a173 (16:6173) - db $04,$05,$FF +SilphCo10GateCoords: ; 5a173 (16:6173) + db $04,$05 + db $FF SilphCo10Text_5a176: ; 5a176 (16:6176) ld a, [$ffe0] diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 9cdf2891..4c83c20d 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -13,18 +13,19 @@ SilphCo11Script_62110: ; 62110 (18:6110) bit 5, [hl] res 5, [hl] ret z - ld hl, DataTable_62134 + ld hl, SilphCo11GateCoords call SilphCo11Script_62137 call SilphCo11Script_62163 CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR ret nz ld a, $20 ld [wNewTileBlockID], a - ld bc, $603 + lb bc, 6, 3 predef_jump ReplaceTileBlock -DataTable_62134: ; 62134 (18:6134) - db $06,$03,$FF +SilphCo11GateCoords: ; 62134 (18:6134) + db $06,$03 + db $FF SilphCo11Script_62137: ; 62137 (18:6137) push hl @@ -306,7 +307,7 @@ SilphCo11Text1: ; 622dc (18:62dc) jp nz, .asm_62308 ld hl, SilphCoPresidentText call PrintText - ld bc, (MASTER_BALL << 8) | 1 + lb bc, MASTER_BALL, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedSilphCoMasterBallText diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index b758455e..ecb3b5a5 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -13,7 +13,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) bit 5, [hl] res 5, [hl] ret z - ld hl, DataTable_59d3e + ld hl, SilphCo2GateCoords call SilphCo2Script_59d43 call SilphCo2Script_59d6f CheckEvent EVENT_SILPH_CO_2_UNLOCKED_DOOR1 @@ -21,7 +21,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) push af ld a, $54 ld [wNewTileBlockID], a - ld bc, $0202 + lb bc, 2, 2 predef ReplaceTileBlock pop af .asm_59d2e @@ -29,11 +29,13 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) ret nz ld a, $54 ld [wNewTileBlockID], a - ld bc, $0502 + lb bc, 5, 2 predef_jump ReplaceTileBlock -DataTable_59d3e: ; 59d3e (16:5d3e) - db $02,$02,$05,$02,$FF +SilphCo2GateCoords: ; 59d3e (16:5d3e) + db $02,$02 + db $05,$02 + db $FF SilphCo2Script_59d43: ; 59d43 (16:5d43) push hl @@ -141,7 +143,7 @@ SilphCo2Text1: ; 59dc1 (16:5dc1) jr nz, .asm_59de4 ld hl, SilphCo2Text_59ded call PrintText - ld bc, (TM_36 << 8) | 1 + lb bc, TM_36, 1 call GiveItem ld hl, TM36NoRoomText jr nc, .asm_59de7 diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index f693ea33..bdaac452 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -13,7 +13,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) bit 5, [hl] res 5, [hl] ret z - ld hl, DataTable_59fa8 + ld hl, SilphCo3GateCoords call SilphCo2Script_59d43 call SilphCo3Script_59fad CheckEvent EVENT_SILPH_CO_3_UNLOCKED_DOOR1 @@ -21,7 +21,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) push af ld a, $5f ld [wNewTileBlockID], a - ld bc, $404 + lb bc, 4, 4 predef ReplaceTileBlock pop af .asm_59f98 @@ -29,11 +29,13 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) ret nz ld a, $5f ld [wNewTileBlockID], a - ld bc, $408 + lb bc, 4, 8 predef_jump ReplaceTileBlock -DataTable_59fa8: ; 59fa8 (16:5fa8) - db $04,$04,$04,$08,$FF +SilphCo3GateCoords: ; 59fa8 (16:5fa8) + db $04,$04 + db $04,$08 + db $FF SilphCo3Script_59fad: ; 59fad (16:5fad) EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 0ea2c8c8..0dad6f6b 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -13,7 +13,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo4Data19d58 + ld hl, SilphCo4GateCoords call SilphCo4Script_19d5d call SilphCo4Script_19d89 CheckEvent EVENT_SILPH_CO_4_UNLOCKED_DOOR1 @@ -21,7 +21,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) push af ld a, $54 ld [wNewTileBlockID], a - ld bc, $0602 + lb bc, 6, 2 predef ReplaceTileBlock pop af .asm_19d48 @@ -29,11 +29,13 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) ret nz ld a, $54 ld [wNewTileBlockID], a - ld bc, $0406 + lb bc, 4, 6 predef_jump ReplaceTileBlock -SilphCo4Data19d58: ; 19d58 (6:5d58) - db $06, $02, $04, $06, $ff +SilphCo4GateCoords: ; 19d58 (6:5d58) + db $06,$02 + db $04,$06 + db $FF SilphCo4Script_19d5d: ; 19d5d (6:5d5d) push hl diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index d6f35993..7380f98f 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -13,7 +13,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo5Coords + ld hl, SilphCo5GateCoords call SilphCo4Script_19d5d call SilphCo5Script_19f9e CheckEvent EVENT_SILPH_CO_5_UNLOCKED_DOOR1 @@ -21,7 +21,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) push af ld a, $5f ld [wNewTileBlockID], a - ld bc, $0203 + lb bc, 2, 3 predef ReplaceTileBlock pop af .asm_19f74 @@ -30,7 +30,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) push af ld a, $5f ld [wNewTileBlockID], a - ld bc, $0603 + lb bc, 6, 3 predef ReplaceTileBlock pop af .asm_19f87 @@ -38,11 +38,14 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) ret nz ld a, $5f ld [wNewTileBlockID], a - ld bc, $0507 + lb bc, 5, 7 predef_jump ReplaceTileBlock -SilphCo5Coords: ; 19f97 (6:5f97) - db $02, $03, $06, $03, $05, $07, $ff +SilphCo5GateCoords: ; 19f97 (6:5f97) + db $02,$03 + db $06,$03 + db $05,$07 + db $FF SilphCo5Script_19f9e: ; 19f9e (6:5f9e) EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index 25fbcef9..fa199069 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -13,19 +13,19 @@ SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo6Coords1 + ld hl, SilphCo6GateCoords call SilphCo4Script_19d5d call SilphCo6Script_1a1e6 CheckEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret nz ld a, $5f ld [wNewTileBlockID], a - ld bc, $0602 + lb bc, 6, 2 predef_jump ReplaceTileBlock -SilphCo6Coords1: ; 1a1e3 (6:61e3) - db $06, $02 - db $ff +SilphCo6GateCoords: ; 1a1e3 (6:61e3) + db $06,$02 + db $FF SilphCo6Script_1a1e6: ; 1a1e6 (6:61e6) ld a, [$ffe0] diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 44e92475..525405c7 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -13,7 +13,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) bit 5, [hl] res 5, [hl] ret z - ld hl, DataTable_51bc1 + ld hl, SilphCo7GateCoords call SilphCo7Text_51bc8 call SilphCo7Text_51bf4 CheckEvent EVENT_SILPH_CO_7_UNLOCKED_DOOR1 @@ -21,7 +21,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) push af ld a, $54 ld [wNewTileBlockID], a - ld bc, $305 + lb bc, 3, 5 predef ReplaceTileBlock pop af .asm_51b9e @@ -30,7 +30,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) push af ld a, $54 ld [wNewTileBlockID], a - ld bc, $20a + lb bc, 2, 10 predef ReplaceTileBlock pop af .asm_51bb1 @@ -38,11 +38,14 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) ret nz ld a, $54 ld [wNewTileBlockID], a - ld bc, $60a + lb bc, 6, 10 predef_jump ReplaceTileBlock -DataTable_51bc1: ; 51bc1 (14:5bc1) - db $03,$05,$02,$0A,$06,$0A,$FF +SilphCo7GateCoords: ; 51bc1 (14:5bc1) + db $03,$05 + db $02,$0A + db $06,$0A + db $FF SilphCo7Text_51bc8: ; 51bc8 (14:5bc8) push hl @@ -329,7 +332,7 @@ SilphCo7Text1: .givelapras ld hl, .MeetLaprasGuyText call PrintText - ld bc, (LAPRAS << 8) | 15 + lb bc, LAPRAS, 15 call GivePokemon jr nc, .done ld a, [wSimulatedJoypadStatesEnd] diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 7545f359..9ea985a8 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -13,18 +13,19 @@ SilphCo8Script_5651a: ; 5651a (15:651a) bit 5, [hl] res 5, [hl] ret z - ld hl, DataTable_5653e + ld hl, SilphCo8GateCoords call SilphCo8Script_56541 call SilphCo8Script_5656d CheckEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR ret nz ld a, $5f ld [wNewTileBlockID], a - ld bc, $403 + lb bc, 4, 3 predef_jump ReplaceTileBlock -DataTable_5653e: ; 5653e (15:653e) - db $04,$03,$FF +SilphCo8GateCoords: ; 5653e (15:653e) + db $04,$03 + db $FF SilphCo8Script_56541: ; 56541 (15:6541) push hl diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 557ce1f1..02638459 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -13,7 +13,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) bit 5, [hl] res 5, [hl] ret z - ld hl, DataTable_5d82e + ld hl, SilphCo9GateCoords call SilphCo9Script_5d837 call SilphCo9Script_5d863 CheckEvent EVENT_SILPH_CO_9_UNLOCKED_DOOR1 @@ -21,7 +21,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) push af ld a, $5f ld [wNewTileBlockID], a - ld bc, $401 + lb bc, 4, 1 predef ReplaceTileBlock pop af .asm_5d7f8 @@ -30,7 +30,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) push af ld a, $54 ld [wNewTileBlockID], a - ld bc, $209 + lb bc, 2, 9 predef ReplaceTileBlock pop af .asm_5d80b @@ -39,7 +39,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) push af ld a, $54 ld [wNewTileBlockID], a - ld bc, $509 + lb bc, 5, 9 predef ReplaceTileBlock pop af .asm_5d81e @@ -47,11 +47,15 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ret nz ld a, $5f ld [wNewTileBlockID], a - ld bc, $605 + lb bc, 6, 5 predef_jump ReplaceTileBlock -DataTable_5d82e: ; 5d82e (17:582e) - db $04,$01,$02,$09,$05,$09,$06,$05,$FF +SilphCo9GateCoords: ; 5d82e (17:582e) + db $04,$01 + db $02,$09 + db $05,$09 + db $06,$05 + db $FF SilphCo9Script_5d837: ; 5d837 (17:5837) push hl diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index 9bb4aac6..b99f5bb2 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -22,7 +22,7 @@ SSAnne7Text1: ; 618ad (18:58ad) call PrintText ld hl, ReceivingHM01Text call PrintText - ld bc, (HM_01 << 8) | 1 + lb bc, HM_01, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedHM01Text diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 5c504335..78a38aec 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -38,7 +38,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) ld a, $5 .asm_5ca7f ld [wNewTileBlockID], a - ld bc, $202 + lb bc, 2, 2 predef_jump ReplaceTileBlock VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) @@ -66,7 +66,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_LT_SURGE - ld bc, (TM_24 << 8) | 1 + lb bc, TM_24, 1 call GiveItem jr nc, .BagFull ld a, $7 diff --git a/scripts/vermilionhouse2.asm b/scripts/vermilionhouse2.asm index 775c32bb..f166ebb8 100755 --- a/scripts/vermilionhouse2.asm +++ b/scripts/vermilionhouse2.asm @@ -15,7 +15,7 @@ VermilionHouse2Text1: ; 56075 (15:6075) ld a, [wCurrentMenuItem] and a jr nz, .asm_eb1b7 - ld bc, (OLD_ROD << 8) | 1 + lb bc, OLD_ROD, 1 call GiveItem jr nc, .BagFull ld hl, wd728 diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index dbb69a64..11f5d5db 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -15,7 +15,7 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) ret z ld a, $1d ld [wNewTileBlockID], a - ld bc, $604 + lb bc, 6, 4 predef_jump ReplaceTileBlock VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a) diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 41fe0212..cb956b1c 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -23,14 +23,14 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9) jr z, .asm_517da push af ld a, $15 - ld bc, $403 + lb bc, 4, 3 call VictoryRoad2Script_517e2 pop af .asm_517da bit 7, a ret z ld a, $1d - ld bc, $70b + lb bc, 7, 11 VictoryRoad2Script_517e2: ; 517e2 (14:57e2) ld [wNewTileBlockID], a diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index c5aaef50..22e6813a 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -17,7 +17,7 @@ VictoryRoad3Script_44996: ; 44996 (11:4996) ret z ld a, $1d ld [wNewTileBlockID], a - ld bc, $503 + lb bc, 5, 3 predef_jump ReplaceTileBlock VictoryRoad3ScriptPointers: ; 449b1 (11:49b1) diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 7cdf5ad8..79ad444f 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -235,7 +235,7 @@ ViridianCityText6: ; 19196 (6:5196) jr nz, .asm_4e5a0 ld hl, ViridianCityText_191ca call PrintText - ld bc, (TM_42 << 8) | 1 + lb bc, TM_42, 1 call GiveItem jr nc, .BagFull ld hl, ReceivedTM42Text diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 8e012040..6cded55d 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -141,7 +141,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - ld bc, (TM_27 << 8) | 1 + lb bc, TM_27, 1 call GiveItem jr nc, .BagFull ld a, $d diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 986ac8f1..5cb6eaea 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -52,7 +52,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) ld a, $5 ld [hSpriteIndexOrTextID], a call DisplayTextID - ld bc, (OAKS_PARCEL << 8) + 1 + lb bc, OAKS_PARCEL, 1 call GiveItem SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 -- cgit v1.3.1-sl0p From 525f1b96f390a7b7625574405cad56277f200ef3 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 7 Aug 2015 04:24:06 -0700 Subject: named CountSetBits output variable --- engine/hidden_object_functions7.asm | 4 ++-- engine/menu/main_menu.asm | 4 ++-- engine/menu/pokedex.asm | 4 ++-- engine/overworld/oaks_aide.asm | 34 +++++++++++++++++----------------- engine/pokedex_rating.asm | 30 +++++++++++++++--------------- home.asm | 4 ++-- hram.asm | 13 +++++++++++++ scripts/celadonmansion3.asm | 2 +- scripts/oakslab.asm | 4 ++-- scripts/route11gateupstairs.asm | 8 ++++---- scripts/route15gateupstairs.asm | 8 ++++---- scripts/route2gate.asm | 8 ++++---- text.asm | 12 ++++++------ text/maps/oaks_lab.asm | 4 ++-- wram.asm | 2 ++ 15 files changed, 78 insertions(+), 63 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index e3c296ca..0753531e 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -19,8 +19,8 @@ DisplayOakLabRightPoster: ; 1e965 (7:6965) ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld a, [wd11e] - cp $2 + ld a, [wNumSetBits] + cp 2 tx_pre_id SaveOptionText jr c, .ownThreeOrMoreMon tx_pre_id StrengthsAndWeaknessesText diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index f99e5b80..b8896d79 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -395,7 +395,7 @@ PrintNumBadges: ; 5e2f (1:5e2f) ld b, $1 call CountSetBits pop hl - ld de, wd11e + ld de, wNumSetBits lb bc, 1, 2 jp PrintNumber @@ -405,7 +405,7 @@ PrintNumOwnedMons: ; 5e42 (1:5e42) ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits pop hl - ld de, wd11e + ld de, wNumSetBits lb bc, 1, 3 jp PrintNumber diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index ead2c359..b5ebd83e 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -169,14 +169,14 @@ HandlePokedexListMenu: ; 40111 (10:4111) ld hl,wPokedexSeen ld b,wPokedexSeenEnd - wPokedexSeen call CountSetBits - ld de,wd11e + ld de, wNumSetBits coord hl, 16, 3 lb bc, 1, 3 call PrintNumber ; print number of seen pokemon ld hl,wPokedexOwned ld b,wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld de,wd11e + ld de, wNumSetBits coord hl, 16, 6 lb bc, 1, 3 call PrintNumber ; print number of owned pokemon diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm index 00f6ea82..31832315 100755 --- a/engine/overworld/oaks_aide.asm +++ b/engine/overworld/oaks_aide.asm @@ -4,45 +4,45 @@ OaksAideScript: ; 0x59035 call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_59086 + jr nz, .choseNo ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld a, [wd11e] - ld [$ffdd], a + ld a, [wNumSetBits] + ld [hOaksAideNumMonsOwned], a ld b, a - ld a, [$ffdb] + ld a, [hOaksAideRequirement] cp b - jr z, .asm_59059 - jr nc, .asm_5907c -.asm_59059 + jr z, .giveItem + jr nc, .notEnoughOwnedMons +.giveItem ld hl, OaksAideHereYouGoText call PrintText - ld a, [$ffdc] + ld a, [hOaksAideItemReward] ld b, a ld c, 1 call GiveItem - jr nc, .BagFull + jr nc, .bagFull ld hl, OaksAideGotItemText call PrintText ld a, $1 - jr .asm_5908e -.BagFull + jr .done +.bagFull ld hl, OaksAideNoRoomText call PrintText xor a - jr .asm_5908e -.asm_5907c + jr .done +.notEnoughOwnedMons ld hl, OaksAideUhOhText call PrintText ld a, $80 - jr .asm_5908e -.asm_59086 + jr .done +.choseNo ld hl, OaksAideComeBackText call PrintText ld a, $ff -.asm_5908e - ld [$ffdb], a +.done + ld [hOaksAideResult], a ret OaksAideHiText: ; 59091 (16:5091) diff --git a/engine/pokedex_rating.asm b/engine/pokedex_rating.asm index ca88673f..265eff40 100755 --- a/engine/pokedex_rating.asm +++ b/engine/pokedex_rating.asm @@ -2,18 +2,18 @@ DisplayDexRating: ; 44169 (11:4169) ld hl, wPokedexSeen ld b, wPokedexSeenEnd - wPokedexSeen call CountSetBits - ld a, [wd11e] ; result of CountSetBits (seen count) - ld [$FFDB], a + ld a, [wNumSetBits] + ld [hDexRatingNumMonsSeen], a ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld a, [wd11e] ; result of CountSetBits (own count) - ld [$FFDC], a + ld a, [wNumSetBits] + ld [hDexRatingNumMonsOwned], a ld hl, DexRatingsTable .findRating ld a, [hli] ld b, a - ld a, [$FFDC] ; number of pokemon owned + ld a, [hDexRatingNumMonsOwned] cp b jr c, .foundRating inc hl @@ -24,30 +24,30 @@ DisplayDexRating: ; 44169 (11:4169) ld h, [hl] ld l, a ; load text pointer into hl CheckAndResetEventA EVENT_HALL_OF_FAME_DEX_RATING - jr nz, .label3 + jr nz, .hallOfFame push hl ld hl, PokedexRatingText_441cc call PrintText pop hl call PrintText callba PlayPokedexRatingSfx - jp WaitForTextScrollButtonPress ; wait for button press -.label3 + jp WaitForTextScrollButtonPress +.hallOfFame ld de, wcc5b - ld a, [$FFDB] + ld a, [hDexRatingNumMonsSeen] ld [de], a inc de - ld a, [$FFDC] + ld a, [hDexRatingNumMonsOwned] ld [de], a inc de -.label4 +.copyRatingTextLoop ld a, [hli] - cp a, $50 - jr z, .label5 + cp a, "@" + jr z, .doneCopying ld [de], a inc de - jr .label4 -.label5 + jr .copyRatingTextLoop +.doneCopying ld [de], a ret diff --git a/home.asm b/home.asm index 2753307b..b33fbd4a 100644 --- a/home.asm +++ b/home.asm @@ -1292,7 +1292,7 @@ INCLUDE "engine/menu/start_menu.asm" ; hl = address of string of bytes ; b = length of string of bytes ; OUTPUT: -; [wd11e] = number of set bits +; [wNumSetBits] = number of set bits CountSetBits:: ; 2b7f (0:2b7f) ld c,0 .loop @@ -1309,7 +1309,7 @@ CountSetBits:: ; 2b7f (0:2b7f) dec b jr nz,.loop ld a,c - ld [wd11e],a ; store number of set bits + ld [wNumSetBits],a ret ; subtracts the amount the player paid from their money diff --git a/hram.asm b/hram.asm index 12806771..2f70b91a 100644 --- a/hram.asm +++ b/hram.asm @@ -273,6 +273,19 @@ hGymGateIndex EQU $FFDB hGymTrashCanRandNumMask EQU $FFDB +hDexRatingNumMonsSeen EQU $FFDB +hDexRatingNumMonsOwned EQU $FFDC + +; $00 = bag full +; $01 = got item +; $80 = didn't meet required number of owned mons +; $FF = player cancelled +hOaksAideResult EQU $FFDB + +hOaksAideRequirement EQU $FFDB ; required number of owned mons +hOaksAideItemReward EQU $FFDC +hOaksAideNumMonsOwned EQU $FFDD + hItemToRemoveID EQU $FFDB hItemToRemoveIndex EQU $FFDC diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm index 0dadd20a..11a8646d 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/celadonmansion3.asm @@ -30,7 +30,7 @@ DirectorText: ; 487b2 (12:47b2) ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld a, [wd11e] + ld a, [wNumSetBits] cp 150 jr nc, .CompletedDex ld hl, .GameDesigner diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 996ab754..c52f00cf 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -969,8 +969,8 @@ OaksLabText5: ; 1d248 (7:5248) ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld a, [wd11e] - cp $2 + ld a, [wNumSetBits] + cp 2 jr c, .asm_1d279 CheckEvent EVENT_GOT_POKEDEX jr z, .asm_1d279 diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index 9bae1398..a1906c5d 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -20,9 +20,9 @@ Route11GateUpstairsText2: ; 4946c (12:546c) CheckEvent EVENT_GOT_ITEMFINDER, 1 jr c, .asm_4949b ld a, 30 ; pokemon needed - ld [$ffdb], a + ld [hOaksAideRequirement], a ld a, ITEMFINDER ; oak's aide reward - ld [$ffdc], a + ld [hOaksAideItemReward], a ld [wd11e], a call GetItemName ld h, d @@ -30,8 +30,8 @@ Route11GateUpstairsText2: ; 4946c (12:546c) ld de, wcc5b ld bc, $000d call CopyData - predef OaksAideScript ; call oak's aide script - ld a, [$ffdb] + predef OaksAideScript + ld a, [hOaksAideResult] dec a jr nz, .asm_494a1 SetEvent EVENT_GOT_ITEMFINDER diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index cedabdc0..0fc806da 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -10,17 +10,17 @@ Route15GateUpstairsText1: ; 49651 (12:5651) CheckEvent EVENT_GOT_EXP_ALL jr nz, .asm_49683 ld a, 50 ; pokemon needed - ld [$ffdb], a + ld [hOaksAideRequirement], a ld a, EXP__ALL ; oak's aide reward - ld [$ffdc], a + ld [hOaksAideItemReward], a ld [wd11e], a call GetItemName ld hl, wcd6d ld de, wcc5b ld bc, $000d call CopyData - predef OaksAideScript ; call oak's aide script - ld a, [$ffdb] + predef OaksAideScript + ld a, [hOaksAideResult] cp $1 jr nz, .asm_49689 SetEvent EVENT_GOT_EXP_ALL diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm index 789482dc..65d53bc7 100755 --- a/scripts/route2gate.asm +++ b/scripts/route2gate.asm @@ -10,17 +10,17 @@ Route2GateText1: ; 5d5db (17:55db) CheckEvent EVENT_GOT_HM05 jr nz, .asm_5d60d ld a, 10 ; pokemon needed - ld [$ffdb], a + ld [hOaksAideRequirement], a ld a, HM_05 ; oak's aide reward - ld [$ffdc], a + ld [hOaksAideItemReward], a ld [wd11e], a call GetItemName ld hl, wcd6d ld de, wcc5b ld bc, $000d call CopyData - predef OaksAideScript ; call oak's aide script - ld a, [$ffdb] + predef OaksAideScript + ld a, [hOaksAideResult] cp $1 jr nz, .asm_5d613 SetEvent EVENT_GOT_HM05 diff --git a/text.asm b/text.asm index db3e57c5..8b0482f3 100644 --- a/text.asm +++ b/text.asm @@ -94,7 +94,7 @@ _OaksAideHiText:: ; 80143 (20:4143) cont "AIDE!" para "If you caught @" - TX_NUM $ffdb, 1, 3 + TX_NUM hOaksAideRequirement, 1, 3 db $0 line "kinds of #MON," cont "I'm supposed to" @@ -106,7 +106,7 @@ _OaksAideHiText:: ; 80143 (20:4143) para "So, ", $52, "! Have" line "you caught at" cont "least @" - TX_NUM $ffdb, 1, 3 + TX_NUM hOaksAideRequirement, 1, 3 text " kinds of" cont "#MON?" done @@ -115,12 +115,12 @@ _OaksAideUhOhText:: ; 801e4 (20:41e4) text "Let's see..." line "Uh-oh! You have" cont "caught only @" - TX_NUM $ffdd, 1, 3 + TX_NUM hOaksAideNumMonsOwned, 1, 3 db $0 cont "kinds of #MON!" para "You need @" - TX_NUM $ffdb, 1, 3 + TX_NUM hOaksAideRequirement, 1, 3 text " kinds" line "if you want the" cont "@" @@ -132,7 +132,7 @@ _OaksAideComeBackText:: ; 80250 (20:4250) text "Oh. I see." para "When you get @" - TX_NUM $ffdb, 1, 3 + TX_NUM hOaksAideRequirement, 1, 3 db $0 line "kinds, come back" cont "for @" @@ -143,7 +143,7 @@ _OaksAideComeBackText:: ; 80250 (20:4250) _OaksAideHereYouGoText:: ; 8028c (20:428c) text "Great! You have" line "caught @" - TX_NUM $ffdd, 1, 3 + TX_NUM hOaksAideNumMonsOwned, 1, 3 text " kinds " cont "of #MON!" cont "Congratulations!" diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 58f55b85..6a3c6da6 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -547,10 +547,10 @@ _OaksLabText_441cc:: ; 9580c (25:580c) line "letion is:" para "@" - TX_NUM $ffdb, 1, 3 + TX_NUM hDexRatingNumMonsSeen, 1, 3 text " #MON seen" line "@" - TX_NUM $ffdc, 1, 3 + TX_NUM hDexRatingNumMonsOwned, 1, 3 text " #MON owned" para "PROF.OAK's" diff --git a/wram.asm b/wram.asm index c470d6a4..690ffef9 100755 --- a/wram.asm +++ b/wram.asm @@ -1882,6 +1882,8 @@ wFirstMonsNotOutYet:: ; d11d ; which will be the first mon sent out. ds 1 +wNumSetBits:: ; d11e + wd11e:: ds 1 ; used as a Pokemon and Item storage value. Also used as an output value for CountSetBits wForcePlayerToChooseMon:: ; d11f -- cgit v1.3.1-sl0p From 2b018159997e3b580efd114ff4e3548a0de3cbc5 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 8 Aug 2015 22:32:44 -0700 Subject: commented audio code --- audio.asm | 32 +- audio/engine_1.asm | 1277 ++++++++++++++++++---------------- audio/engine_2.asm | 540 +++++++------- audio/engine_3.asm | 532 +++++++------- constants/hardware_constants.asm | 1 - constants/music_constants.asm | 39 ++ engine/battle/animations.asm | 18 +- engine/battle/common_text.asm | 4 +- engine/battle/core.asm | 16 +- engine/battle/end_of_battle.asm | 2 +- engine/cable_club.asm | 16 +- engine/evolution.asm | 6 +- engine/hall_of_fame.asm | 8 +- engine/hidden_object_functions7.asm | 6 +- engine/intro.asm | 6 +- engine/items/items.asm | 8 +- engine/menu/pokedex.asm | 4 +- engine/menu/status_screen.asm | 4 +- engine/oak_speech.asm | 10 +- engine/overworld/elevator.asm | 2 +- engine/overworld/healing_machine.asm | 40 +- engine/overworld/npc_movement.asm | 12 +- engine/overworld/pokecenter.asm | 12 +- engine/slot_machine.asm | 4 +- engine/titlescreen.asm | 6 +- home.asm | 52 +- home/audio.asm | 233 ++++--- home/init.asm | 14 +- home/overworld.asm | 22 +- home/vblank.asm | 12 +- hram.asm | 4 +- scripts/ceruleancity.asm | 4 +- scripts/oakslab.asm | 4 +- scripts/pewterpokecenter.asm | 4 +- scripts/pokemontower2.asm | 4 +- scripts/redshouse1f.asm | 8 +- scripts/route22.asm | 10 +- scripts/silphco7.asm | 4 +- scripts/ssanne2.asm | 4 +- scripts/ssanne7.asm | 12 +- scripts/vermiliondock.asm | 2 +- wram.asm | 239 +++++-- 42 files changed, 1731 insertions(+), 1506 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/audio.asm b/audio.asm index 286dc7ed..037145d8 100644 --- a/audio.asm +++ b/audio.asm @@ -364,10 +364,10 @@ SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] PlayBattleMusic:: ; 0x90c6 xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a dec a - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ; stop music call DelayFrame ld c, BANK(Music_GymLeaderBattle) @@ -406,7 +406,7 @@ Music_RivalAlternateStart:: ; 0x9b47 ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld hl, wc006 + ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b1a2 call Audio1_OverwriteChannelPointer ld de, Music_MeetRival_branch_b21d @@ -425,30 +425,30 @@ Music_RivalAlternateTempo:: ; 0x9b65 ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld hl, wc006 + ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b119 jp Audio1_OverwriteChannelPointer ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo:: ; 0x9b75 call Music_RivalAlternateStart - ld hl, wc006 + ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b19b jp Audio1_OverwriteChannelPointer ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo:: ; 0x9b81 - ld a, $a - ld [wcfc8], a - ld [wcfc9], a - ld a, $ff - ld [wMusicHeaderPointer], a + ld a, 10 + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a + ld a, $ff ; stop playing music after the fade-out is finished + ld [wAudioFadeOutControl], a ld c, 100 - call DelayFrames + call DelayFrames ; wait for the fade-out to finish ld c, BANK(Music_Cities1) ld a, MUSIC_CITIES1 call PlayMusic - ld hl, wc006 + ld hl, wChannelCommandPointers ld de, Music_Cities1_branch_aa6f jp Audio1_OverwriteChannelPointer @@ -477,7 +477,7 @@ Music_DoLowHealthAlarm:: ; 2136e (8:536e) .asm_2138a ld a, $86 - ld [wc02a], a ;disable sound channel? + ld [wChannelSoundIDs + CH4], a ;disable sound channel? ld a, [wLowHealthAlarm] and $7f ;decrement alarm timer. dec a @@ -491,7 +491,7 @@ Music_DoLowHealthAlarm:: ; 2136e (8:536e) .disableAlarm xor a ld [wLowHealthAlarm], a ;disable alarm - ld [wc02a], a ;re-enable sound channel? + ld [wChannelSoundIDs + CH4], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone @@ -542,7 +542,7 @@ Music_PokeFluteInBattle:: ; 22306 (8:6306) ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers - ld hl, wc00e + ld hl, wChannelCommandPointers + CH4 * 2 ld de, SFX_08_PokeFlute_Ch1 call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch2 @@ -572,7 +572,7 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) .gotSfxPointer push bc ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySoundWaitForCurrent pop bc ld b, $0 diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 9a302ef3..c729fa7e 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -3,29 +3,29 @@ Audio1_UpdateMusic:: ; 0x9103 ld c, CH0 .loop - ld b, $0 - ld hl, wc026 + ld b, 0 + ld hl, wChannelSoundIDs add hl, bc ld a, [hl] and a jr z, .nextChannel ld a, c cp CH4 - jr nc, .asm_912e ; if sfx channel - ld a, [wc002] + jr nc, .applyAffects ; if sfx channel + ld a, [wMuteAudioAndPauseMusic] and a - jr z, .asm_912e + jr z, .applyAffects bit 7, a jr nz, .nextChannel set 7, a - ld [wc002], a - xor a - ld [$ff25], a - ld [$ff1a], a + ld [wMuteAudioAndPauseMusic], a + xor a ; disable all channels' output + ld [rNR51], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a jr .nextChannel -.asm_912e +.applyAffects call Audio1_ApplyMusicAffects .nextChannel ld a, c @@ -36,15 +36,9 @@ Audio1_UpdateMusic:: ; 0x9103 ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wc02e: -; 0: toggleperfectpitch has been used -; 1: call has been used -; 3: a toggle used only by this routine for vibrato -; 4: pitchbend flag -; 6: dutycycle flag Audio1_ApplyMusicAffects: ; 0x9138 ld b, $0 - ld hl, wc0b6 ; delay until next note + ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note @@ -54,45 +48,45 @@ Audio1_ApplyMusicAffects: ; 0x9138 ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 6, [hl] ; dutycycle + bit BIT_ROTATE_DUTY, [hl] jr z, .checkForExecuteMusic call Audio1_ApplyDutyCycle .checkForExecuteMusic - ld b, $0 - ld hl, wc036 + ld b, 0 + ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr nz, .disablePitchBendVibrato + bit BIT_NOISE_OR_SFX, [hl] + jr nz, .skipPitchBendVibrato .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] ; pitchbend + bit BIT_PITCH_BEND_ON, [hl] jr z, .checkVibratoDelay jp Audio1_ApplyPitchBend .checkVibratoDelay - ld hl, wc04e ; vibrato delay + ld hl, wChannelVibratoDelayCounters add hl, bc ld a, [hl] and a ; check if delay is over jr z, .checkForVibrato dec [hl] ; otherwise, dec delay -.disablePitchBendVibrato +.skipPitchBendVibrato ret .checkForVibrato - ld hl, wc056 ; vibrato rate + ld hl, wChannelVibratoExtents add hl, bc ld a, [hl] and a @@ -100,38 +94,40 @@ Audio1_ApplyMusicAffects: ; 0x9138 ret ; no vibrato .vibrato ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc ld a, [hl] and $f and a - jr z, .vibratoAlreadyDone - dec [hl] ; apply vibrato pitch change + jr z, .applyVibrato + dec [hl] ; decrement counter ret -.vibratoAlreadyDone +.applyVibrato ld a, [hl] swap [hl] or [hl] - ld [hl], a ; reset the vibrato value and start again - ld hl, wc066 + ld [hl], a ; reload the counter + ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 3, [hl] ; this is the only code that sets/resets bit three so - jr z, .unset ; it continuously alternates which path it takes - res 3, [hl] +; This is the only code that sets/resets the vibrato direction bit, so it +; continuously alternates which path it takes. + bit BIT_VIBRATO_DIRECTION, [hl] + jr z, .unset + res BIT_VIBRATO_DIRECTION, [hl] ld a, d and $f ld d, a ld a, e sub d jr nc, .noCarry - ld a, $0 + ld a, 0 .noCarry jr .done .unset - set 3, [hl] + set BIT_VIBRATO_DIRECTION, [hl] ld a, d and $f0 swap a @@ -140,8 +136,8 @@ Audio1_ApplyMusicAffects: ; 0x9138 ld a, $ff .done ld d, a - ld b, $3 - call Audio1_9838 + ld b, REG_FREQUENCY_LO + call Audio1_GetRegisterPointer ld [hl], d ret @@ -149,16 +145,18 @@ Audio1_ApplyMusicAffects: ; 0x9138 ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached Audio1_PlayNextNote: ; 0x91d0 - ld hl, wc06e +; reload the vibrato delay counter + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a - ld hl, wc02e + + ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_BEND_ON, [hl] + res BIT_PITCH_BEND_DECREASING, [hl] call Audio1_endchannel ret @@ -167,34 +165,35 @@ Audio1_endchannel: ; 0x91e6 ld d, a cp $ff ; is this command an endchannel? jp nz, Audio1_callchannel ; no - ld b, $0 ; yes - ld hl, wc02e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc - bit 1, [hl] + bit BIT_CHANNEL_CALL, [hl] jr nz, .returnFromCall ld a, c cp CH3 jr nc, .noiseOrSfxChannel - jr .asm_923f + jr .disableChannelOutput .noiseOrSfxChannel - res 2, [hl] - ld hl, wc036 + res BIT_NOISE_OR_SFX, [hl] + ld hl, wChannelFlags2 add hl, bc - res 0, [hl] + res BIT_EXECUTE_MUSIC, [hl] cp CH6 - jr nz, .notSfxChannel3 + jr nz, .skipSfxChannel3 +; restart hardware channel 3 (wave channel) output ld a, $0 - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a -.notSfxChannel3 + ld [rNR30], a +.skipSfxChannel3 jr nz, .asm_9222 - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr z, .asm_9222 xor a - ld [wc003], a - jr .asm_923f + ld [wDisableChannelOutputWhenSfxEnds], a + jr .disableChannelOutput .asm_9222 jr .asm_9248 .returnFromCall @@ -203,10 +202,10 @@ Audio1_endchannel: ; 0x91e6 ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl ; store current channel address - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -217,36 +216,36 @@ Audio1_endchannel: ; 0x91e6 ld a, [de] ld [hl], a ; loads channel address to return to jp Audio1_endchannel -.asm_923f - ld hl, Unknown_9b1f +.disableChannelOutput + ld hl, Audio1_HWChannelDisableMasks add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a .asm_9248 - ld a, [wc02a] - cp $14 + ld a, [wChannelSoundIDs + CH4] + cp CRY_SFX_START jr nc, .asm_9251 - jr .asm_926e + jr .skipCry .asm_9251 - ld a, [wc02a] - cp $86 - jr z, .asm_926e - jr c, .asm_925c - jr .asm_926e -.asm_925c + ld a, [wChannelSoundIDs + CH4] + cp CRY_SFX_END + jr z, .skipCry + jr c, .cry + jr .skipCry +.cry ld a, c cp CH4 jr z, .asm_9265 - call Audio1_96c7 + call Audio1_GoBackOneCommandIfCry ret c .asm_9265 - ld a, [wc005] - ld [$ff24], a + ld a, [wSavedVolume] + ld [rNR50], a xor a - ld [wc005], a -.asm_926e - ld hl, wc026 + ld [wSavedVolume], a +.skipCry + ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret @@ -254,7 +253,7 @@ Audio1_endchannel: ; 0x91e6 Audio1_callchannel: ; 0x9274 cp $fd ; is this command a callchannel? jp nz, Audio1_loopchannel ; no - call Audio1_GetNextMusicByte ; yes + call Audio1_GetNextMusicByte push af call Audio1_GetNextMusicByte ld d, a @@ -265,10 +264,10 @@ Audio1_callchannel: ; 0x9274 ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -283,20 +282,20 @@ Audio1_callchannel: ; 0x9274 inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - set 1, [hl] ; set the call flag + set BIT_CHANNEL_CALL, [hl] ; set the call flag jp Audio1_endchannel Audio1_loopchannel: ; 0x92a9 cp $fe ; is this command a loopchannel? jp nz, Audio1_notetype ; no - call Audio1_GetNextMusicByte ; yes + call Audio1_GetNextMusicByte ld e, a and a jr z, .infiniteLoop - ld b, $0 - ld hl, wc0be + ld b, 0 + ld hl, wChannelLoopCounters add hl, bc ld a, [hl] cp e @@ -319,7 +318,7 @@ Audio1_loopchannel: ; 0x92a9 ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de pop af ld [hli], a @@ -330,10 +329,10 @@ Audio1_notetype: ; 0x92e4 and $f0 cp $d0 ; is this command a notetype? jp nz, Audio1_toggleperfectpitch ; no - ld a, d ; yes + ld a, d and $f ld b, $0 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -345,15 +344,15 @@ Audio1_notetype: ; 0x92e4 cp CH2 jr z, .musicChannel3 cp CH6 - jr nz, .notChannel3 - ld hl, wc0e7 - jr .sfxChannel3 + jr nz, .skipChannel3 + ld hl, wSfxWaveInstrument + jr .channel3 .musicChannel3 - ld hl, wc0e6 -.sfxChannel3 + ld hl, wMusicWaveInstrument +.channel3 ld a, d and $f - ld [hl], a ; store low nibble of param as duty + ld [hl], a ; store low nibble of param as wave instrument ld a, d and $30 sla a @@ -362,9 +361,9 @@ Audio1_notetype: ; 0x92e4 ; if channel 3, store high nibble as volume ; else, store volume (high nibble) and fade (low nibble) -.notChannel3 - ld b, $0 - ld hl, wc0de +.skipChannel3 + ld b, 0 + ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel @@ -374,56 +373,70 @@ Audio1_toggleperfectpitch: ; 0x9323 ld a, d cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio1_vibrato ; no - ld b, $0 ; yes - ld hl, wc02e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of wc02e + ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio1_endchannel Audio1_vibrato: ; 0x9335 cp $ea ; is this command a vibrato? jr nz, Audio1_pitchbend ; no - call Audio1_GetNextMusicByte ; yes - ld b, $0 - ld hl, wc04e + call Audio1_GetNextMusicByte + ld b, 0 + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld [hl], a ; store delay call Audio1_GetNextMusicByte ld d, a + +; The high nybble of the command byte is the extent of the vibrato. +; Let n be the extent. +; The upper nybble of the channel's byte in the wChannelVibratoExtents +; array will store the extent above the note: (n / 2) + (n % 2). +; The lower nybble will store the extent below the note: (n / 2). +; These two values add to the total extent, n. and $f0 swap a - ld b, $0 - ld hl, wc056 + ld b, 0 + ld hl, wChannelVibratoExtents add hl, bc srl a ld e, a adc b swap a or e - ld [hl], a ; store rate as both high and low nibbles + ld [hl], a + +; The low nybble of the command byte is the rate of the vibrato. +; The high and low nybbles of the channel's byte in the wChannelVibratoRates +; array are both initialised to this value because the high nybble is the +; counter reload value and the low nybble is the counter itself, which should +; start at its value upon reload. ld a, d and $f ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc swap a or d - ld [hl], a ; store depth as both high and low nibbles + ld [hl], a + jp Audio1_endchannel Audio1_pitchbend: ; 0x936d cp $eb ; is this command a pitchbend? jr nz, Audio1_duty ; no - call Audio1_GetNextMusicByte ; yes - ld b, $0 - ld hl, wc076 + call Audio1_GetNextMusicByte + ld b, 0 + ld hl, wChannelPitchBendLengthModifiers add hl, bc - ld [hl], a ; store first param + ld [hl], a call Audio1_GetNextMusicByte ld d, a and $f0 @@ -431,18 +444,18 @@ Audio1_pitchbend: ; 0x936d ld b, a ld a, d and $f - call Audio1_9858 - ld b, $0 - ld hl, wc0a6 + call Audio1_CalculateFrequency + ld b, 0 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc - ld [hl], d ; store unknown part of second param - ld hl, wc0ae + ld [hl], d + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc - ld [hl], e ; store unknown part of second param - ld b, $0 - ld hl, wc02e + ld [hl], e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc - set 4, [hl] ; set pitchbend flag + set BIT_PITCH_BEND_ON, [hl] call Audio1_GetNextMusicByte ld d, a jp Audio1_notelength @@ -450,12 +463,12 @@ Audio1_pitchbend: ; 0x936d Audio1_duty: ; 0x93a5 cp $ec ; is this command a duty? jr nz, Audio1_tempo ; no - call Audio1_GetNextMusicByte ; yes + call Audio1_GetNextMusicByte rrca rrca and $c0 - ld b, $0 - ld hl, wc03e + ld b, 0 + ld hl, wChannelDuties add hl, bc ld [hl], a ; store duty jp Audio1_endchannel @@ -463,96 +476,96 @@ Audio1_duty: ; 0x93a5 Audio1_tempo: ; 0x93ba cp $ed ; is this command a tempo? jr nz, Audio1_stereopanning ; no - ld a, c ; yes + ld a, c cp CH4 jr nc, .sfxChannel call Audio1_GetNextMusicByte - ld [wc0e8], a ; store first param + ld [wMusicTempo], a ; store first param call Audio1_GetNextMusicByte - ld [wc0e9], a ; store second param + ld [wMusicTempo + 1], a ; store second param xor a - ld [wc0ce], a ; clear RAM - ld [wc0cf], a - ld [wc0d0], a - ld [wc0d1], a + ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 1], a + ld [wChannelNoteDelayCountersFractionalPart + 2], a + ld [wChannelNoteDelayCountersFractionalPart + 3], a jr .musicChannelDone .sfxChannel call Audio1_GetNextMusicByte - ld [wc0ea], a ; store first param + ld [wSfxTempo], a ; store first param call Audio1_GetNextMusicByte - ld [wc0eb], a ; store second param + ld [wSfxTempo + 1], a ; store second param xor a - ld [wc0d2], a ; clear RAM - ld [wc0d3], a - ld [wc0d4], a - ld [wc0d5], a + ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 5], a + ld [wChannelNoteDelayCountersFractionalPart + 6], a + ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone jp Audio1_endchannel Audio1_stereopanning: ; 0x93fa cp $ee ; is this command a stereopanning? jr nz, Audio1_unknownmusic0xef ; no - call Audio1_GetNextMusicByte ; yes - ld [wc004], a ; store panning + call Audio1_GetNextMusicByte + ld [wStereoPanning], a ; store panning jp Audio1_endchannel ; this appears to never be used Audio1_unknownmusic0xef: ; 0x9407 cp $ef ; is this command an unknownmusic0xef? jr nz, Audio1_dutycycle ; no - call Audio1_GetNextMusicByte ; yes + call Audio1_GetNextMusicByte push bc - call Audio1_9876 + call Audio1_PlaySound pop bc - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wc02d] - ld [wc003], a + ld a, [wChannelSoundIDs + CH7] + ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wc02d], a + ld [wChannelSoundIDs + CH7], a .skip jp Audio1_endchannel Audio1_dutycycle: ; 0x9426 cp $fc ; is this command a dutycycle? jr nz, Audio1_volume ; no - call Audio1_GetNextMusicByte ; yes - ld b, $0 - ld hl, wc046 + call Audio1_GetNextMusicByte + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store first duty - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - set 6, [hl] ; set dutycycle flag + set BIT_ROTATE_DUTY, [hl] jp Audio1_endchannel Audio1_volume: ; 0x9444 cp $f0 ; is this command a volume? jr nz, Audio1_executemusic ; no - call Audio1_GetNextMusicByte ; yes - ld [$ff24], a ; store volume + call Audio1_GetNextMusicByte + ld [rNR50], a ; store volume jp Audio1_endchannel Audio1_executemusic: ; 0x9450 cp $f8 ; is this command an executemusic? jr nz, Audio1_octave ; no - ld b, $0 ; yes - ld hl, wc036 + ld b, $0 + ld hl, wChannelFlags2 add hl, bc - set 0, [hl] + set BIT_EXECUTE_MUSIC, [hl] jp Audio1_endchannel Audio1_octave: ; 0x945f and $f0 cp $e0 ; is this command an octave? jr nz, Audio1_unknownsfx0x20 ; no - ld hl, wc0d6 ; yes - ld b, $0 + ld hl, wChannelOctaves + ld b, 0 add hl, bc ld a, d and $f @@ -561,47 +574,54 @@ Audio1_octave: ; 0x945f Audio1_unknownsfx0x20: ; 0x9472 cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio1_unknownsfx0x10 ; no + jr nz, Audio1_unknownsfx0x10 ld a, c cp CH3 ; is this a noise or sfx channel? jr c, Audio1_unknownsfx0x10 ; no - ld b, $0 - ld hl, wc036 + ld b, 0 + ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio1_unknownsfx0x10 ; no - call Audio1_notelength ; yes + bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used? + jr nz, Audio1_unknownsfx0x10 ; yes + call Audio1_notelength + +; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength +; does below. ld d, a - ld b, $0 - ld hl, wc03e + ld b, 0 + ld hl, wChannelDuties add hl, bc ld a, [hl] or d ld d, a - ld b, $1 - call Audio1_9838 + ld b, REG_DUTY_SOUND_LEN + call Audio1_GetRegisterPointer ld [hl], d + call Audio1_GetNextMusicByte ld d, a - ld b, $2 - call Audio1_9838 + ld b, REG_VOLUME_ENVELOPE + call Audio1_GetRegisterPointer ld [hl], d call Audio1_GetNextMusicByte ld e, a ld a, c cp CH7 - ld a, $0 - jr z, .sfxNoiseChannel ; only two params for noise channel + ld a, 0 + jr z, .skip +; Channels 1 through 3 have 2 registers that control frequency, but the noise +; channel a single register (the polynomial counter) that controls frequency, +; so this command has one less byte on the noise channel. push de call Audio1_GetNextMusicByte pop de -.sfxNoiseChannel +.skip ld d, a push de - call Audio1_9629 - call Audio1_95f8 + call Audio1_ApplyDutyAndSoundLength + call Audio1_EnableChannelOutput pop de - call Audio1_964b + call Audio1_ApplyWavePatternAndFrequency ret Audio1_unknownsfx0x10: @@ -612,12 +632,12 @@ Audio1_unknownsfx0x10: cp $10 ; is this command a unknownsfx0x10? jr nz, Audio1_note ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio1_note ; no - call Audio1_GetNextMusicByte ; yes - ld [$ff10], a + call Audio1_GetNextMusicByte + ld [rNR10], a jp Audio1_endchannel Audio1_note: @@ -627,7 +647,7 @@ Audio1_note: ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Audio1_dnote ; yes + jr z, Audio1_dnote jr nc, Audio1_notelength ; no swap a ld b, a @@ -647,11 +667,11 @@ Audio1_dnote: call Audio1_GetNextMusicByte ; get dnote instrument asm_94fd ld d, a - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .asm_9508 ld a, d - call Audio1_9876 + call Audio1_PlaySound .asm_9508 pop bc pop de @@ -661,20 +681,20 @@ Audio1_notelength: ; 0x950a push af and $f inc a - ld b, $0 + ld b, 0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b - call Audio1_9847 + call Audio1_MultiplyAdd ld a, c cp CH4 jr nc, .sfxChannel - ld a, [wc0e8] + ld a, [wMusicTempo] ld d, a - ld a, [wc0e9] + ld a, [wMusicTempo + 1] ld e, a jr .skip .sfxChannel @@ -682,34 +702,34 @@ Audio1_notelength: ; 0x950a ld e, $0 cp CH7 jr z, .skip ; if noise channel - call Audio1_9693 - ld a, [wc0ea] + call Audio1_SetSfxTempo + ld a, [wSfxTempo] ld d, a - ld a, [wc0eb] + ld a, [wSfxTempo + 1] ld e, a .skip - ld a, l - ld b, $0 - ld hl, wc0ce + ld a, l ; a = note_length * note_speed + ld b, 0 + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] - call Audio1_9847 + call Audio1_MultiplyAdd ld e, l - ld d, h - ld hl, wc0ce + ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e ld a, d - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio1_notepitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] + bit BIT_NOISE_OR_SFX, [hl] jr z, Audio1_notepitch pop hl ret @@ -721,177 +741,183 @@ Audio1_notepitch: ; 0x9568 jr nz, .notRest ld a, c cp CH4 - jr nc, .sfxChannel - ld hl, wc02a + jr nc, .next +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr nz, .done ; fall through -.sfxChannel +.next ld a, c cp CH2 - jr z, .musicChannel3 + jr z, .channel3 cp CH6 - jr nz, .notSfxChannel3 -.musicChannel3 - ld b, $0 - ld hl, Unknown_9b1f + jr nz, .notChannel3 +.channel3 + ld b, 0 + ld hl, Audio1_HWChannelDisableMasks add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a ; disable hardware channel 3's output jr .done -.notSfxChannel3 - ld b, $2 - call Audio1_9838 - ld a, $8 +.notChannel3 + ld b, REG_VOLUME_ENVELOPE + call Audio1_GetRegisterPointer + ld a, $8 ; fade in sound ld [hli], a inc hl - ld a, $80 + ld a, $80 ; restart sound ld [hl], a .done ret .notRest swap a - ld b, $0 - ld hl, wc0d6 + ld b, 0 + ld hl, wChannelOctaves add hl, bc ld b, [hl] - call Audio1_9858 - ld b, $0 - ld hl, wc02e - add hl, bc - bit 4, [hl] - jr z, .asm_95b8 - call Audio1_978f -.asm_95b8 + call Audio1_CalculateFrequency + ld b, 0 + ld hl, wChannelFlags1 + add hl, bc + bit BIT_PITCH_BEND_ON, [hl] + jr z, .skipPitchBend + call Audio1_InitPitchBendVars +.skipPitchBend push de ld a, c cp CH4 - jr nc, .skip ; if sfx channel - ld hl, wc02a - ld d, $0 + jr nc, .sfxChannel ; if sfx channel +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + CH4 + ld d, 0 ld e, a add hl, de ld a, [hl] and a - jr nz, .asm_95cb - jr .skip -.asm_95cb + jr nz, .noSfx + jr .sfxChannel +.noSfx pop de ret -.skip - ld b, $0 - ld hl, wc0de +.sfxChannel + ld b, 0 + ld hl, wChannelVolumes add hl, bc ld d, [hl] - ld b, $2 - call Audio1_9838 + ld b, REG_VOLUME_ENVELOPE + call Audio1_GetRegisterPointer ld [hl], d - call Audio1_9629 - call Audio1_95f8 + call Audio1_ApplyDutyAndSoundLength + call Audio1_EnableChannelOutput pop de ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 0, [hl] ; has toggleperfectpitch been used? - jr z, .skip2 - inc e ; if yes, increment the pitch by 1 - jr nc, .skip2 + bit BIT_PERFECT_PITCH, [hl] ; has toggleperfectpitch been used? + jr z, .skipFrequencyInc + inc e ; if yes, increment the frequency by 1 + jr nc, .skipFrequencyInc inc d -.skip2 - ld hl, wc066 +.skipFrequencyInc + ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e - call Audio1_964b + call Audio1_ApplyWavePatternAndFrequency ret -Audio1_95f8: ; 0x95f8 - ld b, $0 - ld hl, Unknown_9b27 +Audio1_EnableChannelOutput: ; 0x95f8 + ld b, 0 + ld hl, Audio1_HWChannelEnableMasks add hl, bc - ld a, [$ff25] - or [hl] + ld a, [rNR51] + or [hl] ; set this channel's bits ld d, a ld a, c cp CH7 - jr z, .sfxNoiseChannel + jr z, .noiseChannelOrNoSfx cp CH4 jr nc, .skip ; if sfx channel - ld hl, wc02a +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr nz, .skip -.sfxNoiseChannel - ld a, [wc004] - ld hl, Unknown_9b27 +.noiseChannelOrNoSfx +; If this is the SFX noise channel or a music channel whose corresponding +; SFX channel is off, apply stereo panning. + ld a, [wStereoPanning] + ld hl, Audio1_HWChannelEnableMasks add hl, bc and [hl] ld d, a - ld a, [$ff25] - ld hl, Unknown_9b1f + ld a, [rNR51] + ld hl, Audio1_HWChannelDisableMasks add hl, bc - and [hl] - or d + and [hl] ; reset this channel's output bits + or d ; set this channel's output bits that enabled in [wStereoPanning] ld d, a .skip ld a, d - ld [$ff25], a + ld [rNR51], a ret -Audio1_9629: ; 0x9629 - ld b, $0 - ld hl, wc0b6 +Audio1_ApplyDutyAndSoundLength: ; 0x9629 + ld b, 0 + ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc ld d, [hl] ld a, c cp CH2 - jr z, .channel3 ; if music channel 3 + jr z, .skipDuty ; if music channel 3 cp CH6 - jr z, .channel3 ; if sfx channel 3 + jr z, .skipDuty ; if sfx channel 3 +; include duty (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d ld d, a -.channel3 - ld b, $1 - call Audio1_9838 +.skipDuty + ld b, REG_DUTY_SOUND_LEN + call Audio1_GetRegisterPointer ld [hl], d ret -Audio1_964b: ; 0x964b +Audio1_ApplyWavePatternAndFrequency: ; 0x964b ld a, c cp CH2 jr z, .channel3 cp CH6 - jr nz, .notSfxChannel3 + jr nz, .notChannel3 ; fall through .channel3 push de - ld de, wc0e6 + ld de, wMusicWaveInstrument cp CH2 - jr z, .musicChannel3 - ld de, wc0e7 -.musicChannel3 + jr z, .next + ld de, wSfxWaveInstrument +.next ld a, [de] add a - ld d, $0 + ld d, 0 ld e, a ld hl, Audio1_WavePointers add hl, de ld e, [hl] inc hl ld d, [hl] - ld hl, $ff30 + ld hl, $ff30 ; wave pattern RAM ld b, $f - ld a, $0 - ld [$ff1a], a + ld a, $0 ; stop hardware channel 3 + ld [rNR30], a .loop ld a, [de] inc de @@ -900,152 +926,155 @@ Audio1_964b: ; 0x964b dec b and a jr nz, .loop - ld a, $80 - ld [$ff1a], a + ld a, $80 ; start hardware channel 3 + ld [rNR30], a pop de -.notSfxChannel3 +.notChannel3 ld a, d - or $80 - and $c7 + or $80 ; use counter mode (i.e. disable output when the counter reaches 0) + and $c7 ; zero the unused bits in the register ld d, a - ld b, $3 - call Audio1_9838 - ld [hl], e + ld b, REG_FREQUENCY_LO + call Audio1_GetRegisterPointer + ld [hl], e ; store frequency low byte inc hl - ld [hl], d - call Audio1_96b5 + ld [hl], d ; store frequency high byte + call Audio1_ApplyFrequencyModifier ret -Audio1_9693: ; 0x9693 - call Audio1_96e5 - jr nc, .asm_96ab - ld d, $0 - ld a, [wc0f2] +Audio1_SetSfxTempo: ; 0x9693 + call Audio1_IsCry + jr nc, .notCry + ld d, 0 + ld a, [wTempoModifier] add $80 - jr nc, .asm_96a2 + jr nc, .next inc d -.asm_96a2 - ld [wc0eb], a +.next + ld [wSfxTempo + 1], a ld a, d - ld [wc0ea], a - jr .asm_96b4 -.asm_96ab + ld [wSfxTempo], a + jr .done +.notCry xor a - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, $1 - ld [wc0ea], a -.asm_96b4 + ld [wSfxTempo], a +.done ret -Audio1_96b5: ; 0x96b5 - call Audio1_96e5 - jr nc, .asm_96c6 - ld a, [wc0f1] +Audio1_ApplyFrequencyModifier: ; 0x96b5 + call Audio1_IsCry + jr nc, .done +; if playing a cry, add the cry's frequency modifier + ld a, [wFrequencyModifier] add e - jr nc, .asm_96c1 + jr nc, .noCarry inc d -.asm_96c1 +.noCarry dec hl ld e, a ld [hl], e inc hl ld [hl], d -.asm_96c6 +.done ret -Audio1_96c7: ; 0x96c7 - call Audio1_96e5 - jr nc, .asm_96e2 - ld hl, wc006 +Audio1_GoBackOneCommandIfCry: ; 0x96c7 + call Audio1_IsCry + jr nc, .done + ld hl, wChannelCommandPointers ld e, c - ld d, $0 + ld d, 0 sla e rl d add hl, de ld a, [hl] - sub $1 + sub 1 ld [hl], a inc hl ld a, [hl] - sbc $0 + sbc 0 ld [hl], a scf ret -.asm_96e2 +.done scf ccf ret -Audio1_96e5: ; 0x96e5 - ld a, [wc02a] - cp $14 - jr nc, .asm_96ee - jr .asm_96f4 -.asm_96ee - cp $86 - jr z, .asm_96f4 - jr c, .asm_96f7 -.asm_96f4 +Audio1_IsCry: ; 0x96e5 +; Returns whether the currently playing audio is a cry in carry. + ld a, [wChannelSoundIDs + CH4] + cp CRY_SFX_START + jr nc, .next + jr .no +.next + cp CRY_SFX_END + jr z, .no + jr c, .yes +.no scf ccf ret -.asm_96f7 +.yes scf ret Audio1_ApplyPitchBend: ; 0x96f9 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 5, [hl] - jp nz, .asm_9740 - ld hl, wc09e + bit BIT_PITCH_BEND_DECREASING, [hl] + jp nz, .frequencyDecreasing +; frequency increasing + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl add [hl] ld [hl], a - ld a, $0 + ld a, 0 adc e ld e, a - ld a, $0 + ld a, 0 adc d ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d - jp c, .asm_9786 - jr nz, .asm_9773 - ld hl, wc0ae + jp c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e - jp c, .asm_9786 - jr .asm_9773 -.asm_9740 - ld hl, wc09e + jp c, .reachedTargetFrequency + jr .applyUpdatedFrequency +.frequencyDecreasing + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld e, [hl] sub e @@ -1053,7 +1082,7 @@ Audio1_ApplyPitchBend: ; 0x96f9 ld a, d sbc b ld d, a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1064,129 +1093,140 @@ Audio1_ApplyPitchBend: ; 0x96f9 ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] - jr c, .asm_9786 - jr nz, .asm_9773 - ld hl, wc0ae + jr c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] - jr c, .asm_9786 -.asm_9773 - ld hl, wc09e + jr c, .reachedTargetFrequency +.applyUpdatedFrequency + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld b, $3 - call Audio1_9838 + ld b, REG_FREQUENCY_LO + call Audio1_GetRegisterPointer ld a, e ld [hli], a ld [hl], d ret -.asm_9786 - ld hl, wc02e +.reachedTargetFrequency +; Turn off pitch bend when the target frequency has been reached. + ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_BEND_ON, [hl] + res BIT_PITCH_BEND_DECREASING, [hl] ret -Audio1_978f: ; 0x978f - ld hl, wc096 +Audio1_InitPitchBendVars: ; 0x978f + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc sub [hl] - jr nc, .asm_97a7 - ld a, $1 -.asm_97a7 + jr nc, .next + ld a, 1 +.next ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc sub [hl] - jr c, .asm_97c3 + jr c, .targetFrequencyGreater ld d, a - ld b, $0 - ld hl, wc02e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc - set 5, [hl] - jr .asm_97e6 -.asm_97c3 - ld hl, wc096 + set BIT_PITCH_BEND_DECREASING, [hl] + jr .next2 +.targetFrequencyGreater +; If the target frequency is greater, subtract the current frequency from +; the target frequency to get the absolute difference. + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e ld e, a + +; Bug. Instead of borrowing from the high byte of the target frequency as it +; should, it borrows from the high byte of the current frequency instead. +; This means that the result will be 0x200 greater than it should be if the +; low byte of the current frequency is greater than the low byte of the +; target frequency. ld a, d sbc b ld d, a - ld hl, wc0a6 + + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a - ld b, $0 - ld hl, wc02e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc - res 5, [hl] -.asm_97e6 - ld hl, wc076 + res BIT_PITCH_BEND_DECREASING, [hl] + +.next2 + ld hl, wChannelPitchBendLengthModifiers add hl, bc -.asm_97ea +.divideLoop inc b ld a, e sub [hl] ld e, a - jr nc, .asm_97ea + jr nc, .divideLoop ld a, d and a - jr z, .asm_97f8 + jr z, .doneDividing dec a ld d, a - jr .asm_97ea -.asm_97f8 - ld a, e + jr .divideLoop +.doneDividing + ld a, e ; a = remainder - dividend add [hl] - ld d, b - ld b, $0 - ld hl, wc07e + ld d, b ; d = quotient + 1 + ld b, 0 + ld hl, wChannelPitchBendFrequencySteps add hl, bc - ld [hl], d - ld hl, wc086 + ld [hl], d ; store quotient + 1 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc - ld [hl], a - ld hl, wc08e + ld [hl], a ; store remainder - dividend + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc - ld [hl], a + ld [hl], a ; store remainder - dividend ret Audio1_ApplyDutyCycle: ; 0x980d - ld b, $0 - ld hl, wc046 + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] rlca @@ -1194,8 +1234,8 @@ Audio1_ApplyDutyCycle: ; 0x980d ld [hl], a and $c0 ld d, a - ld b, $1 - call Audio1_9838 + ld b, REG_DUTY_SOUND_LEN + call Audio1_GetRegisterPointer ld a, [hl] and $3f or d @@ -1203,11 +1243,11 @@ Audio1_ApplyDutyCycle: ; 0x980d ret Audio1_GetNextMusicByte: ; 0x9825 - ld d, $0 + ld d, 0 ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld a, [hli] ld e, a @@ -1220,9 +1260,10 @@ Audio1_GetNextMusicByte: ; 0x9825 ld [hl], d ret -Audio1_9838: ; 0x9838 +Audio1_GetRegisterPointer: ; 0x9838 +; hl = address of hardware sound register b for software channel c ld a, c - ld hl, Unknown_9b17 + ld hl, Audio1_HWChannelBaseAddresses add l jr nc, .noCarry inc h @@ -1234,13 +1275,14 @@ Audio1_9838: ; 0x9838 ld h, $ff ret -Audio1_9847: ; 0x9847 - ld h, $0 +Audio1_MultiplyAdd: ; 0x9847 +; hl = l + (a * de) + ld h, 0 .loop srl a - jr nc, .noCarry + jr nc, .skipAdd add hl, de -.noCarry +.skipAdd sla e rl d and a @@ -1249,8 +1291,9 @@ Audio1_9847: ; 0x9847 .done ret -Audio1_9858: ; 0x9858 - ld h, $0 +Audio1_CalculateFrequency: ; 0x9858 +; return the frequency for note a, octave b in de + ld h, 0 ld l, a add hl, hl ld d, h @@ -1262,137 +1305,138 @@ Audio1_9858: ; 0x9858 ld d, [hl] ld a, b .loop - cp $7 + cp 7 jr z, .done sra d rr e inc a jr .loop .done - ld a, $8 + ld a, 8 add d ld d, a ret -Audio1_9876:: ; 0x9876 - ld [wc001], a +Audio1_PlaySound:: ; 0x9876 + ld [wSoundID], a cp $ff - jp z, Audio1_9a34 - cp $b9 - jp z, Audio1_994e - jp c, Audio1_994e + jp z, .stopAllAudio + cp MAX_SFX_ID + jp z, .playSfx + jp c, .playSfx cp $fe - jr z, .asm_988d - jp nc, Audio1_994e -.asm_988d + jr z, .playMusic + jp nc, .playSfx + +.playMusic xor a - ld [wc000], a - ld [wc003], a - ld [wc0e9], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMusicTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $8 - ld hl, wc016 - call FillAudioRAM1 - ld hl, wc006 - call FillAudioRAM1 + ld hl, wChannelReturnAddresses + call .FillMem + ld hl, wChannelCommandPointers + call .FillMem ld d, $4 - ld hl, wc026 - call FillAudioRAM1 - ld hl, wc02e - call FillAudioRAM1 - ld hl, wc03e - call FillAudioRAM1 - ld hl, wc046 - call FillAudioRAM1 - ld hl, wc04e - call FillAudioRAM1 - ld hl, wc056 - call FillAudioRAM1 - ld hl, wc05e - call FillAudioRAM1 - ld hl, wc066 - call FillAudioRAM1 - ld hl, wc06e - call FillAudioRAM1 - ld hl, wc036 - call FillAudioRAM1 - ld hl, wc076 - call FillAudioRAM1 - ld hl, wc07e - call FillAudioRAM1 - ld hl, wc086 - call FillAudioRAM1 - ld hl, wc08e - call FillAudioRAM1 - ld hl, wc096 - call FillAudioRAM1 - ld hl, wc09e - call FillAudioRAM1 - ld hl, wc0a6 - call FillAudioRAM1 - ld hl, wc0ae - call FillAudioRAM1 + ld hl, wChannelSoundIDs + call .FillMem + ld hl, wChannelFlags1 + call .FillMem + ld hl, wChannelDuties + call .FillMem + ld hl, wChannelDutyCycles + call .FillMem + ld hl, wChannelVibratoDelayCounters + call .FillMem + ld hl, wChannelVibratoExtents + call .FillMem + ld hl, wChannelVibratoRates + call .FillMem + ld hl, wChannelFrequencyLowBytes + call .FillMem + ld hl, wChannelVibratoDelayCounterReloadValues + call .FillMem + ld hl, wChannelFlags2 + call .FillMem + ld hl, wChannelPitchBendLengthModifiers + call .FillMem + ld hl, wChannelPitchBendFrequencySteps + call .FillMem + ld hl, wChannelPitchBendFrequencyStepsFractionalPart + call .FillMem + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + call .FillMem + ld hl, wChannelPitchBendCurrentFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchBendCurrentFrequencyLowBytes + call .FillMem + ld hl, wChannelPitchBendTargetFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchBendTargetFrequencyLowBytes + call .FillMem ld a, $1 - ld hl, wc0be - call FillAudioRAM1 - ld hl, wc0b6 - call FillAudioRAM1 - ld hl, wc0c6 - call FillAudioRAM1 - ld [wc0e8], a + ld hl, wChannelLoopCounters + call .FillMem + ld hl, wChannelNoteDelayCounters + call .FillMem + ld hl, wChannelNoteSpeeds + call .FillMem + ld [wMusicTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a xor a - ld [$ff24], a + ld [rNR50], a ld a, $8 - ld [$ff10], a - ld a, $0 - ld [$ff25], a + ld [rNR10], a + ld a, 0 + ld [rNR51], a xor a - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a ld a, $77 - ld [$ff24], a - jp Audio1_9a8f + ld [rNR50], a + jp .playSoundCommon -Audio1_994e: ; 0x994e +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de ld de, SFX_Headers_1 add hl, de ld a, h - ld [wc0ec], a + ld [wSfxHeaderPointer], a ld a, l - ld [wc0ed], a + ld [wSfxHeaderPointer + 1], a ld a, [hl] and $c0 rlca rlca ld c, a -.asm_9967 +.sfxChannelLoop ld d, c ld a, c add a add c ld c, a - ld b, $0 - ld a, [wc0ec] + ld b, 0 + ld a, [wSfxHeaderPointer] ld h, a - ld a, [wc0ed] + ld a, [wSfxHeaderPointer + 1] ld l, a add hl, bc ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 - ld hl, wc026 + ld e, a ; software channel ID + ld d, 0 + ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a @@ -1400,7 +1444,7 @@ Audio1_994e: ; 0x994e ld a, e cp $7 jr nz, .asm_999a - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_9993 ret @@ -1410,7 +1454,7 @@ Audio1_994e: ; 0x994e jr z, .asm_99a3 jr c, .asm_99a3 .asm_999a - ld a, [wc001] + ld a, [wSoundID] cp [hl] jr z, .asm_99a3 jr c, .asm_99a3 @@ -1423,132 +1467,132 @@ Audio1_994e: ; 0x994e add hl, hl ld d, h ld e, l - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld [hli], a ld [hl], a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld [hli], a ld [hl], a pop de - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wc03e + ld hl, wChannelDuties add hl, de ld [hl], a - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, de ld [hl], a - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, de ld [hl], a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, de ld [hl], a - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, de ld [hl], a - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, de ld [hl], a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, de ld [hl], a ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, de ld [hl], a - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, de ld [hl], a - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, de ld [hl], a ld a, e - cp $4 + cp CH4 jr nz, .asm_9a2b ld a, $8 - ld [$ff10], a + ld [rNR10], a ; sweep off .asm_9a2b ld a, c and a - jp z, Audio1_9a8f + jp z, .playSoundCommon dec c - jp .asm_9967 + jp .sfxChannelLoop -Audio1_9a34: ; 0x9a34 +.stopAllAudio ld a, $80 - ld [$ff26], a - ld [$ff1a], a + ld [rNR52], a ; sound hardware on + ld [rNR30], a ; wave playback on xor a - ld [$ff25], a - ld [$ff1c], a + ld [rNR51], a ; no sound output + ld [rNR32], a ; mute channel 3 (wave channel) ld a, $8 - ld [$ff10], a - ld [$ff12], a - ld [$ff17], a - ld [$ff21], a + ld [rNR10], a ; sweep off + ld [rNR12], a ; mute channel 1 (pulse channel 1) + ld [rNR22], a ; mute channel 2 (pulse channel 2) + ld [rNR42], a ; mute channel 4 (noise channel) ld a, $40 - ld [$ff14], a - ld [$ff19], a - ld [$ff23], a + ld [rNR14], a ; counter mode + ld [rNR24], a + ld [rNR44], a ld a, $77 - ld [$ff24], a + ld [rNR50], a ; full volume xor a - ld [wc000], a - ld [wc003], a - ld [wc002], a - ld [wc0e9], a - ld [wc0eb], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMuteAudioAndPauseMusic], a + ld [wMusicTempo + 1], a + ld [wSfxTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $a0 - ld hl, wc006 - call FillAudioRAM1 + ld hl, wChannelCommandPointers + call .FillMem ld a, $1 ld d, $18 - ld hl, wc0b6 - call FillAudioRAM1 - ld [wc0e8], a - ld [wc0ea], a + ld hl, wChannelNoteDelayCounters + call .FillMem + ld [wMusicTempo], a + ld [wSfxTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a ret ; fills d bytes at hl with a -FillAudioRAM1: ; 0x9a89 +.FillMem ld b, d .loop ld [hli], a @@ -1556,11 +1600,11 @@ FillAudioRAM1: ; 0x9a89 jr nz, .loop ret -Audio1_9a8f: ; 0x9a8f - ld a, [wc001] +.playSoundCommon + ld a, [wSoundID] ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -1568,7 +1612,7 @@ Audio1_9a8f: ; 0x9a8f add hl, de ld e, l ld d, h - ld hl, wc006 + ld hl, wChannelCommandPointers ld a, [de] ; get channel number ld b, a rlca @@ -1580,31 +1624,31 @@ Audio1_9a8f: ; 0x9a8f ld b, c inc b inc de - ld c, $0 -.asm_9ab1 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_9ab9 + jr z, .next inc c inc hl inc hl - jr .asm_9ab1 -.asm_9ab9 + jr .commandPointerLoop +.next push hl push bc push af - ld b, $0 + ld b, 0 ld c, a - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc - ld a, [wc001] + ld a, [wSoundID] ld [hl], a pop af - cp $3 - jr c, .asm_9ad2 - ld hl, wc02e + cp CH3 + jr c, .skipSettingFlag + ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_9ad2 + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -1619,52 +1663,53 @@ Audio1_9a8f: ; 0x9a8f and a ld a, [de] inc de - jr nz, .asm_9ab1 - ld a, [wc001] - cp $14 + jr nz, .commandPointerLoop + ld a, [wSoundID] + cp CRY_SFX_START jr nc, .asm_9aeb - jr .asm_9b15 + jr .done .asm_9aeb - ld a, [wc001] - cp $86 - jr z, .asm_9b15 - jr c, .asm_9af6 - jr .asm_9b15 -.asm_9af6 - ld hl, wc02a + ld a, [wSoundID] + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry + ld hl, wChannelSoundIDs + CH4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wc012 ; sfx noise channel pointer - ld de, Noise1_endchannel + ld hl, wChannelCommandPointers + CH6 * 2 ; sfx wave channel pointer + ld de, Audio1_CryEndchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [wc005] + ld a, [wSavedVolume] and a - jr nz, .asm_9b15 - ld a, [$ff24] - ld [wc005], a + jr nz, .done + ld a, [rNR50] + ld [wSavedVolume], a ld a, $77 - ld [$ff24], a -.asm_9b15 + ld [rNR50], a ; full volume +.done ret -Noise1_endchannel: ; 0x9b16 +Audio1_CryEndchannel: ; 0x9b16 endchannel -Unknown_9b17: ; 0x9b17 - db $10, $15, $1A, $1F ; channels 0-3 - db $10, $15, $1A, $1F ; channels 4-7 +Audio1_HWChannelBaseAddresses: ; 0x9b17 +; the low bytes of each HW channel's base address + db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 + db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 -Unknown_9b1f: ; 0x9b1f - db $EE, $DD, $BB, $77 ; channels 0-3 - db $EE, $DD, $BB, $77 ; channels 4-7 +Audio1_HWChannelDisableMasks: ; 0x9b1f + db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 + db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 -Unknown_9b27: ; 0x9b27 - db $11, $22, $44, $88 ; channels 0-3 - db $11, $22, $44, $88 ; channels 4-7 +Audio1_HWChannelEnableMasks: ; 0x9b27 + db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 + db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 Audio1_Pitches: ; 0x9b2f dw $F82C ; C_ diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 62b82cec..e70a305f 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -4,7 +4,7 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ld c, CH0 .loop ld b, $0 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc ld a, [hl] and a @@ -12,18 +12,18 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ld a, c cp CH4 jr nc, .applyAffects ; if sfx channel - ld a, [wc002] + ld a, [wMuteAudioAndPauseMusic] and a jr z, .applyAffects bit 7, a jr nz, .nextChannel set 7, a - ld [wc002], a + ld [wMuteAudioAndPauseMusic], a xor a - ld [$ff25], a - ld [$ff1a], a + ld [rNR51], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a jr .nextChannel .applyAffects call Audio2_ApplyMusicAffects @@ -36,7 +36,7 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wc02e: +; known flags for wChannelFlags1: ; 0: toggleperfectpitch has been used ; 1: call has been used ; 3: a toggle used only by this routine for vibrato @@ -44,7 +44,7 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ; 6: dutycycle flag Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ld b, $0 - ld hl, wc0b6 ; delay until next note + ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note @@ -54,36 +54,36 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic call Audio2_ApplyDutyCycle .checkForExecuteMusic ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 2, [hl] jr nz, .disablePitchBendVibrato .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay jp Audio2_ApplyPitchBend .checkVibratoDelay - ld hl, wc04e ; vibrato delay + ld hl, wChannelVibratoDelayCounters ; vibrato delay add hl, bc ld a, [hl] and a ; check if delay is over @@ -92,7 +92,7 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) .disablePitchBendVibrato ret .checkForVibrato - ld hl, wc056 ; vibrato rate + ld hl, wChannelVibratoExtents ; vibrato rate add hl, bc ld a, [hl] and a @@ -100,7 +100,7 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ret ; no vibrato .vibrato ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc ld a, [hl] and $f @@ -113,10 +113,10 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) swap [hl] or [hl] ld [hl], a ; reset the vibrato value and start again - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 3, [hl] ; this is the only code that sets/resets bit three so jr z, .unset ; it continuously alternates which path it takes @@ -149,13 +149,13 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached Audio2_PlayNextNote: ; 21946 (8:5946) - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 4, [hl] res 5, [hl] @@ -175,7 +175,7 @@ Audio2_endchannel: ; 21967 (8:5967) cp $ff ; is this command an endchannel? jp nz, Audio2_callchannel ; no ld b, $0 ; yes - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 1, [hl] jr nz, .returnFromCall @@ -185,22 +185,22 @@ Audio2_endchannel: ; 21967 (8:5967) jr .asm_219c0 .noiseOrSfxChannel res 2, [hl] - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc res 0, [hl] cp CH6 jr nz, .notSfxChannel3 ld a, $0 - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a .notSfxChannel3 jr nz, .asm_219a3 - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr z, .asm_219a3 xor a - ld [wc003], a + ld [wDisableChannelOutputWhenSfxEnds], a jr .asm_219c0 .asm_219a3 jr .asm_219c9 @@ -210,10 +210,10 @@ Audio2_endchannel: ; 21967 (8:5967) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl ; store current channel address - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -227,16 +227,16 @@ Audio2_endchannel: ; 21967 (8:5967) .asm_219c0 ld hl, Unknown_222de add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a .asm_219c9 - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_219d2 jr .asm_219ef .asm_219d2 - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $86 jr z, .asm_219ef jr c, .asm_219dd @@ -248,12 +248,12 @@ Audio2_endchannel: ; 21967 (8:5967) call Audio2_21e6d ret c .asm_219e6 - ld a, [wc005] - ld [$ff24], a + ld a, [wSavedVolume] + ld [rNR50], a xor a - ld [wc005], a + ld [wSavedVolume], a .asm_219ef - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret @@ -272,10 +272,10 @@ Audio2_callchannel: ; 219f5 (8:59f5) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -290,7 +290,7 @@ Audio2_callchannel: ; 219f5 (8:59f5) inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 1, [hl] ; set the call flag jp Audio2_endchannel @@ -303,7 +303,7 @@ Audio2_loopchannel: ; 21a2a (8:5a2a) and a jr z, .infiniteLoop ld b, $0 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, bc ld a, [hl] cp e @@ -326,7 +326,7 @@ Audio2_loopchannel: ; 21a2a (8:5a2a) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de pop af ld [hli], a @@ -340,7 +340,7 @@ Audio2_notetype: ; 21a65 (8:5a65) ld a, d ; yes and $f ld b, $0 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -353,10 +353,10 @@ Audio2_notetype: ; 21a65 (8:5a65) jr z, .musicChannel3 cp CH6 jr nz, .notChannel3 - ld hl, wc0e7 + ld hl, wSfxWaveInstrument jr .sfxChannel3 .musicChannel3 - ld hl, wc0e6 + ld hl, wMusicWaveInstrument .sfxChannel3 ld a, d and $f @@ -371,7 +371,7 @@ Audio2_notetype: ; 21a65 (8:5a65) ; else, store volume (high nibble) and fade (low nibble) .notChannel3 ld b, $0 - ld hl, wc0de + ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel @@ -382,11 +382,11 @@ Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4) cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio2_vibrato ; no ld b, $0 ; yes - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of wc02e + ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio2_endchannel Audio2_vibrato: ; 21ab6 (8:5ab6) @@ -394,10 +394,10 @@ Audio2_vibrato: ; 21ab6 (8:5ab6) jr nz, Audio2_pitchbend ; no call Audio2_GetNextMusicByte ; yes ld b, $0 - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld [hl], a ; store delay call Audio2_GetNextMusicByte @@ -405,7 +405,7 @@ Audio2_vibrato: ; 21ab6 (8:5ab6) and $f0 swap a ld b, $0 - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, bc srl a ld e, a @@ -416,7 +416,7 @@ Audio2_vibrato: ; 21ab6 (8:5ab6) ld a, d and $f ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc swap a or d @@ -428,7 +428,7 @@ Audio2_pitchbend: ; 21aee (8:5aee) jr nz, Audio2_duty ; no call Audio2_GetNextMusicByte ; yes ld b, $0 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc ld [hl], a ; store first param call Audio2_GetNextMusicByte @@ -440,14 +440,14 @@ Audio2_pitchbend: ; 21aee (8:5aee) and $f call Audio2_22017 ld b, $0 - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld [hl], d ; store unknown part of second param - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld [hl], e ; store unknown part of second param ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 4, [hl] ; set pitchbend flag call Audio2_GetNextMusicByte @@ -462,7 +462,7 @@ Audio2_duty: ; 21b26 (8:5b26) rrca and $c0 ld b, $0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store duty jp Audio2_endchannel @@ -474,25 +474,25 @@ Audio2_tempo: ; 21b3b (8:5b3b) cp CH4 jr nc, .sfxChannel call Audio2_GetNextMusicByte - ld [wc0e8], a ; store first param + ld [wMusicTempo], a ; store first param call Audio2_GetNextMusicByte - ld [wc0e9], a ; store second param + ld [wMusicTempo + 1], a ; store second param xor a - ld [wc0ce], a ; clear RAM - ld [wc0cf], a - ld [wc0d0], a - ld [wc0d1], a + ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 1], a + ld [wChannelNoteDelayCountersFractionalPart + 2], a + ld [wChannelNoteDelayCountersFractionalPart + 3], a jr .musicChannelDone .sfxChannel call Audio2_GetNextMusicByte - ld [wc0ea], a ; store first param + ld [wSfxTempo], a ; store first param call Audio2_GetNextMusicByte - ld [wc0eb], a ; store second param + ld [wSfxTempo + 1], a ; store second param xor a - ld [wc0d2], a ; clear RAM - ld [wc0d3], a - ld [wc0d4], a - ld [wc0d5], a + ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 5], a + ld [wChannelNoteDelayCountersFractionalPart + 6], a + ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone jp Audio2_endchannel @@ -500,7 +500,7 @@ Audio2_stereopanning: ; 21b7b (8:5b7b) cp $ee ; is this command a stereopanning? jr nz, Audio2_unknownmusic0xef ; no call Audio2_GetNextMusicByte ; yes - ld [wc004], a ; store panning + ld [wStereoPanning], a ; store panning jp Audio2_endchannel ; this appears to never be used @@ -509,15 +509,15 @@ Audio2_unknownmusic0xef: ; 21b88 (8:5b88) jr nz, Audio2_dutycycle ; no call Audio2_GetNextMusicByte ; yes push bc - call Audio2_22035 + call Audio2_PlaySound pop bc - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wc02d] - ld [wc003], a + ld a, [wChannelSoundIDs + CH7] + ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wc02d], a + ld [wChannelSoundIDs + CH7], a .skip jp Audio2_endchannel @@ -526,14 +526,14 @@ Audio2_dutycycle: ; 21ba7 (8:5ba7) jr nz, Audio2_volume ; no call Audio2_GetNextMusicByte ; yes ld b, $0 - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store first duty - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 6, [hl] ; set dutycycle flag jp Audio2_endchannel @@ -542,14 +542,14 @@ Audio2_volume: ; 21bc5 (8:5bc5) cp $f0 ; is this command a volume? jr nz, Audio2_executemusic ; no call Audio2_GetNextMusicByte ; yes - ld [$ff24], a ; store volume + ld [rNR50], a ; store volume jp Audio2_endchannel Audio2_executemusic: ; 21bd1 (8:5bd1) cp $f8 ; is this command an executemusic? jr nz, Audio2_octave ; no ld b, $0 ; yes - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc set 0, [hl] jp Audio2_endchannel @@ -558,7 +558,7 @@ Audio2_octave: ; 21be0 (8:5be0) and $f0 cp $e0 ; is this command an octave? jr nz, Audio2_unknownsfx0x20 ; no - ld hl, wc0d6 ; yes + ld hl, wChannelOctaves ; yes ld b, $0 add hl, bc ld a, d @@ -573,14 +573,14 @@ Audio2_unknownsfx0x20: ; 21bf3 cp CH3 ; is this a noise or sfx channel? jr c, Audio2_unknownsfx0x10 ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio2_unknownsfx0x10 ; no call Audio2_notelength ld d, a ld b, $0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d @@ -619,12 +619,12 @@ Audio2_unknownsfx0x10: ; 21c40 (8:5c40) cp $10 ; is this command a unknownsfx0x10? jr nz, Audio2_note ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio2_note ; no call Audio2_GetNextMusicByte ; yes - ld [$ff10], a + ld [rNR10], a jp Audio2_endchannel Audio2_note: ; 21c5c (8:5c5c) @@ -654,11 +654,11 @@ Audio2_dnote: ; 21c76 (8:5c76) call Audio2_GetNextMusicByte ; get dnote instrument asm_21c7e ld d, a - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .asm_21c89 ld a, d - call Audio2_22035 + call Audio2_PlaySound .asm_21c89 pop bc pop de @@ -671,7 +671,7 @@ Audio2_notelength: ; 21c8b (8:5c8b) ld b, $0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b @@ -679,9 +679,9 @@ Audio2_notelength: ; 21c8b (8:5c8b) ld a, c cp CH4 jr nc, .sfxChannel - ld a, [wc0e8] + ld a, [wMusicTempo] ld d, a - ld a, [wc0e9] + ld a, [wMusicTempo + 1] ld e, a jr .skip .sfxChannel @@ -690,31 +690,31 @@ Audio2_notelength: ; 21c8b (8:5c8b) cp CH7 jr z, .skip ; if noise channel call Audio2_21e2f - ld a, [wc0ea] + ld a, [wSfxTempo] ld d, a - ld a, [wc0eb] + ld a, [wSfxTempo + 1] ld e, a .skip ld a, l ld b, $0 - ld hl, wc0ce + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] call Audio2_22006 ld e, l ld d, h - ld hl, wc0ce + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e ld a, d - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio2_notepitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 2, [hl] jr z, Audio2_notepitch @@ -729,7 +729,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) ld a, c cp CH4 jr nc, .sfxChannel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a @@ -745,9 +745,9 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) ld b, $0 ld hl, Unknown_222de add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a jr .done .notSfxChannel3 ld b, $2 @@ -762,12 +762,12 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) .notRest swap a ld b, $0 - ld hl, wc0d6 + ld hl, wChannelOctaves add hl, bc ld b, [hl] call Audio2_22017 ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 4, [hl] jr z, .asm_21d39 @@ -777,7 +777,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) ld a, c cp CH4 jr nc, .skip ; if sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 ld d, $0 ld e, a add hl, de @@ -790,7 +790,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) ret .skip ld b, $0 - ld hl, wc0de + ld hl, wChannelVolumes add hl, bc ld d, [hl] ld b, $2 @@ -800,7 +800,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) call Audio2_21d79 pop de ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 0, [hl] ; has toggleperfectpitch been used? jr z, .skip2 @@ -808,7 +808,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) jr nc, .skip2 inc d .skip2 - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e call Audio2_21dcc @@ -818,7 +818,7 @@ Audio2_21d79: ; 21d79 (8:5d79) ld b, $0 ld hl, Unknown_222e6 add hl, bc - ld a, [$ff25] + ld a, [rNR51] or [hl] ld d, a ld a, c @@ -826,18 +826,18 @@ Audio2_21d79: ; 21d79 (8:5d79) jr z, .sfxNoiseChannel cp CH4 jr nc, .skip ; if sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr nz, .skip .sfxNoiseChannel - ld a, [wc004] + ld a, [wStereoPanning] ld hl, Unknown_222e6 add hl, bc and [hl] ld d, a - ld a, [$ff25] + ld a, [rNR51] ld hl, Unknown_222de add hl, bc and [hl] @@ -845,12 +845,12 @@ Audio2_21d79: ; 21d79 (8:5d79) ld d, a .skip ld a, d - ld [$ff25], a + ld [rNR51], a ret Audio2_21daa: ; 21daa (8:5daa) ld b, $0 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld d, [hl] ld a, c @@ -861,7 +861,7 @@ Audio2_21daa: ; 21daa (8:5daa) ld a, d and $3f ld d, a - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d @@ -881,10 +881,10 @@ Audio2_21dcc: ; 21dcc (8:5dcc) ; fall through .channel3 push de - ld de, wc0e6 + ld de, wMusicWaveInstrument cp CH2 jr z, .musicChannel3 - ld de, wc0e7 + ld de, wSfxWaveInstrument .musicChannel3 ld a, [de] add a @@ -898,7 +898,7 @@ Audio2_21dcc: ; 21dcc (8:5dcc) ld hl, $ff30 ld b, $f ld a, $0 - ld [$ff1a], a + ld [rNR30], a .loop ld a, [de] inc de @@ -908,7 +908,7 @@ Audio2_21dcc: ; 21dcc (8:5dcc) and a jr nz, .loop ld a, $80 - ld [$ff1a], a + ld [rNR30], a pop de .notSfxChannel3 ld a, d @@ -935,9 +935,9 @@ Audio2_21e19: ; 21e19 (8:5e19) bit 7, a jr z, .asm_21e2e xor a - ld [wc0f1], a + ld [wFrequencyModifier], a ld a, $80 - ld [wc0f2], a + ld [wTempoModifier], a .asm_21e2e ret @@ -948,20 +948,20 @@ Audio2_21e2f: ; 21e2f (8:5e2f) jr nc, .asm_21e4c .asm_21e39 ld d, $0 - ld a, [wc0f2] + ld a, [wTempoModifier] add $80 jr nc, .asm_21e43 inc d .asm_21e43 - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, d - ld [wc0ea], a + ld [wSfxTempo], a jr .asm_21e55 .asm_21e4c xor a - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, $1 - ld [wc0ea], a + ld [wSfxTempo], a .asm_21e55 ret @@ -971,7 +971,7 @@ Audio2_21e56: ; 21e56 (8:5e56) call Audio2_21e9f jr nc, .asm_21e6c .asm_21e60 - ld a, [wc0f1] + ld a, [wFrequencyModifier] add e jr nc, .asm_21e67 inc d @@ -987,7 +987,7 @@ Audio2_21e56: ; 21e56 (8:5e56) Audio2_21e6d: ; 21e6d (8:5e6d) call Audio2_21e8b jr nc, .asm_21e88 - ld hl, wc006 + ld hl, wChannelCommandPointers ld e, c ld d, $0 sla e @@ -1008,7 +1008,7 @@ Audio2_21e6d: ; 21e6d (8:5e6d) ret Audio2_21e8b: ; 21e8b (8:5e8b) - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_21e94 jr .asm_21e9a @@ -1025,9 +1025,9 @@ Audio2_21e8b: ; 21e8b (8:5e8b) ret Audio2_21e9f: ; 21e9f (8:5e9f) - ld a, [wc02d] + ld a, [wChannelSoundIDs + CH7] ld b, a - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] or b cp $9d jr nc, .asm_21ead @@ -1045,27 +1045,27 @@ Audio2_21e9f: ; 21e9f (8:5e9f) ret Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 5, [hl] jp nz, .asm_21eff - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl @@ -1077,26 +1077,26 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, $0 adc d ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d jp c, .asm_21f45 jr nz, .asm_21f32 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e jp c, .asm_21f45 jr .asm_21f32 .asm_21eff - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld e, [hl] sub e @@ -1104,7 +1104,7 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, d sbc b ld d, a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1115,22 +1115,22 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] jr c, .asm_21f45 jr nz, .asm_21f32 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] jr c, .asm_21f45 .asm_21f32 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d ld b, $3 @@ -1140,54 +1140,54 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld [hl], d ret .asm_21f45 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 4, [hl] res 5, [hl] ret Audio2_21f4e: ; 21f4e (8:5f4e) - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc sub [hl] jr nc, .asm_21f66 ld a, $1 .asm_21f66 ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc sub [hl] jr c, .asm_21f82 ld d, a ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 5, [hl] jr .asm_21fa5 .asm_21f82 - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e @@ -1195,17 +1195,17 @@ Audio2_21f4e: ; 21f4e (8:5f4e) ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 5, [hl] .asm_21fa5 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc .asm_21fa9 inc b @@ -1224,20 +1224,20 @@ Audio2_21f4e: ; 21f4e (8:5f4e) add [hl] ld d, b ld b, $0 - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld [hl], d - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc ld [hl], a ret Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc) ld b, $0 - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] rlca @@ -1258,7 +1258,7 @@ Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld a, [hli] ld e, a @@ -1325,8 +1325,8 @@ Audio2_22017: ; 22017 (8:6017) ld d, a ret -Audio2_22035:: ; 22035 (8:6035) - ld [wc001], a +Audio2_PlaySound:: ; 22035 (8:6035) + ld [wSoundID], a cp $ff jp z, Audio2_221f3 cp $e9 @@ -1337,75 +1337,75 @@ Audio2_22035:: ; 22035 (8:6035) jp nc, Audio2_2210d .asm_2204c xor a - ld [wc000], a - ld [wc003], a - ld [wc0e9], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMusicTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $8 - ld hl, wc016 + ld hl, wChannelReturnAddresses call FillAudioRAM2 - ld hl, wc006 + ld hl, wChannelCommandPointers call FillAudioRAM2 ld d, $4 - ld hl, wc026 + ld hl, wChannelSoundIDs call FillAudioRAM2 - ld hl, wc02e + ld hl, wChannelFlags1 call FillAudioRAM2 - ld hl, wc03e + ld hl, wChannelDuties call FillAudioRAM2 - ld hl, wc046 + ld hl, wChannelDutyCycles call FillAudioRAM2 - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters call FillAudioRAM2 - ld hl, wc056 + ld hl, wChannelVibratoExtents call FillAudioRAM2 - ld hl, wc05e + ld hl, wChannelVibratoRates call FillAudioRAM2 - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes call FillAudioRAM2 - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues call FillAudioRAM2 - ld hl, wc036 + ld hl, wChannelFlags2 call FillAudioRAM2 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers call FillAudioRAM2 - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps call FillAudioRAM2 - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart call FillAudioRAM2 - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart call FillAudioRAM2 - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes call FillAudioRAM2 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes call FillAudioRAM2 - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes call FillAudioRAM2 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes call FillAudioRAM2 ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters call FillAudioRAM2 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters call FillAudioRAM2 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds call FillAudioRAM2 - ld [wc0e8], a + ld [wMusicTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a xor a - ld [$ff24], a + ld [rNR50], a ld a, $8 - ld [$ff10], a + ld [rNR10], a ld a, $0 - ld [$ff25], a + ld [rNR51], a xor a - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a ld a, $77 - ld [$ff24], a + ld [rNR50], a jp Audio2_2224e Audio2_2210d: ; 2210d (8:610d) @@ -1418,9 +1418,9 @@ Audio2_2210d: ; 2210d (8:610d) ld de, SFX_Headers_2 add hl, de ld a, h - ld [wc0ec], a + ld [wSfxHeaderPointer], a ld a, l - ld [wc0ed], a + ld [wSfxHeaderPointer + 1], a ld a, [hl] and $c0 rlca @@ -1433,9 +1433,9 @@ Audio2_2210d: ; 2210d (8:610d) add c ld c, a ld b, $0 - ld a, [wc0ec] + ld a, [wSfxHeaderPointer] ld h, a - ld a, [wc0ed] + ld a, [wSfxHeaderPointer + 1] ld l, a add hl, bc ld c, d @@ -1443,7 +1443,7 @@ Audio2_2210d: ; 2210d (8:610d) and $f ld e, a ld d, $0 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a @@ -1451,7 +1451,7 @@ Audio2_2210d: ; 2210d (8:610d) ld a, e cp $7 jr nz, .asm_22159 - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_22152 ret @@ -1461,7 +1461,7 @@ Audio2_2210d: ; 2210d (8:610d) jr z, .asm_22162 jr c, .asm_22162 .asm_22159 - ld a, [wc001] + ld a, [wSoundID] cp [hl] jr z, .asm_22162 jr c, .asm_22162 @@ -1474,84 +1474,84 @@ Audio2_2210d: ; 2210d (8:610d) add hl, hl ld d, h ld e, l - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld [hli], a ld [hl], a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld [hli], a ld [hl], a pop de - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wc03e + ld hl, wChannelDuties add hl, de ld [hl], a - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, de ld [hl], a - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, de ld [hl], a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, de ld [hl], a - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, de ld [hl], a - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, de ld [hl], a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, de ld [hl], a ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, de ld [hl], a - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, de ld [hl], a - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, de ld [hl], a ld a, e cp $4 jr nz, .asm_221ea ld a, $8 - ld [$ff10], a + ld [rNR10], a .asm_221ea ld a, c and a @@ -1561,41 +1561,41 @@ Audio2_2210d: ; 2210d (8:610d) Audio2_221f3: ; 221f3 (8:61f3) ld a, $80 - ld [$ff26], a - ld [$ff1a], a + ld [rNR52], a + ld [rNR30], a xor a - ld [$ff25], a - ld [$ff1c], a + ld [rNR51], a + ld [rNR32], a ld a, $8 - ld [$ff10], a - ld [$ff12], a - ld [$ff17], a - ld [$ff21], a + ld [rNR10], a + ld [rNR12], a + ld [rNR22], a + ld [rNR42], a ld a, $40 - ld [$ff14], a - ld [$ff19], a - ld [$ff23], a + ld [rNR14], a + ld [rNR24], a + ld [rNR44], a ld a, $77 - ld [$ff24], a + ld [rNR50], a xor a - ld [wc000], a - ld [wc003], a - ld [wc002], a - ld [wc0e9], a - ld [wc0eb], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMuteAudioAndPauseMusic], a + ld [wMusicTempo + 1], a + ld [wSfxTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $a0 - ld hl, wc006 + ld hl, wChannelCommandPointers call FillAudioRAM2 ld a, $1 ld d, $18 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters call FillAudioRAM2 - ld [wc0e8], a - ld [wc0ea], a + ld [wMusicTempo], a + ld [wSfxTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a ret ; fills d bytes at hl with a @@ -1608,7 +1608,7 @@ FillAudioRAM2: ; 22248 (8:6248) ret Audio2_2224e: ; 2224e (8:624e) - ld a, [wc001] + ld a, [wSoundID] ld l, a ld e, a ld h, $0 @@ -1619,7 +1619,7 @@ Audio2_2224e: ; 2224e (8:624e) add hl, de ld e, l ld d, h - ld hl, wc006 + ld hl, wChannelCommandPointers ld a, [de] ; get channel number ld b, a rlca @@ -1645,14 +1645,14 @@ Audio2_2224e: ; 2224e (8:624e) push af ld b, $0 ld c, a - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc - ld a, [wc001] + ld a, [wSoundID] ld [hl], a pop af cp $3 jr c, .asm_22291 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 2, [hl] .asm_22291 @@ -1671,34 +1671,34 @@ Audio2_2224e: ; 2224e (8:624e) ld a, [de] inc de jr nz, .asm_22270 - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_222aa jr .asm_222d4 .asm_222aa - ld a, [wc001] + ld a, [wSoundID] cp $86 jr z, .asm_222d4 jr c, .asm_222b5 jr .asm_222d4 .asm_222b5 - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wc012 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer ld de, Noise2_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [wc005] + ld a, [wSavedVolume] and a jr nz, .asm_222d4 - ld a, [$ff24] - ld [wc005], a + ld a, [rNR50] + ld [wSavedVolume], a ld a, $77 - ld [$ff24], a + ld [rNR50], a .asm_222d4 ret diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 93fa62aa..c7254405 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -4,7 +4,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ld c, CH0 .loop ld b, $0 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc ld a, [hl] and a @@ -12,18 +12,18 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ld a, c cp CH4 jr nc, .applyAffects ; if sfx channel - ld a, [wc002] + ld a, [wMuteAudioAndPauseMusic] and a jr z, .applyAffects bit 7, a jr nz, .nextChannel set 7, a - ld [wc002], a + ld [wMuteAudioAndPauseMusic], a xor a - ld [$ff25], a - ld [$ff1a], a + ld [rNR51], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a jr .nextChannel .applyAffects call Audio3_ApplyMusicAffects @@ -36,7 +36,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wc02e: +; known flags for wChannelFlags1: ; 0: toggleperfectpitch has been used ; 1: call has been used ; 3: a toggle used only by this routine for vibrato @@ -44,7 +44,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ; 6: dutycycle flag Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ld b, $0 - ld hl, wc0b6 ; delay until next note + ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] cp $1 ; if delay is 1, play next note @@ -54,36 +54,36 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic call Audio3_ApplyDutyCycle .checkForExecuteMusic ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 2, [hl] jr nz, .disablePitchBendVibrato .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay jp Audio3_ApplyPitchBend .checkVibratoDelay - ld hl, wc04e ; vibrato delay + ld hl, wChannelVibratoDelayCounters ; vibrato delay add hl, bc ld a, [hl] and a ; check if delay is over @@ -92,7 +92,7 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) .disablePitchBendVibrato ret .checkForVibrato - ld hl, wc056 ; vibrato rate + ld hl, wChannelVibratoExtents ; vibrato rate add hl, bc ld a, [hl] and a @@ -100,7 +100,7 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ret ; no vibrato .vibrato ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc ld a, [hl] and $f @@ -113,10 +113,10 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) swap [hl] or [hl] ld [hl], a ; reset the vibrato value and start again - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 3, [hl] ; this is the only code that sets/resets bit three so jr z, .unset ; it continuously alternates which path it takes @@ -149,13 +149,13 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached Audio3_PlayNextNote: ; 7d244 (1f:5244) - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 4, [hl] res 5, [hl] @@ -168,7 +168,7 @@ Audio3_endchannel: ; 7d25a (1f:525a) cp $ff ; is this command an endchannel? jp nz, Audio3_callchannel ; no ld b, $0 ; yes - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 1, [hl] jr nz, .returnFromCall @@ -178,22 +178,22 @@ Audio3_endchannel: ; 7d25a (1f:525a) jr .asm_7d2b3 .noiseOrSfxChannel res 2, [hl] - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc res 0, [hl] cp CH6 jr nz, .notSfxChannel3 ld a, $0 - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a .notSfxChannel3 jr nz, .asm_7d296 - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr z, .asm_7d296 xor a - ld [wc003], a + ld [wDisableChannelOutputWhenSfxEnds], a jr .asm_7d2b3 .asm_7d296 jr .asm_7d2bc @@ -203,10 +203,10 @@ Audio3_endchannel: ; 7d25a (1f:525a) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl ; store current channel address - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -220,16 +220,16 @@ Audio3_endchannel: ; 7d25a (1f:525a) .asm_7d2b3 ld hl, Unknown_7db93 add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a .asm_7d2bc - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_7d2c5 jr .asm_7d2e2 .asm_7d2c5 - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $86 jr z, .asm_7d2e2 jr c, .asm_7d2d0 @@ -241,12 +241,12 @@ Audio3_endchannel: ; 7d25a (1f:525a) call Audio3_7d73b ret c .asm_7d2d9 - ld a, [wc005] - ld [$ff24], a + ld a, [wSavedVolume] + ld [rNR50], a xor a - ld [wc005], a + ld [wSavedVolume], a .asm_7d2e2 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret @@ -265,10 +265,10 @@ Audio3_callchannel: ; 7d2e8 (1f:52e8) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -283,7 +283,7 @@ Audio3_callchannel: ; 7d2e8 (1f:52e8) inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 1, [hl] ; set the call flag jp Audio3_endchannel @@ -296,7 +296,7 @@ Audio3_loopchannel: ; 7d31d (1f:531d) and a jr z, .infiniteLoop ld b, $0 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, bc ld a, [hl] cp e @@ -319,7 +319,7 @@ Audio3_loopchannel: ; 7d31d (1f:531d) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de pop af ld [hli], a @@ -333,7 +333,7 @@ Audio3_notetype: ; 7d358 (1f:5358) ld a, d ; yes and $f ld b, $0 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -346,10 +346,10 @@ Audio3_notetype: ; 7d358 (1f:5358) jr z, .musicChannel3 cp CH6 jr nz, .notChannel3 - ld hl, wc0e7 + ld hl, wSfxWaveInstrument jr .sfxChannel3 .musicChannel3 - ld hl, wc0e6 + ld hl, wMusicWaveInstrument .sfxChannel3 ld a, d and $f @@ -364,7 +364,7 @@ Audio3_notetype: ; 7d358 (1f:5358) ; else, store volume (high nibble) and fade (low nibble) .notChannel3 ld b, $0 - ld hl, wc0de + ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel @@ -375,11 +375,11 @@ Audio3_toggleperfectpitch: ; 7d397 (1f:5397) cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio3_vibrato ; no ld b, $0 ; yes - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of wc02e + ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio3_endchannel Audio3_vibrato: ; 7d3a9 (1f:53a9) @@ -387,10 +387,10 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9) jr nz, Audio3_pitchbend ; no call Audio3_GetNextMusicByte ; yes ld b, $0 - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld [hl], a ; store delay call Audio3_GetNextMusicByte @@ -398,7 +398,7 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9) and $f0 swap a ld b, $0 - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, bc srl a ld e, a @@ -409,7 +409,7 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9) ld a, d and $f ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc swap a or d @@ -421,7 +421,7 @@ Audio3_pitchbend: ; 7d3e1 (1f:53e1) jr nz, Audio3_duty ; no call Audio3_GetNextMusicByte ; yes ld b, $0 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc ld [hl], a ; store first param call Audio3_GetNextMusicByte @@ -433,14 +433,14 @@ Audio3_pitchbend: ; 7d3e1 (1f:53e1) and $f call Audio3_7d8cc ld b, $0 - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld [hl], d ; store unknown part of second param - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld [hl], e ; store unknown part of second param ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 4, [hl] ; set pitchbend flag call Audio3_GetNextMusicByte @@ -455,7 +455,7 @@ Audio3_duty: ; 7d419 (1f:5419) rrca and $c0 ld b, $0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store duty jp Audio3_endchannel @@ -467,25 +467,25 @@ Audio3_tempo: ; 7d42e (1f:542e) cp CH4 jr nc, .sfxChannel call Audio3_GetNextMusicByte - ld [wc0e8], a ; store first param + ld [wMusicTempo], a ; store first param call Audio3_GetNextMusicByte - ld [wc0e9], a ; store second param + ld [wMusicTempo + 1], a ; store second param xor a - ld [wc0ce], a ; clear RAM - ld [wc0cf], a - ld [wc0d0], a - ld [wc0d1], a + ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 1], a + ld [wChannelNoteDelayCountersFractionalPart + 2], a + ld [wChannelNoteDelayCountersFractionalPart + 3], a jr .musicChannelDone .sfxChannel call Audio3_GetNextMusicByte - ld [wc0ea], a ; store first param + ld [wSfxTempo], a ; store first param call Audio3_GetNextMusicByte - ld [wc0eb], a ; store second param + ld [wSfxTempo + 1], a ; store second param xor a - ld [wc0d2], a ; clear RAM - ld [wc0d3], a - ld [wc0d4], a - ld [wc0d5], a + ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 5], a + ld [wChannelNoteDelayCountersFractionalPart + 6], a + ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone jp Audio3_endchannel @@ -493,7 +493,7 @@ Audio3_stereopanning: ; 7d46e (1f:546e) cp $ee ; is this command a stereopanning? jr nz, Audio3_unknownmusic0xef ; no call Audio3_GetNextMusicByte ; yes - ld [wc004], a ; store panning + ld [wStereoPanning], a ; store panning jp Audio3_endchannel ; this appears to never be used @@ -502,15 +502,15 @@ Audio3_unknownmusic0xef: ; 7d47b (1f:547b) jr nz, Audio3_dutycycle ; no call Audio3_GetNextMusicByte ; yes push bc - call Audio3_7d8ea + call Audio3_PlaySound pop bc - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wc02d] - ld [wc003], a + ld a, [wChannelSoundIDs + CH7] + ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wc02d], a + ld [wChannelSoundIDs + CH7], a .skip jp Audio3_endchannel @@ -519,14 +519,14 @@ Audio3_dutycycle: ; 7d49a (1f:549a) jr nz, Audio3_volume ; no call Audio3_GetNextMusicByte ; yes ld b, $0 - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store first duty - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 6, [hl] ; set duty flag jp Audio3_endchannel @@ -535,14 +535,14 @@ Audio3_volume: ; 7d4b8 (1f:54b8) cp $f0 ; is this command a volume? jr nz, Audio3_executemusic ; no call Audio3_GetNextMusicByte ; yes - ld [$ff24], a ; store volume + ld [rNR50], a ; store volume jp Audio3_endchannel Audio3_executemusic: ; 7d4c4 (1f:54c4) cp $f8 ; is this command an executemusic? jr nz, Audio3_octave ; no ld b, $0 ; yes - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc set 0, [hl] jp Audio3_endchannel @@ -551,7 +551,7 @@ Audio3_octave: ; 7d4d3 (1f:54d3) and $f0 cp $e0 ; is this command an octave? jr nz, Audio3_unknownsfx0x20 ; no - ld hl, wc0d6 ; yes + ld hl, wChannelOctaves ; yes ld b, $0 add hl, bc ld a, d @@ -566,14 +566,14 @@ Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6) cp CH3 ; is this a noise or sfx channel? jr c, Audio3_unknownsfx0x10 ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio3_unknownsfx0x10 ; no call Audio3_notelength ; yes ld d, a ld b, $0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d @@ -612,12 +612,12 @@ Audio3_unknownsfx0x10: ; 7d533 (1f:5533) cp $10 ; is this command an unknownsfx0x10? jr nz, Audio3_note ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio3_note ; no call Audio3_GetNextMusicByte ; yes - ld [$ff10], a + ld [rNR10], a jp Audio3_endchannel Audio3_note: ; 7d54f (1f:554f) @@ -647,11 +647,11 @@ Audio3_dnote: ; 7d569 (1f:5569) call Audio3_GetNextMusicByte ; get dnote instrument asm_7d571 ld d, a - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .asm_7d57c ld a, d - call Audio3_7d8ea + call Audio3_PlaySound .asm_7d57c pop bc pop de @@ -664,7 +664,7 @@ Audio3_notelength: ; 7d57e (1f:557e) ld b, $0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b @@ -672,9 +672,9 @@ Audio3_notelength: ; 7d57e (1f:557e) ld a, c cp CH4 jr nc, .sfxChannel - ld a, [wc0e8] + ld a, [wMusicTempo] ld d, a - ld a, [wc0e9] + ld a, [wMusicTempo + 1] ld e, a jr .skip .sfxChannel @@ -683,31 +683,31 @@ Audio3_notelength: ; 7d57e (1f:557e) cp CH7 jr z, .skip ; if noise channel call Audio3_7d707 - ld a, [wc0ea] + ld a, [wSfxTempo] ld d, a - ld a, [wc0eb] + ld a, [wSfxTempo + 1] ld e, a .skip ld a, l ld b, $0 - ld hl, wc0ce + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] call Audio3_7d8bb ld e, l ld d, h - ld hl, wc0ce + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e ld a, d - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio3_notepitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 2, [hl] jr z, Audio3_notepitch @@ -722,7 +722,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) ld a, c cp CH4 jr nc, .sfxChannel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a @@ -738,9 +738,9 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) ld b, $0 ld hl, Unknown_7db93 add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a jr .quit .notSfxChannel3 ld b, $2 @@ -755,12 +755,12 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) .notRest swap a ld b, $0 - ld hl, wc0d6 + ld hl, wChannelOctaves add hl, bc ld b, [hl] call Audio3_7d8cc ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 4, [hl] jr z, .asm_7d62c @@ -770,7 +770,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) ld a, c cp CH4 jr nc, .skip ; if sfx Channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 ld d, $0 ld e, a add hl, de @@ -783,7 +783,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) ret .skip ld b, $0 - ld hl, wc0de + ld hl, wChannelVolumes add hl, bc ld d, [hl] ld b, $2 @@ -793,7 +793,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) call Audio3_7d66c pop de ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 0, [hl] ; has toggleperfectpitch been used? jr z, .skip2 @@ -801,7 +801,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) jr nc, .skip2 inc d .skip2 - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e call Audio3_7d6bf @@ -811,7 +811,7 @@ Audio3_7d66c: ; 7d66c (1f:566c) ld b, $0 ld hl, Unknown_7db9b add hl, bc - ld a, [$ff25] + ld a, [rNR51] or [hl] ld d, a ld a, c @@ -819,18 +819,18 @@ Audio3_7d66c: ; 7d66c (1f:566c) jr z, .sfxNoiseChannel cp CH4 jr nc, .skip ; if sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr nz, .skip .sfxNoiseChannel - ld a, [wc004] + ld a, [wStereoPanning] ld hl, Unknown_7db9b add hl, bc and [hl] ld d, a - ld a, [$ff25] + ld a, [rNR51] ld hl, Unknown_7db93 add hl, bc and [hl] @@ -838,12 +838,12 @@ Audio3_7d66c: ; 7d66c (1f:566c) ld d, a .skip ld a, d - ld [$ff25], a + ld [rNR51], a ret Audio3_7d69d: ; 7d69d (1f:569d) ld b, $0 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld d, [hl] ld a, c @@ -854,7 +854,7 @@ Audio3_7d69d: ; 7d69d (1f:569d) ld a, d and $3f ld d, a - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d @@ -874,10 +874,10 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf) ; fall through .channel3 push de - ld de, wc0e6 + ld de, wMusicWaveInstrument cp CH2 jr z, .musicChannel3 - ld de, wc0e7 + ld de, wSfxWaveInstrument .musicChannel3 ld a, [de] add a @@ -891,7 +891,7 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf) ld hl, $ff30 ld b, $f ld a, $0 - ld [$ff1a], a + ld [rNR30], a .loop ld a, [de] inc de @@ -901,7 +901,7 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf) and a jr nz, .loop ld a, $80 - ld [$ff1a], a + ld [rNR30], a pop de .notSfxChannel3 ld a, d @@ -920,27 +920,27 @@ Audio3_7d707: ; 7d707 (1f:5707) call Audio3_7d759 jr nc, .asm_7d71f ld d, $0 - ld a, [wc0f2] + ld a, [wTempoModifier] add $80 jr nc, .asm_7d716 inc d .asm_7d716 - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, d - ld [wc0ea], a + ld [wSfxTempo], a jr .asm_7d728 .asm_7d71f xor a - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, $1 - ld [wc0ea], a + ld [wSfxTempo], a .asm_7d728 ret Audio3_7d729: ; 7d729 (1f:5729) call Audio3_7d759 jr nc, .asm_7d73a - ld a, [wc0f1] + ld a, [wFrequencyModifier] add e jr nc, .asm_7d735 inc d @@ -956,7 +956,7 @@ Audio3_7d729: ; 7d729 (1f:5729) Audio3_7d73b: ; 7d73b (1f:573b) call Audio3_7d759 jr nc, .asm_7d756 - ld hl, wc006 + ld hl, wChannelCommandPointers ld e, c ld d, $0 sla e @@ -977,7 +977,7 @@ Audio3_7d73b: ; 7d73b (1f:573b) ret Audio3_7d759: ; 7d759 (1f:5759) - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_7d762 jr .asm_7d768 @@ -994,27 +994,27 @@ Audio3_7d759: ; 7d759 (1f:5759) ret Audio3_ApplyPitchBend: ; 7d76d (1f:576d) - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 5, [hl] jp nz, .asm_7d7b4 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl @@ -1026,26 +1026,26 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld a, $0 adc d ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d jp c, .asm_7d7fa jr nz, .asm_7d7e7 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e jp c, .asm_7d7fa jr .asm_7d7e7 .asm_7d7b4 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld e, [hl] sub e @@ -1053,7 +1053,7 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld a, d sbc b ld d, a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1064,22 +1064,22 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] jr c, .asm_7d7fa jr nz, .asm_7d7e7 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] jr c, .asm_7d7fa .asm_7d7e7 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d ld b, $3 @@ -1089,54 +1089,54 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld [hl], d ret .asm_7d7fa - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 4, [hl] res 5, [hl] ret Audio3_7d803: ; 7d803 (1f:5803) - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc sub [hl] jr nc, .asm_7d81b ld a, $1 .asm_7d81b ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc sub [hl] jr c, .asm_7d837 ld d, a ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 5, [hl] jr .asm_7d85a .asm_7d837 - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e @@ -1144,17 +1144,17 @@ Audio3_7d803: ; 7d803 (1f:5803) ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 5, [hl] .asm_7d85a - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc .asm_7d85e inc b @@ -1173,20 +1173,20 @@ Audio3_7d803: ; 7d803 (1f:5803) add [hl] ld d, b ld b, $0 - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld [hl], d - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc ld [hl], a ret Audio3_ApplyDutyCycle: ; 7d881 (1f:5881) ld b, $0 - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] rlca @@ -1207,7 +1207,7 @@ Audio3_GetNextMusicByte: ; 7d899 (1f:5899) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld a, [hli] ld e, a @@ -1274,8 +1274,8 @@ Audio3_7d8cc: ; 7d8cc (1f:58cc) ld d, a ret -Audio3_7d8ea:: ; 7d8ea (1f:58ea) - ld [wc001], a +Audio3_PlaySound:: ; 7d8ea (1f:58ea) + ld [wSoundID], a cp $ff jp z, Audio3_7daa8 cp $c2 @@ -1286,75 +1286,75 @@ Audio3_7d8ea:: ; 7d8ea (1f:58ea) jp nc, Audio3_7d9c2 .asm_7d901 xor a - ld [wc000], a - ld [wc003], a - ld [wc0e9], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMusicTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $8 - ld hl, wc016 + ld hl, wChannelReturnAddresses call FillAudioRAM3 - ld hl, wc006 + ld hl, wChannelCommandPointers call FillAudioRAM3 ld d, $4 - ld hl, wc026 + ld hl, wChannelSoundIDs call FillAudioRAM3 - ld hl, wc02e + ld hl, wChannelFlags1 call FillAudioRAM3 - ld hl, wc03e + ld hl, wChannelDuties call FillAudioRAM3 - ld hl, wc046 + ld hl, wChannelDutyCycles call FillAudioRAM3 - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters call FillAudioRAM3 - ld hl, wc056 + ld hl, wChannelVibratoExtents call FillAudioRAM3 - ld hl, wc05e + ld hl, wChannelVibratoRates call FillAudioRAM3 - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes call FillAudioRAM3 - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues call FillAudioRAM3 - ld hl, wc036 + ld hl, wChannelFlags2 call FillAudioRAM3 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers call FillAudioRAM3 - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps call FillAudioRAM3 - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart call FillAudioRAM3 - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart call FillAudioRAM3 - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes call FillAudioRAM3 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes call FillAudioRAM3 - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes call FillAudioRAM3 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes call FillAudioRAM3 ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters call FillAudioRAM3 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters call FillAudioRAM3 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds call FillAudioRAM3 - ld [wc0e8], a + ld [wMusicTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a xor a - ld [$ff24], a + ld [rNR50], a ld a, $8 - ld [$ff10], a + ld [rNR10], a ld a, $0 - ld [$ff25], a + ld [rNR51], a xor a - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a ld a, $77 - ld [$ff24], a + ld [rNR50], a jp Audio3_7db03 Audio3_7d9c2: ; 7d9c2 (1f:59c2) @@ -1367,9 +1367,9 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) ld de, SFX_Headers_3 add hl, de ld a, h - ld [wc0ec], a + ld [wSfxHeaderPointer], a ld a, l - ld [wc0ed], a + ld [wSfxHeaderPointer + 1], a ld a, [hl] and $c0 rlca @@ -1382,9 +1382,9 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) add c ld c, a ld b, $0 - ld a, [wc0ec] + ld a, [wSfxHeaderPointer] ld h, a - ld a, [wc0ed] + ld a, [wSfxHeaderPointer + 1] ld l, a add hl, bc ld c, d @@ -1392,7 +1392,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) and $f ld e, a ld d, $0 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a @@ -1400,7 +1400,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) ld a, e cp $7 jr nz, .asm_7da0e - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_7da07 ret @@ -1410,7 +1410,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) jr z, .asm_7da17 jr c, .asm_7da17 .asm_7da0e - ld a, [wc001] + ld a, [wSoundID] cp [hl] jr z, .asm_7da17 jr c, .asm_7da17 @@ -1423,84 +1423,84 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) add hl, hl ld d, h ld e, l - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld [hli], a ld [hl], a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld [hli], a ld [hl], a pop de - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wc03e + ld hl, wChannelDuties add hl, de ld [hl], a - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, de ld [hl], a - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, de ld [hl], a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, de ld [hl], a - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, de ld [hl], a - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, de ld [hl], a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, de ld [hl], a ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, de ld [hl], a - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, de ld [hl], a - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, de ld [hl], a ld a, e cp $4 jr nz, .asm_7da9f ld a, $8 - ld [$ff10], a + ld [rNR10], a .asm_7da9f ld a, c and a @@ -1510,41 +1510,41 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) Audio3_7daa8: ; 7daa8 (1f:5aa8) ld a, $80 - ld [$ff26], a - ld [$ff1a], a + ld [rNR52], a + ld [rNR30], a xor a - ld [$ff25], a - ld [$ff1c], a + ld [rNR51], a + ld [rNR32], a ld a, $8 - ld [$ff10], a - ld [$ff12], a - ld [$ff17], a - ld [$ff21], a + ld [rNR10], a + ld [rNR12], a + ld [rNR22], a + ld [rNR42], a ld a, $40 - ld [$ff14], a - ld [$ff19], a - ld [$ff23], a + ld [rNR14], a + ld [rNR24], a + ld [rNR44], a ld a, $77 - ld [$ff24], a + ld [rNR50], a xor a - ld [wc000], a - ld [wc003], a - ld [wc002], a - ld [wc0e9], a - ld [wc0eb], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMuteAudioAndPauseMusic], a + ld [wMusicTempo + 1], a + ld [wSfxTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $a0 - ld hl, wc006 + ld hl, wChannelCommandPointers call FillAudioRAM3 ld a, $1 ld d, $18 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters call FillAudioRAM3 - ld [wc0e8], a - ld [wc0ea], a + ld [wMusicTempo], a + ld [wSfxTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a ret ; fills d bytes at hl with a @@ -1557,7 +1557,7 @@ FillAudioRAM3: ; 7dafd (1f:5afd) ret Audio3_7db03: ; 7db03 (1f:5b03) - ld a, [wc001] + ld a, [wSoundID] ld l, a ld e, a ld h, $0 @@ -1568,7 +1568,7 @@ Audio3_7db03: ; 7db03 (1f:5b03) add hl, de ld e, l ld d, h - ld hl, wc006 + ld hl, wChannelCommandPointers ld a, [de] ; get channel number ld b, a rlca @@ -1594,14 +1594,14 @@ Audio3_7db03: ; 7db03 (1f:5b03) push af ld b, $0 ld c, a - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc - ld a, [wc001] + ld a, [wSoundID] ld [hl], a pop af cp $3 jr c, .asm_7db46 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 2, [hl] .asm_7db46 @@ -1620,34 +1620,34 @@ Audio3_7db03: ; 7db03 (1f:5b03) ld a, [de] inc de jr nz, .asm_7db25 - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_7db5f jr .asm_7db89 .asm_7db5f - ld a, [wc001] + ld a, [wSoundID] cp $86 jr z, .asm_7db89 jr c, .asm_7db6a jr .asm_7db89 .asm_7db6a - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wc012 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer ld de, Noise3_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [wc005] + ld a, [wSavedVolume] and a jr nz, .asm_7db89 - ld a, [$ff24] - ld [wc005], a + ld a, [rNR50] + ld [wSavedVolume], a ld a, $77 - ld [$ff24], a + ld [rNR50], a .asm_7db89 ret diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index f9e3fe19..21a3ad93 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -107,4 +107,3 @@ rUNKNOWN5 EQU $ff75 ; (8Fh) - Bit 4-6 (Read/Write) rUNKNOWN6 EQU $ff76 ; (00h) - Always 00h (Read Only) rUNKNOWN7 EQU $ff77 ; (00h) - Always 00h (Read Only) rIE EQU $ffff ; Interrupt Enable (R/W) - diff --git a/constants/music_constants.asm b/constants/music_constants.asm index f239acea..57ad230d 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -1,3 +1,42 @@ +; HW sound channel register base addresses +HW_CH1_BASE EQU (rNR10 % $100) +HW_CH2_BASE EQU ((rNR21 % $100) - 1) +HW_CH3_BASE EQU (rNR30 % $100) +HW_CH4_BASE EQU ((rNR41 % $100) - 1) + +; HW sound channel enable bit masks +HW_CH1_ENABLE_MASK EQU %00010001 +HW_CH2_ENABLE_MASK EQU %00100010 +HW_CH3_ENABLE_MASK EQU %01000100 +HW_CH4_ENABLE_MASK EQU %10001000 + +; HW sound channel disable bit masks +HW_CH1_DISABLE_MASK EQU (~HW_CH1_ENABLE_MASK & $ff) +HW_CH2_DISABLE_MASK EQU (~HW_CH2_ENABLE_MASK & $ff) +HW_CH3_DISABLE_MASK EQU (~HW_CH3_ENABLE_MASK & $ff) +HW_CH4_DISABLE_MASK EQU (~HW_CH4_ENABLE_MASK & $ff) + +REG_DUTY_SOUND_LEN EQU 1 +REG_VOLUME_ENVELOPE EQU 2 +REG_FREQUENCY_LO EQU 3 + +MAX_SFX_ID EQU $B9 + +CRY_SFX_START EQU $14 +CRY_SFX_END EQU $86 + +; wChannelFlags1 constants +BIT_PERFECT_PITCH EQU 0 ; controlled by toggleperfectpitch command +BIT_CHANNEL_CALL EQU 1 ; if in channel call +BIT_NOISE_OR_SFX EQU 2 ; if channel is the music noise channel or an SFX channel +BIT_VIBRATO_DIRECTION EQU 3 ; if the pitch is above or below normal (cycles) +BIT_PITCH_BEND_ON EQU 4 ; if pitch bend is active +BIT_PITCH_BEND_DECREASING EQU 5 ; if the pitch bend frequency is decreasing (instead of increasing) +BIT_ROTATE_DUTY EQU 6 ; if rotating duty + +; wChannelFlags2 constant (only has one flag) +BIT_EXECUTE_MUSIC EQU 0 ; if in execute music + ; Song ids are calculated by address to save space. music_const: MACRO diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index b46842ec..1bd48988 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -772,7 +772,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) dec b jr nz,.loop ld a,%00001000 - ld [$ff10],a ; Channel 1 sweep register + ld [rNR10],a ; Channel 1 sweep register ret .isTrainerBattle ; if it's a trainer battle, shorten the animation by one frame ld a,[W_SUBANIMCOUNTER] @@ -2335,19 +2335,19 @@ GetMoveSound: ; 7986f (1e:586f) call GetCryData ld b,a pop hl - ld a,[wc0f1] + ld a,[wFrequencyModifier] add [hl] - ld [wc0f1],a + ld [wFrequencyModifier],a inc hl - ld a,[wc0f2] + ld a,[wTempoModifier] add [hl] - ld [wc0f2],a + ld [wTempoModifier],a jr .done .NotCryMove ld a,[hli] - ld [wc0f1],a + ld [wFrequencyModifier],a ld a,[hli] - ld [wc0f2],a + ld [wTempoModifier],a .done ld a,b ret @@ -3029,8 +3029,8 @@ PlayApplyingAttackSound: ; 79e6a (1e:5e6a) ld b, $1 ld c, SFX_NOT_VERY_EFFECTIVE .playSound - ld [wc0f1], a + ld [wFrequencyModifier], a ld a, b - ld [wc0f2], a + ld [wTempoModifier], a ld a, c jp PlaySound diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index a00e9d59..a1afcb75 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -61,9 +61,9 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) .playSFX xor a - ld [wc0f1], a + ld [wFrequencyModifier], a ld a, $80 - ld [wc0f2], a + ld [wTempoModifier], a ld a, SFX_SILPH_SCOPE call PlaySound jp WaitForSoundToFinish diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 004859da..22a47908 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -867,12 +867,12 @@ FaintEnemyPokemon: ; 0x3c567 dec a jr z, .wild_win xor a - ld [wc0f1], a - ld [wc0f2], a + ld [wFrequencyModifier], a + ld [wTempoModifier], a ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -952,7 +952,7 @@ EnemyMonFaintedText: ; 0x3c63e EndLowHealthAlarm: ; 3c643 (f:4643) xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wc02a], a + ld [wChannelSoundIDs + CH4], a inc a ld [wccf6], a ret @@ -1045,7 +1045,7 @@ TrainerDefeatedText: ; 3c6e9 (f:46e9) PlayBattleVictoryMusic: ; 3c6ee (f:46ee) push af ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySoundWaitForCurrent ld c, BANK(Music_DefeatedTrainer) pop af @@ -1944,7 +1944,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) ld [hl], $0 ret z xor a - ld [wc02a], a + ld [wChannelSoundIDs + CH4], a ret .asm_3cde6 ld hl, wLowHealthAlarm @@ -6993,8 +6993,8 @@ _LoadTrainerPic: ; 3f04b (f:704b) ; unreferenced ResetCryModifiers: ; 3f069 (f:7069) xor a - ld [wc0f1], a - ld [wc0f2], a + ld [wFrequencyModifier], a + ld [wTempoModifier], a jp PlaySound ; animates the mon "growing" out of the pokeball diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index c642d206..f1de313c 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -46,7 +46,7 @@ EndOfBattle: ; 137aa (4:77aa) .resetVariables xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wc02a], a + ld [wChannelSoundIDs + CH4], a ld [W_ISINBATTLE], a ld [W_BATTLETYPE], a ld [W_MOVEMISSED], a diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 078ae5c2..dec18fe3 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -824,12 +824,12 @@ TradeCenter_Trade: add hl, bc ld a, [hl] ld [wTradedEnemyMonSpecies], a - ld a, $a - ld [wMusicHeaderPointer], a + ld a, 10 + ld [wAudioFadeOutControl], a ld a, $2 - ld [wc0f0], a + ld [wAudioSavedROMBank], a ld a, MUSIC_SAFARI_ZONE - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, 100 call DelayFrames @@ -915,12 +915,12 @@ CableClub_Run: ; 5a5f (1:5a5f) inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a ld [$ffb5], a - ld a, $a - ld [wMusicHeaderPointer], a + ld a, 10 + ld [wAudioFadeOutControl], a ld a, BANK(Music_Celadon) - ld [wc0f0], a + ld [wAudioSavedROMBank], a ld a, MUSIC_CELADON - ld [wc0ee], a + ld [wNewSoundID], a jp PlaySound EmptyFunc3: ; 5aaf (1:5aaf) diff --git a/engine/evolution.asm b/engine/evolution.asm index 720e77cd..8fbf568a 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -8,9 +8,9 @@ EvolveMon: ; 7bde9 (1e:7de9) push af xor a ld [wLowHealthAlarm], a - ld [wc02a], a + ld [wChannelSoundIDs + CH4], a dec a - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -68,7 +68,7 @@ EvolveMon: ; 7bde9 (1e:7de9) .done ld [wcf1d], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, [wcf1d] call PlayCry diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index ce1430e3..293c756f 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -280,9 +280,9 @@ HoFRecordMonInfo: ; 70404 (1c:4404) jp CopyData HoFFadeOutScreenAndMusic: ; 70423 (1c:4423) - ld a, $a - ld [wcfc8], a - ld [wcfc9], a + ld a, 10 + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a ld a, $ff - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a jp GBFadeOutToWhite diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 0753531e..67e75301 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -63,14 +63,14 @@ SafariZoneGameStillGoing: ; 1e9ab (7:69ab) SafariZoneGameOver: ; 1e9b0 (7:69b0) call EnableAutoTextBoxDrawing xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a dec a call PlaySound ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .asm_1e9c2 - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $b9 jr nz, .asm_1e9c2 ld a, TEXT_SAFARI_GAME_OVER @@ -374,7 +374,7 @@ BillsHouseInitiatedText: ; 1ebe2 (7:6be2) db $06 TX_ASM ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, 16 call DelayFrames diff --git a/engine/intro.asm b/engine/intro.asm index 154c41fd..572d51fa 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -325,10 +325,10 @@ PlayShootingStar: ; 4188a (10:588a) call DelayFrames .next ld a, BANK(Music_IntroBattle) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, MUSIC_INTRO_BATTLE - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound call IntroClearMiddleOfScreen call ClearSprites diff --git a/engine/items/items.asm b/engine/items/items.asm index a45b9185..84490521 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -856,7 +856,7 @@ ItemUseMedicine: ; dabb (3:5abb) .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a ld [wLowHealthAlarm],a ;disable low health alarm - ld [wc02a],a + ld [wChannelSoundIDs + CH4],a push hl push de ld bc,32 @@ -1643,7 +1643,7 @@ ItemUsePokeflute: ; e140 (3:6140) call WaitForSoundToFinish ; wait for sound to end callba Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a,[wc02c] + ld a,[wChannelSoundIDs + CH6] and a ; music off? jr nz,.musicWaitLoop .skipMusic @@ -1716,8 +1716,8 @@ PlayedFluteHadEffectText: ; e215 (3:6215) ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a,[wc028] - cp a,$b8 + ld a,[wChannelSoundIDs + CH2] + cp a, SFX_POKEFLUE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again .done diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index b5ebd83e..fd8a928d 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -397,7 +397,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld hl,wd72c set 1,[hl] ld a,$33 ; 3/7 volume - ld [$ff24],a + ld [rNR50],a call GBPalWhiteOut ; zero all palettes call ClearScreen ld a,[wd11e] ; pokemon ID @@ -566,7 +566,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld hl,wd72c res 1,[hl] ld a,$77 ; max volume - ld [$ff24],a + ld [rNR50],a ret HeightWeightText: ; 40448 (10:4448) diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index c13d7c85..bc58ba21 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -80,7 +80,7 @@ StatusScreen: ; 12953 (4:6953) ld hl, wd72c set 1, [hl] ld a, $33 - ld [$ff24], a ; Reduce the volume + ld [rNR50], a ; Reduce the volume call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites @@ -430,7 +430,7 @@ StatusScreen2: ; 12b57 (4:6b57) ld hl, wd72c res 1, [hl] ld a, $77 - ld [$ff24], a + ld [rNR50], a call GBPalWhiteOut jp ClearScreen diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 98499d7f..566bd880 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -129,12 +129,12 @@ OakSpeech: ; 6115 (1:6115) ld a,[H_LOADEDROMBANK] push af ld a, BANK(Music_PalletTown) - ld [wc0ef],a - ld [wc0f0],a - ld a,$A - ld [wMusicHeaderPointer],a + ld [wAudioROMBank],a + ld [wAudioSavedROMBank],a + ld a, 10 + ld [wAudioFadeOutControl],a ld a,$FF - ld [wc0ee],a + ld [wNewSoundID],a call PlaySound ; stop music pop af ld [H_LOADEDROMBANK],a diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index eb62fee7..05a9cc4e 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -33,7 +33,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $b9 jr z, .musicLoop call UpdateSprites diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index d3513b0d..0c04ff0e 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -15,44 +15,44 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData call CopyHealingMachineOAM - ld a, $4 - ld [wMusicHeaderPointer], a + ld a, 4 + ld [wAudioFadeOutControl], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound -.asm_70464 - ld a, [wMusicHeaderPointer] - and a - jr nz, .asm_70464 +.waitLoop + ld a, [wAudioFadeOutControl] + and a ; is fade-out finished? + jr nz, .waitLoop ; if not, check again ld a, [wPartyCount] ld b, a -.asm_7046e +.partyLoop call CopyHealingMachineOAM ld a, SFX_HEALING_MACHINE call PlaySound ld c, 30 call DelayFrames dec b - jr nz, .asm_7046e - ld a, [wc0ef] + jr nz, .partyLoop + ld a, [wAudioROMBank] cp BANK(Audio3_UpdateMusic) - ld [wc0f0], a - jr nz, .asm_70495 + ld [wAudioSavedROMBank], a + jr nz, .next ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, BANK(Music_PkmnHealed) - ld [wc0ef], a -.asm_70495 + ld [wAudioROMBank], a +.next ld a, MUSIC_PKMN_HEALED - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld d, $28 call FlashSprite8Times -.asm_704a2 - ld a, [wc026] - cp MUSIC_PKMN_HEALED - jr z, .asm_704a2 +.waitLoop2 + ld a, [wChannelSoundIDs] + cp MUSIC_PKMN_HEALED ; is the healed music still playing? + jr z, .waitLoop2 ; if so, check gain ld c, 32 call DelayFrames pop af diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 0c01e38c..fa5ac222 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -163,10 +163,10 @@ PewterMuseumGuyMovementScriptPointerTable: ; 1a510 (6:6510) PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514) ld a, BANK(Music_MuseumGuy) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, MUSIC_MUSEUM_GUY - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, [wSpriteIndex] swap a @@ -219,10 +219,10 @@ PewterGymGuyMovementScriptPointerTable: ; 1a57d (6:657d) PewterMovementScript_WalkToGym: ; 1a581 (6:6581) ld a, BANK(Music_MuseumGuy) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, MUSIC_MUSEUM_GUY - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, [wSpriteIndex] swap a diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 5b2e4cbb..f302d994 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -24,12 +24,12 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) predef HealParty callba AnimateHealingMachine ; do the healing machine animation xor a - ld [wMusicHeaderPointer], a - ld a, [wc0f0] - ld [wc0ef], a - ld a, [wd35b] - ld [wcfca], a - ld [wc0ee], a + ld [wAudioFadeOutControl], a + ld a, [wAudioSavedROMBank] + ld [wAudioROMBank], a + ld a, [wMapMusicSoundID] + ld [wLastMusicSoundID], a + ld [wNewSoundID], a call PlaySound ld hl, PokemonFightingFitText call PrintText diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 3b392dde..b68b9294 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -411,7 +411,7 @@ SlotMachine_CheckForMatches: ; 37588 (d:7588) call PrintText .done xor a - ld [wc002], a + ld [wMuteAudioAndPauseMusic], a ret .rollWheel3DownByOneSymbol call SlotMachine_AnimWheel3 @@ -654,7 +654,7 @@ SlotMachine_PrintPayoutCoins: ; 3775f (d:775f) SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b) ld a, $1 - ld [wc002], a + ld [wMuteAudioAndPauseMusic], a call WaitForSoundToFinish ; Put 1 in the temp coins variable. This value is added to the player's coins diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index df47275b..17609786 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -18,8 +18,8 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) ld [hli], a ld [hl], a ld a, BANK(Music_TitleScreen) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a DisplayTitleScreen: ; 42dd (1:42dd) call GBPalWhiteOut @@ -219,7 +219,7 @@ ENDC call Delay3 call WaitForSoundToFinish ld a, MUSIC_TITLE_SCREEN - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound xor a ld [wcc5b], a diff --git a/home.asm b/home.asm index b18a4ec3..e850c858 100644 --- a/home.asm +++ b/home.asm @@ -332,9 +332,9 @@ GetCryData:: ; 13d9 (0:13d9) ld a, [hli] ld b, a ; cry id ld a, [hli] - ld [wc0f1], a + ld [wFrequencyModifier], a ld a, [hl] - ld [wc0f2], a + ld [wTempoModifier], a call BankswitchBack ; Cry headers have 3 channels, @@ -998,27 +998,27 @@ ResetPlayerSpriteData_ClearSpriteData:: ; 28c4 (0:28c4) xor a jp FillMemory -Func_28cb:: ; 28cb (0:28cb) - ld a, [wMusicHeaderPointer] +FadeOutAudio:: ; 28cb (0:28cb) + ld a, [wAudioFadeOutControl] and a jr nz, .asm_28dc ld a, [wd72c] bit 1, a ret nz ld a, $77 - ld [$ff24], a + ld [rNR50], a ret .asm_28dc - ld a, [wcfc9] + ld a, [wAudioFadeOutCounter] and a - jr z, .asm_28e7 + jr z, .counterReachedZero dec a - ld [wcfc9], a + ld [wAudioFadeOutCounter], a ret -.asm_28e7 - ld a, [wcfc8] - ld [wcfc9], a - ld a, [$ff24] +.counterReachedZero + ld a, [wAudioFadeOutCounterReloadValue] + ld [wAudioFadeOutCounter], a + ld a, [rNR50] and a jr z, .asm_2903 ld b, a @@ -1031,20 +1031,20 @@ Func_28cb:: ; 28cb (0:28cb) dec a swap a or c - ld [$ff24], a + ld [rNR50], a ret .asm_2903 - ld a, [wMusicHeaderPointer] + ld a, [wAudioFadeOutControl] ld b, a xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound - ld a, [wc0f0] - ld [wc0ef], a + ld a, [wAudioSavedROMBank] + ld [wAudioROMBank], a ld a, b - ld [wc0ee], a + ld [wNewSoundID], a jp PlaySound ; this function is used to display sign messages, sprite dialog, etc. @@ -2604,12 +2604,12 @@ PlayTrainerMusic:: ; 33e8 (0:33e8) and a ret nz xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, $ff call PlaySound ld a, BANK(Music_MeetEvilTrainer) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, [wEngagedTrainerClass] ld b, a ld hl, EvilTrainerList @@ -2634,7 +2634,7 @@ PlayTrainerMusic:: ; 33e8 (0:33e8) .maleTrainer ld a, MUSIC_MEET_MALE_TRAINER .PlaySound - ld [wc0ee], a + ld [wNewSoundID], a jp PlaySound INCLUDE "data/trainer_types.asm" @@ -3217,8 +3217,8 @@ WaitForSoundToFinish:: ; 3748 (0:3748) and $80 ret nz push hl -.asm_374f - ld hl, wc02a +.waitLoop + ld hl, wChannelSoundIDs + CH4 xor a or [hl] inc hl @@ -3226,7 +3226,7 @@ WaitForSoundToFinish:: ; 3748 (0:3748) inc hl inc hl or [hl] - jr nz, .asm_374f + jr nz, .waitLoop pop hl ret diff --git a/home/audio.asm b/home/audio.asm index 033f4067..2c46ec7a 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -3,112 +3,139 @@ PlayDefaultMusic:: ; 2307 (0:2307) xor a ld c, a ld d, a - ld [wcfca], a - jr Func_2324 + ld [wLastMusicSoundID], a + jr PlayDefaultMusicCommon -Func_2312:: ; 2312 (0:2312) - ld c, $a - ld d, $0 +PlayDefaultMusicFadeOutCurrent:: ; 2312 (0:2312) +; Fade out the current music and then play the default music. + ld c, 10 + ld d, 0 ld a, [wd72e] - bit 5, a - jr z, Func_2324 + bit 5, a ; has a battle just ended? + jr z, PlayDefaultMusicCommon xor a - ld [wcfca], a - ld c, $8 + ld [wLastMusicSoundID], a + ld c, 8 ld d, c -Func_2324:: ; 2324 (0:2324) + +PlayDefaultMusicCommon:: ; 2324 (0:2324) ld a, [wWalkBikeSurfState] and a - jr z, .asm_2343 + jr z, .walking cp $2 - jr z, .asm_2332 + jr z, .surfing ld a, MUSIC_BIKE_RIDING - jr .asm_2334 -.asm_2332 + jr .next + +.surfing ld a, MUSIC_SURFING -.asm_2334 + +.next ld b, a ld a, d - and a + and a ; should current music be faded out first? ld a, BANK(Music_BikeRiding) - jr nz, .asm_233e - ld [wc0ef], a -.asm_233e - ld [wc0f0], a - jr .asm_234c -.asm_2343 - ld a, [wd35b] + jr nz, .next2 + +; Only change the audio ROM bank if the current music isn't going to be faded +; out before the default music begins. + ld [wAudioROMBank], a + +.next2 +; [wAudioSavedROMBank] will be copied to [wAudioROMBank] after fading out the +; current music (if the current music is faded out). + ld [wAudioSavedROMBank], a + jr .next3 + +.walking + ld a, [wMapMusicSoundID] ld b, a - call Func_2385 - jr c, .asm_2351 -.asm_234c - ld a, [wcfca] - cp b - ret z -.asm_2351 + call CompareMapMusicBankWithCurrentBank + jr c, .next4 + +.next3 + ld a, [wLastMusicSoundID] + cp b ; is the default music already playing? + ret z ; if so, do nothing + +.next4 ld a, c - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, b - ld [wcfca], a - ld [wc0ee], a + ld [wLastMusicSoundID], a + ld [wNewSoundID], a jp PlaySound -Func_235f:: ; 235f (0:235f) - ld a, [wc0ef] +UpdateMusic6Times:: ; 235f (0:235f) +; This is called when entering a map, before fading out the current music and +; playing the default music (i.e. the map's music or biking/surfing music). + ld a, [wAudioROMBank] ld b, a cp BANK(Audio1_UpdateMusic) jr nz, .checkForAudio2 -.audio1 + +; audio 1 ld hl, Audio1_UpdateMusic - jr .asm_2378 + jr .next + .checkForAudio2 cp BANK(Audio2_UpdateMusic) jr nz, .audio3 -.audio2 + +; audio 2 ld hl, Audio2_UpdateMusic - jr .asm_2378 + jr .next + .audio3 ld hl, Audio3_UpdateMusic -.asm_2378 - ld c, $6 -.asm_237a + +.next + ld c, 6 +.loop push bc push hl call Bankswitch pop hl pop bc dec c - jr nz, .asm_237a + jr nz, .loop ret -Func_2385:: ; 2385 (0:2385) - ld a, [wd35c] +CompareMapMusicBankWithCurrentBank:: ; 2385 (0:2385) +; Compares the map music's audio ROM bank with the current audio ROM bank +; and updates the audio ROM bank variables. +; Returns whether the banks are different in carry. + ld a, [wMapMusicROMBank] ld e, a - ld a, [wc0ef] + ld a, [wAudioROMBank] cp e - jr nz, .asm_2394 - ld [wc0f0], a + jr nz, .differentBanks + ld [wAudioSavedROMBank], a and a ret -.asm_2394 - ld a, c +.differentBanks + ld a, c ; this is a fade-out counter value and it's always non-zero and a ld a, e - jr nz, .asm_239c - ld [wc0ef], a -.asm_239c - ld [wc0f0], a + jr nz, .next +; If the fade-counter is non-zero, we don't change the audio ROM bank because +; it's needed to keep playing the music as it fades out. The FadeOutAudio +; routine will take care of copying [wAudioSavedROMBank] to [wAudioROMBank] +; when the music has faded out. + ld [wAudioROMBank], a +.next + ld [wAudioSavedROMBank], a scf ret PlayMusic:: ; 23a1 (0:23a1) ld b, a - ld [wc0ee], a + ld [wNewSoundID], a xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, c - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, b ; plays music specified by a. If value is $ff, music is stopped @@ -117,66 +144,74 @@ PlaySound:: ; 23b1 (0:23b1) push de push bc ld b, a - ld a, [wc0ee] + ld a, [wNewSoundID] and a - jr z, .asm_23c8 + jr z, .next xor a - ld [wc02a], a - ld [wc02b], a - ld [wc02c], a - ld [wc02d], a -.asm_23c8 - ld a, [wMusicHeaderPointer] - and a - jr z, .asm_23e3 - ld a, [wc0ee] - and a - jr z, .asm_2425 + ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + CH5], a + ld [wChannelSoundIDs + CH6], a + ld [wChannelSoundIDs + CH7], a +.next + ld a, [wAudioFadeOutControl] + and a ; has a fade-out length been specified? + jr z, .noFadeOut + ld a, [wNewSoundID] + and a ; is the new sound ID 0? + jr z, .done ; if so, do nothing xor a - ld [wc0ee], a - ld a, [wcfca] - cp $ff - jr nz, .asm_2414 + ld [wNewSoundID], a + ld a, [wLastMusicSoundID] + cp $ff ; has the music been stopped? + jr nz, .fadeOut ; if not, fade out the current music +; If it has been stopped, start playing the new music immediately. xor a - ld [wMusicHeaderPointer], a -.asm_23e3 + ld [wAudioFadeOutControl], a +.noFadeOut xor a - ld [wc0ee], a + ld [wNewSoundID], a ld a, [H_LOADEDROMBANK] - ld [$ffb9], a - ld a, [wc0ef] + ld [hSavedROMBank], a + ld a, [wAudioROMBank] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a - cp BANK(Audio1_9876) + cp BANK(Audio1_PlaySound) jr nz, .checkForAudio2 -.audio1 + +; audio 1 ld a, b - call Audio1_9876 - jr .asm_240b + call Audio1_PlaySound + jr .next2 + .checkForAudio2 - cp BANK(Audio2_22035) + cp BANK(Audio2_PlaySound) jr nz, .audio3 -.audio2 + +; audio 2 ld a, b - call Audio2_22035 - jr .asm_240b + call Audio2_PlaySound + jr .next2 + .audio3 ld a, b - call Audio3_7d8ea -.asm_240b - ld a, [$ffb9] + call Audio3_PlaySound + +.next2 + ld a, [hSavedROMBank] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a - jr .asm_2425 -.asm_2414 + jr .done + +.fadeOut ld a, b - ld [wcfca], a - ld a, [wMusicHeaderPointer] - ld [wcfc8], a - ld [wcfc9], a + ld [wLastMusicSoundID], a + ld a, [wAudioFadeOutControl] + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a ld a, b - ld [wMusicHeaderPointer], a -.asm_2425 + ld [wAudioFadeOutControl], a + +.done pop bc pop de pop hl diff --git a/home/init.asm b/home/init.asm index 624a4d6a..cb5c6583 100644 --- a/home/init.asm +++ b/home/init.asm @@ -98,8 +98,8 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB ld a, BANK(SFX_Shooting_Star) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, $9c ld [H_AUTOBGTRANSFERDEST + 1], a xor a @@ -127,11 +127,11 @@ ClearVram: StopAllSounds:: ld a, BANK(Audio1_UpdateMusic) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a xor a - ld [wMusicHeaderPointer], a - ld [wc0ee], a - ld [wcfca], a + ld [wAudioFadeOutControl], a + ld [wNewSoundID], a + ld [wLastMusicSoundID], a dec a jp PlaySound diff --git a/home/overworld.asm b/home/overworld.asm index f8d6e7e1..eba47df2 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -658,7 +658,7 @@ CheckMapConnections:: ; 07ba (0:07ba) ld [wCurrentTileBlockMapViewPointer + 1],a .loadNewMap ; load the connected map that was entered call LoadMapHeader - call Func_2312 ; music + call PlayDefaultMusicFadeOutCurrent ld b,$09 call GoPAL_SET ; Since the sprite set shouldn't change, this will just update VRAM slots at @@ -750,16 +750,16 @@ HandleBlackOut:: ld [MBC1RomBank], a call ResetStatusAndHalveMoneyOnBlackout call SpecialWarpIn - call Func_2312 + call PlayDefaultMusicFadeOutCurrent jp SpecialEnterMap StopMusic:: - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .wait - ld a, [wMusicHeaderPointer] + ld a, [wAudioFadeOutControl] and a jr nz, .wait jp StopAllSounds @@ -1224,7 +1224,7 @@ CollisionCheckOnLand:: ; 0bd1 (0:0bd1) call CheckTilePassable jr nc,.noCollision .collision - ld a,[wc02a] + ld a,[wChannelSoundIDs + CH4] cp a,SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION @@ -1927,7 +1927,7 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7) jr z,.stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ld a,[wc02a] + ld a,[wChannelSoundIDs + CH4] cp a,SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION @@ -2279,9 +2279,9 @@ LoadMapHeader:: ; 107c (0:107c) add hl,bc add hl,bc ld a,[hli] - ld [wd35b],a ; music 1 + ld [wMapMusicSoundID],a ; music 1 ld a,[hl] - ld [wd35c],a ; music 2 + ld [wMapMusicROMBank],a ; music 2 pop af ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a @@ -2352,8 +2352,8 @@ LoadMapData:: ; 1241 (0:1241) ld a,[W_FLAGS_D733] bit 1,a jr nz,.restoreRomBank - call Func_235f ; music related - call Func_2312 ; music related + call UpdateMusic6Times + call PlayDefaultMusicFadeOutCurrent .restoreRomBank pop af ld [H_LOADEDROMBANK],a diff --git a/home/vblank.asm b/home/vblank.asm index 6abc3756..3bdbe7cb 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -38,21 +38,21 @@ VBlank:: ld a, [H_VBLANKOCCURRED] and a - jr z, .vblanked + jr z, .skipZeroing xor a ld [H_VBLANKOCCURRED], a -.vblanked +.skipZeroing ld a, [H_FRAMECOUNTER] and a - jr z, .decced + jr z, .skipDec dec a ld [H_FRAMECOUNTER], a -.decced - call Func_28cb +.skipDec + call FadeOutAudio - ld a, [wc0ef] ; music ROM bank + ld a, [wAudioROMBank] ; music ROM bank ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a diff --git a/hram.asm b/hram.asm index 2f70b91a..3f331cfb 100644 --- a/hram.asm +++ b/hram.asm @@ -182,7 +182,9 @@ hJoy5 EQU $FFB5 hJoy6 EQU $FFB6 hJoy7 EQU $FFB7 -H_LOADEDROMBANK EQU $FFB8 +H_LOADEDROMBANK EQU $FFB8 + +hSavedROMBank EQU $FFB9 ; is automatic background transfer during V-blank enabled? ; if nonzero, yes diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 158a683d..d5aa57c1 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -65,7 +65,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) and a jr z, .asm_19512 ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .asm_19512 ld c, BANK(Music_MeetRival) @@ -172,7 +172,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $1 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index c52f00cf..db6fa696 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -511,7 +511,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) ld [hJoyHeld], a call EnableAutoTextBoxDrawing ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $15 @@ -612,7 +612,7 @@ OaksLabScript16: ; 1cf12 (7:4f12) call FillMemory ld [hl], $ff ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $1 diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 584878eb..25c07be6 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -59,9 +59,9 @@ PewterPokecenterText3: ; 5c59b (17:459b) ld c, 24 call DelayFrames - ld a, [wc026] + ld a, [wChannelSoundIDs] ld b, a - ld a, [wc027] + ld a, [wChannelSoundIDs + CH1] or b jr nz, .loop diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index a569b60b..5422d887 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -23,7 +23,7 @@ PokemonTower2Script0: ; 6050f (18:450f) call ArePlayerCoordsInArray ret nc ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -77,7 +77,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $2 diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index 09ce97dc..f9c7193f 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -29,14 +29,14 @@ MomHealPokemon: ; 4818a (12:418a) call ReloadMapData predef HealParty ld a, MUSIC_PKMN_HEALED - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .next - ld a, [wc026] + ld a, [wChannelSoundIDs] cp MUSIC_PKMN_HEALED jr z, .next - ld a, [wd35b] - ld [wc0ee], a + ld a, [wMapMusicSoundID] + ld [wNewSoundID], a call PlaySound call GBFadeInFromWhite ld hl, MomHealText2 diff --git a/scripts/route22.asm b/scripts/route22.asm index 041f75e6..f6f6778e 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -89,7 +89,7 @@ Route22Script0: ; 50f00 (14:4f00) and a jr z, .asm_50f4e ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .asm_50f4e ld c, BANK(Music_MeetRival) @@ -168,7 +168,7 @@ Route22Script2: ; 50fb5 (14:4fb5) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, [wcf0d] @@ -242,11 +242,11 @@ Route22Script_5104e: ; 5104e (14:504e) and a jr z, .skipYVisibilityTesta ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .skipYVisibilityTesta ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateTempo ld a, $2 @@ -327,7 +327,7 @@ Route22Script5: ; 510df (14:50df) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStartAndTempo ld a, [wcf0d] diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 525405c7..0de4b324 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -131,7 +131,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -220,7 +220,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld de, MovementData_51d1d diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index b95c5723..c4afd9d0 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -25,7 +25,7 @@ SSAnne2Script0: ; 613be (18:53be) call ArePlayerCoordsInArray ret nc ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -146,7 +146,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $3 diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index b99f5bb2..911dac7f 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -44,21 +44,21 @@ SSAnne7Text1: ; 618ad (18:58ad) SSAnne7RubText: ; 618ec (18:58ec) TX_FAR _SSAnne7RubText TX_ASM - ld a, [wc0ef] + ld a, [wAudioROMBank] cp BANK(Audio3_UpdateMusic) - ld [wc0f0], a + ld [wAudioSavedROMBank], a jr nz, .asm_61908 ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, Bank(Music_PkmnHealed) - ld [wc0ef], a + ld [wAudioROMBank], a .asm_61908 ld a, MUSIC_PKMN_HEALED - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .asm_61910 - ld a, [wc026] + ld a, [wChannelSoundIDs] cp MUSIC_PKMN_HEALED jr z, .asm_61910 call PlayDefaultMusic diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index a65b3603..8c2173cc 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -40,7 +40,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) SetEventForceReuseHL EVENT_SS_ANNE_LEFT ld a, $ff ld [wJoyIgnore], a - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, BANK(Music_Surfing) ld a, MUSIC_SURFING diff --git a/wram.asm b/wram.asm index 872d1e8e..2fc94e8d 100755 --- a/wram.asm +++ b/wram.asm @@ -61,66 +61,146 @@ ENDM SECTION "WRAM Bank 0", WRAM0 -wc000:: ds 1 -wc001:: ds 1 -wc002:: ds 1 -wc003:: ds 1 -wc004:: ds 1 -wc005:: ds 1 -wc006:: ds 8 -wc00e:: ds 4 -wc012:: ds 4 -wc016:: ds 16 -wc026:: ds 1 -wc027:: ds 1 -wc028:: ds 2 -wc02a:: ds 1 -wc02b:: ds 1 -wc02c:: ds 1 -wc02d:: ds 1 -wc02e:: ds 8 -wc036:: ds 8 -wc03e:: ds 8 -wc046:: ds 8 -wc04e:: ds 8 -wc056:: ds 8 -wc05e:: ds 8 -wc066:: ds 8 -wc06e:: ds 8 -wc076:: ds 8 -wc07e:: ds 8 -wc086:: ds 8 -wc08e:: ds 8 -wc096:: ds 8 -wc09e:: ds 8 -wc0a6:: ds 8 -wc0ae:: ds 8 -wc0b6:: ds 8 -wc0be:: ds 8 -wc0c6:: ds 8 -wc0ce:: ds 1 -wc0cf:: ds 1 -wc0d0:: ds 1 -wc0d1:: ds 1 -wc0d2:: ds 1 -wc0d3:: ds 1 -wc0d4:: ds 1 -wc0d5:: ds 1 -wc0d6:: ds 8 -wc0de:: ds 8 -wc0e6:: ds 1 -wc0e7:: ds 1 -wc0e8:: ds 1 -wc0e9:: ds 1 -wc0ea:: ds 1 -wc0eb:: ds 1 -wc0ec:: ds 1 -wc0ed:: ds 1 -wc0ee:: ds 1 -wc0ef:: ds 1 -wc0f0:: ds 1 -wc0f1:: ds 1 -wc0f2:: ds 14 +wUnusedC000:: ; c000 + ds 1 + +wSoundID:: ; c001 + ds 1 + +wMuteAudioAndPauseMusic:: ; c002 +; bit 7: whether sound has been muted +; all bits: whether the effective is active +; Store 1 to activate effect (any value in the range [1, 127] works). +; All audio is muted and music is paused. Sfx continues playing until it +; ends normally. +; Store 0 to resume music. + ds 1 + +wDisableChannelOutputWhenSfxEnds:: ; c003 + ds 1 + +wStereoPanning:: ; c004 + ds 1 + +wSavedVolume:: ; c005 + ds 1 + +wChannelCommandPointers:: ; c006 + ds 16 + +wChannelReturnAddresses:: ; c016 + ds 16 + +wChannelSoundIDs:: ; c026 + ds 8 + +wChannelFlags1:: ; c02e + ds 8 + +wChannelFlags2:: ; c036 + ds 8 + +wChannelDuties:: ; c03e + ds 8 + +wChannelDutyCycles:: ; c046 + ds 8 + +wChannelVibratoDelayCounters:: ; c04e +; reloaded at the beginning of a note. counts down until the vibrato begins. + ds 8 + +wChannelVibratoExtents:: ; c056 + ds 8 + +wChannelVibratoRates:: ; c05e +; high nybble is rate (counter reload value) and low nybble is counter. +; time between applications of vibrato. + ds 8 + +wChannelFrequencyLowBytes:: ; c066 + ds 8 + +wChannelVibratoDelayCounterReloadValues:: ; c06e +; delay of the beginning of the vibrato from the start of the note + ds 8 + +wChannelPitchBendLengthModifiers:: ; c076 + ds 8 + +wChannelPitchBendFrequencySteps:: ; c07e + ds 8 + +wChannelPitchBendFrequencyStepsFractionalPart:: ; c086 + ds 8 + +wChannelPitchBendCurrentFrequencyFractionalPart:: ; c08e + ds 8 + +wChannelPitchBendCurrentFrequencyHighBytes:: ; c096 + ds 8 + +wChannelPitchBendCurrentFrequencyLowBytes:: ; c09e + ds 8 + +wChannelPitchBendTargetFrequencyHighBytes:: ; c0a6 + ds 8 + +wChannelPitchBendTargetFrequencyLowBytes:: ; c0ae + ds 8 + +wChannelNoteDelayCounters:: ; c0b6 +; Note delays are stored as 16-bit fixed-point numbers where the integer part +; is 8 bits and the fractional part is 8 bits. + ds 8 + +wChannelLoopCounters:: ; c0be + ds 8 + +wChannelNoteSpeeds:: ; c0c6 + ds 8 + +wChannelNoteDelayCountersFractionalPart:: ; c0ce + ds 8 + +wChannelOctaves:: ; c0d6 + ds 8 + +wChannelVolumes:: ; c0de +; also includes fade for hardware channels that support it + ds 8 + +wMusicWaveInstrument:: + ds 1 + +wSfxWaveInstrument:: + ds 1 + +wMusicTempo:: ; c0e8 + ds 2 + +wSfxTempo:: ; c0ea + ds 2 + +wSfxHeaderPointer:: ; c0ec + ds 2 + +wNewSoundID:: ; c0ee + ds 1 + +wAudioROMBank:: ; c0ef + ds 1 + +wAudioSavedROMBank:: ; c0f0 + ds 1 + +wFrequencyModifier:: ; c0f1 + ds 1 + +wTempoModifier:: ; c0f2 + ds 1 + + ds 13 SECTION "Sprite State Data", WRAM0[$c100] @@ -1289,13 +1369,35 @@ wTileInFrontOfPlayer:: ; cfc6 ; background tile number in front of the player (either 1 or 2 steps ahead) ds 1 -wMusicHeaderPointer:: ; cfc7 -; (the current music channel address - $4000) / 3 +wAudioFadeOutControl:: ; cfc7 +; The desired fade counter reload value is stored here prior to calling +; PlaySound in order to cause the current music to fade out before the new +; music begins playing. Storing 0 causes no fade out to occur and the new music +; to begin immediately. +; This variable has another use related to fade-out, as well. PlaySound stores +; the sound ID of the music that should be played after the fade-out is finished +; in this variable. FadeOutAudio checks if it's non-zero every V-Blank and +; fades out the current audio if it is. Once it has finished fading out the +; audio, it zeroes this variable and starts playing the sound ID stored in it. ds 1 -wcfc8:: ds 1 ; used with audio -wcfc9:: ds 1 ; also used with audio -wcfca:: ds 1 ; also used with audio too +wAudioFadeOutCounterReloadValue:: ; cfc8 + ds 1 + +wAudioFadeOutCounter:: ; cfc9 + ds 1 + +wLastMusicSoundID:: ; cfca +; This is used to determine whether the default music is already playing when +; attempting to play the default music (in order to avoid restarting the same +; music) and whether the music has already been stopped when attempting to +; fade out the current music (so that the new music can be begin immediately +; instead of waiting). +; It sometimes contains the sound ID of the last music played, but it may also +; contain $ff (if the music has been stopped) or 0 (because some routines zero +; it in order to prevent assumptions from being made about the current state of +; the music). + ds 1 wUpdateSpritesEnabled:: ; cfcb ; $00 = causes sprites to be hidden and the value to change to $ff @@ -2126,8 +2228,11 @@ wLetterPrintingDelayFlags:: ; d358 wPlayerID:: ; d359 ds 2 -wd35b:: ds 1 ; used with audio stuff -wd35c:: ds 1 ; storage for audio bank for current map? +wMapMusicSoundID:: ; d35b + ds 1 + +wMapMusicROMBank:: ; d35c + ds 1 wMapPalOffset:: ; d35d ; offset subtracted from FadePal4 to get the background and object palettes for the current map -- cgit v1.3.1-sl0p From fb0a630c062cbb18026abe2792339dea27fac4d8 Mon Sep 17 00:00:00 2001 From: dannye Date: Tue, 11 Aug 2015 00:34:32 -0500 Subject: More joypad constants --- engine/hidden_object_functions17.asm | 48 +++++++++++++++++++----------------- engine/hidden_object_functions7.asm | 24 +++++++++--------- engine/learn_move.asm | 14 +++++------ engine/menu/main_menu.asm | 5 ++-- engine/menu/pokedex.asm | 3 ++- engine/menu/prize_menu.asm | 2 +- engine/menu/start_sub_menus.asm | 4 +-- engine/oak_speech2.asm | 2 +- engine/save.asm | 2 +- main.asm | 2 +- scripts/bikeshop.asm | 20 +++++++-------- scripts/celadonmartroof.asm | 4 +-- text/maps/bike_shop.asm | 4 +-- 13 files changed, 70 insertions(+), 64 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index a2167b54..77f3eeb9 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -98,7 +98,7 @@ LinkCableHelp: ; 5dc29 (17:5c29) ld [W_ANIMATIONID], a ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld a, $3 + ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a ld a, $3 ld [wMaxMenuItem], a @@ -106,7 +106,7 @@ LinkCableHelp: ; 5dc29 (17:5c29) ld [wTopMenuItemY], a ld a, $1 ld [wTopMenuItemX], a -.asm_5c51 +.linkHelpLoop ld hl, wd730 set 6, [hl] coord hl, 0, 0 @@ -119,11 +119,11 @@ LinkCableHelp: ; 5dc29 (17:5c29) ld hl, LinkCableHelpText2 call PrintText call HandleMenuInput - bit 1, a - jr nz, .asm_5dc93 + bit 1, a ; pressed b + jr nz, .exit ld a, [wCurrentMenuItem] - cp $3 - jr z, .asm_5dc93 + cp $3 ; pressed a on "STOP READING" + jr z, .exit ld hl, wd730 res 6, [hl] ld hl, LinkCableInfoTexts @@ -135,8 +135,8 @@ LinkCableHelp: ; 5dc29 (17:5c29) ld h, [hl] ld l, a call PrintText - jp .asm_5c51 -.asm_5dc93 + jp .linkHelpLoop +.exit ld hl, wd730 res 6, [hl] call LoadScreenTilesFromBuffer1 @@ -182,7 +182,7 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) ld [W_ANIMATIONID], a ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld a, $33 + ld a, D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a ld a, $2 ld [wMaxMenuItem], a @@ -190,7 +190,7 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) ld [wTopMenuItemY], a ld a, $1 ld [wTopMenuItemX], a -.asm_5dd15 +.blackboardLoop ld hl, wd730 set 6, [hl] coord hl, 0, 0 @@ -204,11 +204,12 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) call PlaceString ld hl, ViridianSchoolBlackboardText2 call PrintText - call HandleMenuInput - bit 1, a + call HandleMenuInput ; pressing up and down is handled in here + bit 1, a ; pressed b jr nz, .exitBlackboard - bit 4, a - jr z, .asm_5dd5c + bit 4, a ; pressed right + jr z, .didNotPressRight + ; move cursor to right column ld a, $2 ld [wMaxMenuItem], a ld a, $2 @@ -217,10 +218,11 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) ld [wTopMenuItemX], a ld a, $3 ld [W_ANIMATIONID], a - jr .asm_5dd15 -.asm_5dd5c - bit 5, a - jr z, .asm_5dd75 + jr .blackboardLoop +.didNotPressRight + bit 5, a ; pressed left + jr z, .didNotPressLeftOrRight + ; move cursor to left column ld a, $2 ld [wMaxMenuItem], a ld a, $2 @@ -229,14 +231,16 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) ld [wTopMenuItemX], a xor a ld [W_ANIMATIONID], a - jr .asm_5dd15 -.asm_5dd75 + jr .blackboardLoop +.didNotPressLeftOrRight ld a, [wCurrentMenuItem] ld b, a ld a, [W_ANIMATIONID] add b - cp $5 + cp $5 ; cursor is pointing to "QUIT" jr z, .exitBlackboard + ; we must have pressed a on a status condition + ; so print the text ld hl, wd730 res 6, [hl] ld hl, ViridianBlackboardStatusPointers @@ -248,7 +252,7 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) ld h, [hl] ld l, a call PrintText - jp .asm_5dd15 + jp .blackboardLoop .exitBlackboard ld hl, wd730 res 6, [hl] diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 67e75301..02d3928a 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -394,7 +394,7 @@ BillsHousePokemonList: ; 1ec05 (7:6c05) ld [W_ANIMATIONID], a ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld a, $3 + ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a ld a, $4 ld [wMaxMenuItem], a @@ -402,7 +402,7 @@ BillsHousePokemonList: ; 1ec05 (7:6c05) ld [wTopMenuItemY], a ld a, $1 ld [wTopMenuItemX], a -.asm_1ec2d +.billsPokemonLoop ld hl, wd730 set 6, [hl] coord hl, 0, 0 @@ -416,24 +416,24 @@ BillsHousePokemonList: ; 1ec05 (7:6c05) call PrintText call SaveScreenTilesToBuffer2 call HandleMenuInput - bit 1, a - jr nz, .asm_1ec74 + bit 1, a ; pressed b + jr nz, .cancel ld a, [wCurrentMenuItem] add EEVEE cp EEVEE - jr z, .asm_1ec6c + jr z, .displayPokedex cp FLAREON - jr z, .asm_1ec6c + jr z, .displayPokedex cp JOLTEON - jr z, .asm_1ec6c + jr z, .displayPokedex cp VAPOREON - jr z, .asm_1ec6c - jr .asm_1ec74 -.asm_1ec6c + jr z, .displayPokedex + jr .cancel +.displayPokedex call DisplayPokedex call LoadScreenTilesFromBuffer2 - jr .asm_1ec2d -.asm_1ec74 + jr .billsPokemonLoop +.cancel ld hl, wd730 res 6, [hl] call LoadScreenTilesFromBuffer2 diff --git a/engine/learn_move.asm b/engine/learn_move.asm index aeb7d23d..46d30bd9 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -116,7 +116,7 @@ TryingToLearn: ; 6f07 (1:6f07) call CopyData callab FormatMovesString pop hl -.asm_6f39 +.loop push hl ld hl, WhichMoveToForgetText call PrintText @@ -155,8 +155,8 @@ TryingToLearn: ; 6f07 (1:6f07) call LoadScreenTilesFromBuffer1 pop af pop hl - bit 1, a - jr nz, .asm_6fab + bit 1, a ; pressed b + jr nz, .cancel push hl ld a, [wCurrentMenuItem] ld c, a @@ -169,17 +169,17 @@ TryingToLearn: ; 6f07 (1:6f07) pop bc pop de ld a, d - jr c, .asm_6fa2 + jr c, .hm pop hl add hl, bc and a ret -.asm_6fa2 +.hm ld hl, HMCantDeleteText call PrintText pop hl - jr .asm_6f39 -.asm_6fab + jr .loop +.cancel scf ret diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 5e853aae..24302c46 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -61,7 +61,7 @@ MainMenu: ; 5af2 (1:5af2) ld [wTopMenuItemX],a inc a ld [wTopMenuItemY],a - ld a,$B + ld a,A_BUTTON | B_BUTTON | START ld [wMenuWatchedKeys],a ld a,[wSaveFileStatus] ld [wMaxMenuItem],a @@ -163,7 +163,8 @@ LinkMenu: ; 5c0a (1:5c0a) ld a, $2 ld [hli], a inc a - ld [hli], a + ; ld a, A_BUTTON | B_BUTTON + ld [hli], a ; wMenuWatchedKeys xor a ld [hl], a .waitForInputLoop diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index fd8a928d..8e69329a 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -27,7 +27,7 @@ ShowPokedexMenu: ; 40000 (10:4000) inc hl ld a,6 ld [hli],a ; max menu item ID - ld [hl],%00110011 ; menu watched keys (Left, Right, B button, A button) + ld [hl],D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON call HandlePokedexListMenu jr c,.goToSideMenu ; if the player chose a pokemon from the list .exitPokedex @@ -88,6 +88,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) inc hl ld a,3 ld [hli],a ; max menu item ID + ;ld a, A_BUTTON | B_BUTTON ld [hli],a ; menu watched keys (A button and B button) xor a ld [hli],a ; old menu item ID diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index 2bf932ba..409f0bdb 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -13,7 +13,7 @@ CeladonPrizeMenu: ; 5271b (14:671b) xor a ld [wCurrentMenuItem],a ld [wLastMenuItem],a - ld a,$03 + ld a,A_BUTTON | B_BUTTON ld [wMenuWatchedKeys],a ld a,$03 ld [wMaxMenuItem],a diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 4dc84d06..f726f128 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -57,7 +57,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) inc hl ld a,b ld [hli],a ; max menu item ID - ld a,%00000011 ; A button, B button + ld a,A_BUTTON | B_BUTTON ld [hli],a ; menu watched keys xor a ld [hl],a @@ -354,7 +354,7 @@ StartMenu_Item: ; 13302 (4:7302) inc hl inc a ; a = 1 ld [hli],a ; max menu item ID - ld a,%00000011 ; A button, B button + ld a,A_BUTTON | B_BUTTON ld [hli],a ; menu watched keys xor a ld [hl],a ; old menu item id diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 23f39fd5..673c13ad 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -177,7 +177,7 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c) ld [wLastMenuItem], a inc a ld [wTopMenuItemX], a - ld [wMenuWatchedKeys], a + ld [wMenuWatchedKeys], a ; A_BUTTON inc a ld [wTopMenuItemY], a inc a diff --git a/engine/save.asm b/engine/save.asm index 26f9507f..ae895d96 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -356,7 +356,7 @@ ChangeBox:: ; 738a1 (1c:78a1) call HandleMenuInput ld hl, hFlags_0xFFF6 res 1, [hl] - bit 1, a + bit 1, a ; pressed b ret nz call GetBoxSRAMLocation ld e, l diff --git a/main.asm b/main.asm index 7c047dbd..8e41af64 100755 --- a/main.asm +++ b/main.asm @@ -1082,7 +1082,7 @@ DrawStartMenu: ; 710b (1:710b) ld c,$08 .drawTextBoxBorder call TextBoxBorder - ld a,%11001011 ; bit mask for down, up, start, B, and A buttons + ld a,D_DOWN | D_UP | START | B_BUTTON | A_BUTTON ld [wMenuWatchedKeys],a ld a,$02 ld [wTopMenuItemY],a ; Y position of first menu choice diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index cf717b43..e639caf9 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -39,7 +39,7 @@ BikeShopText1: ; 1d745 (7:5745) xor a ld [wCurrentMenuItem], a ld [wLastMenuItem], a - ld a, $3 + ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a ld a, $1 ld [wMaxMenuItem], a @@ -64,16 +64,16 @@ BikeShopText1: ; 1d745 (7:5745) call PrintText call HandleMenuInput bit 1, a - jr nz, .asm_b7579 + jr nz, .cancel ld hl, wd730 res 6, [hl] ld a, [wCurrentMenuItem] and a - jr nz, .asm_b7579 - ld hl, BikeShopText_1d81a + jr nz, .cancel + ld hl, BikeShopCantAffordText call PrintText -.asm_b7579 - ld hl, BikeShopText_1d82a +.cancel + ld hl, BikeShopComeAgainText call PrintText .Done jp TextScriptEnd @@ -93,8 +93,8 @@ BikeShopText_1d815: ; 1d815 (7:5815) TX_FAR _BikeShopText_1d815 db "@" -BikeShopText_1d81a: ; 1d81a (7:581a) - TX_FAR _BikeShopText_1d81a +BikeShopCantAffordText: ; 1d81a (7:581a) + TX_FAR _BikeShopCantAffordText db "@" BikeShopText_1d81f: ; 1d81f (7:581f) @@ -105,8 +105,8 @@ BikeShopText_1d824: ; 1d824 (7:5824) TX_FAR _BikeShopText_1d824 db $11, "@" -BikeShopText_1d82a: ; 1d82a (7:582a) - TX_FAR _BikeShopText_1d82a +BikeShopComeAgainText: ; 1d82a (7:582a) + TX_FAR _BikeShopComeAgainText db "@" BikeShopText_1d82f: ; 1d82f (7:582f) diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 8eeb5d2b..4a90535a 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -46,7 +46,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) call PrintText xor a ld [wCurrentMenuItem], a - ld a, $3 + ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a ld a, [wcd37] dec a @@ -70,7 +70,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) ld hl, wd730 res 6, [hl] call HandleMenuInput - bit 1, a + bit 1, a ; pressed b ret nz ld hl, wcc5b ld a, [wCurrentMenuItem] diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 5f2c3f45..45341c66 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -11,7 +11,7 @@ _BikeShopText_1d815:: ; 98e45 (26:4e45) line "Do you want it?" done -_BikeShopText_1d81a:: ; 98e67 (26:4e67) +_BikeShopCantAffordText:: ; 98e67 (26:4e67) text "Sorry! You can't" line "afford it!" prompt @@ -29,7 +29,7 @@ _BikeShopText_1d824:: ; 98eb2 (26:4eb2) line "the BIKE VOUCHER" cont "for a BICYCLE.@@" -_BikeShopText_1d82a:: ; 98ee0 (26:4ee0) +_BikeShopComeAgainText:: ; 98ee0 (26:4ee0) text "Come back again" line "some time!" done -- cgit v1.3.1-sl0p From 64cfbcce7a71e6e75553575490fd60cbd61a5665 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Wed, 12 Aug 2015 02:16:56 -0700 Subject: commented SGB palette stuff --- constants/misc_constants.asm | 5 + constants/palette_constants.asm | 16 ++ data/sgb_packets.asm | 76 +++--- engine/battle/animations.asm | 4 +- engine/battle/core.asm | 40 ++-- engine/battle/init_battle_variables.asm | 6 +- engine/battle/scroll_draw_trainer_pic.asm | 4 +- engine/clear_save.asm | 2 +- engine/evolution.asm | 16 +- engine/hall_of_fame.asm | 8 +- engine/intro.asm | 8 +- engine/items/items.asm | 12 +- engine/menu/bills_pc.asm | 2 +- engine/menu/diploma.asm | 4 +- engine/menu/league_pc.asm | 8 +- engine/menu/main_menu.asm | 2 +- engine/menu/naming_screen.asm | 6 +- engine/menu/party_menu.asm | 24 +- engine/menu/pokedex.asm | 12 +- engine/menu/start_sub_menus.asm | 8 +- engine/menu/status_screen.asm | 6 +- engine/mon_party_sprites.asm | 4 +- engine/palettes.asm | 373 ++++++++++++++++-------------- engine/predefs.asm | 2 +- engine/slot_machine.asm | 6 +- engine/titlescreen.asm | 4 +- engine/town_map.asm | 6 +- engine/trade.asm | 12 +- home.asm | 8 +- home/overworld.asm | 8 +- home/vblank.asm | 2 +- hram.asm | 2 + main.asm | 2 +- wram.asm | 46 +++- 34 files changed, 409 insertions(+), 335 deletions(-) (limited to 'engine/menu/pokedex.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 00afa755..5d940328 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -159,6 +159,11 @@ BIT_LEADING_ZEROES EQU 7 LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) +; HP bar +HP_BAR_GREEN EQU 0 +HP_BAR_YELLOW EQU 1 +HP_BAR_RED EQU 2 + ; serial ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 2a871462..ca2e103a 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -1,3 +1,19 @@ +SET_PAL_BATTLE_BLACK EQU $00 +SET_PAL_BATTLE EQU $01 +SET_PAL_TOWN_MAP EQU $02 +SET_PAL_STATUS_SCREEN EQU $03 +SET_PAL_POKEDEX EQU $04 +SET_PAL_SLOTS EQU $05 +SET_PAL_TITLE_SCREEN EQU $06 +SET_PAL_NIDORINO_INTRO EQU $07 +SET_PAL_GENERIC EQU $08 +SET_PAL_OVERWORLD EQU $09 +SET_PAL_PARTY_MENU EQU $0A +SET_PAL_POKEMON_WHOLE_SCREEN EQU $0B +SET_PAL_GAME_FREAK_INTRO EQU $0C +SET_PAL_TRAINER_CARD EQU $0D +UPDATE_PARTY_MENU_BLK_PACKET EQU $FC + ; super game boy palettes const_value = 0 diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index 3e5e3f0b..f810db8f 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -60,11 +60,11 @@ BlkPacket_WholeScreen: ; 7219e (1c:619e) BlkPacket_Battle: ; 721b5 (1c:61b5) ATTR_BLK 5 - ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 - ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 - ATTR_BLK_DATA %011, 0,0,0, 10,07, 19,10 - ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11 - ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06 + ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 ; message box: pal 2 + ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1 + ATTR_BLK_DATA %011, 0,0,0, 10,07, 19,10 ; player HP bar: pal 0 + ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11 ; player mon: pal 2 + ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06 ; enemy mon : pal 3 db $03,$00,$00,$13,$0b,$00 db $03,$00,$0c,$13,$11,$02 @@ -76,7 +76,7 @@ BlkPacket_Battle: ; 721b5 (1c:61b5) BlkPacket_StatusScreen: ; 721fa (1c:61fa) ATTR_BLK 1 - ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 + ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 ; mon: pal 1, HP bar: pal 0 ds 8 db $02,$00,$00,$11,$00,$03 @@ -86,7 +86,7 @@ BlkPacket_StatusScreen: ; 721fa (1c:61fa) BlkPacket_Pokedex: ; 72222 (1c:6222) ATTR_BLK 1 - ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 + ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 ; mon: pal 1, everything else: pal 0 ds 8 db $02,$00,$00,$11,$00,$01 @@ -97,11 +97,11 @@ BlkPacket_Pokedex: ; 72222 (1c:6222) BlkPacket_Slots: ; 7224f (1c:624f) ATTR_BLK 5 - ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 - ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 - ATTR_BLK_DATA %010, 3,3,0, 00,06, 19,07 - ATTR_BLK_DATA %011, 0,0,0, 04,04, 15,09 - ATTR_BLK_DATA %011, 0,0,0, 00,12, 19,17 + ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1 + ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2 + ATTR_BLK_DATA %010, 3,3,0, 00,06, 19,07 ; "1" row: pal 3 + ATTR_BLK_DATA %011, 0,0,0, 04,04, 15,09 ; slot reels: pal 0 + ATTR_BLK_DATA %011, 0,0,0, 00,12, 19,17 ; message box: pal 0 db $03,$00,$00,$13,$0b,$01 db $03,$00,$04,$13,$09,$02 @@ -112,9 +112,9 @@ BlkPacket_Slots: ; 7224f (1c:624f) BlkPacket_Titlescreen: ; 7228e (1c:628e) ATTR_BLK 3 - ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 - ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 - ATTR_BLK_DATA %011, 2,2,0, 00,10, 19,17 + ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo: pal 0 + ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 ; version text: pal 1 + ATTR_BLK_DATA %011, 2,2,0, 00,10, 19,17 ; player, mon, copyright text: pal 2 ds 12 db $03,$00,$00,$13,$07,$00 @@ -124,9 +124,9 @@ BlkPacket_Titlescreen: ; 7228e (1c:628e) BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) ATTR_BLK 3 - ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 - ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 - ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 + ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1 + ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0 + ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 ; lower black bar: pal 1 ds 12 db $03,$00,$00,$13,$03,$01 @@ -136,13 +136,13 @@ BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) BlkPacket_PartyMenu: ; 722f4 (1c:62f4) ATTR_BLK 7 - ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 - ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 - ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03 - ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05 - ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 - ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 - ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 + ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 ; mon sprites: pal 0, everything else: pal 1 + ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 ; HP bar 0: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03 ; HP bar 1: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05 ; HP bar 2: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 ; HP bar 3: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 ; HP bar 4: pal set dynamically + ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 ; HP bar 5: pal set dynamically ds 4 db $02,$00,$00,$11,$01,$03 @@ -158,16 +158,16 @@ BlkPacket_PartyMenu: ; 722f4 (1c:62f4) BlkPacket_TrainerCard: ; 72360 (1c:6360) ATTR_BLK 10 - ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 - ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 - ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 - ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 - ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,14 - ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,14 - ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 - ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 - ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 - ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 + ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 ; Boulder Badge + ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 ; Cascade Badge + ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 ; Thunder Badge + ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 ; Rainbow Badge + ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,14 ; Rainbow Badge + ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,14 ; Rainbow Badge + ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 ; Soul Badge + ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 ; Marsh Badge + ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 ; Volcano Badge + ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 ; Earth Badge ds 2 db $03,$03,$0c,$04,$0d,$00 @@ -184,9 +184,9 @@ BlkPacket_TrainerCard: ; 72360 (1c:6360) BlkPacket_GameFreakIntro: ; 723dd (1c:63dd) ATTR_BLK 3 - ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 - ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 - ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 + ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 ; falling stars (left): pal 1, GameFreak logo: pal 0 + ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 ; falling stars (middle): pal 2 + ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 ; falling stars (right): pal 3 ds 12 db $03,$00,$00,$13,$0a,$00 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 1bd48988..6d0f0e5f 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2170,8 +2170,8 @@ ChangeMonPic: ; 79793 (1e:5793) pop af ld [wBattleMonSpecies2], a .done - ld b, $1 - jp GoPAL_SET + ld b, SET_PAL_BATTLE + jp RunPaletteCommand AnimationHideEnemyMonPic: ; 797d8 (1e:57d8) ; Hides the enemy mon's sprite diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9dbcf179..e2a9e5a7 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -184,8 +184,8 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) inc a ld [H_AUTOBGTRANSFERENABLED], a call Delay3 - ld b, $1 - call GoPAL_SET + ld b, SET_PAL_BATTLE + call RunPaletteCommand call HideSprites jpab PrintBeginningBattleText @@ -976,7 +976,7 @@ AnyEnemyPokemonAliveCheck: ; 3c64f (f:464f) ; stores whether enemy ran in Z flag ReplaceFaintedEnemyMon: ; 3c664 (f:4664) - ld hl, wcf1e + ld hl, wEnemyHPBarColor ld e, $30 call GetBattleHealthBarColor callab DrawEnemyPokeballs @@ -1199,7 +1199,7 @@ ChooseNextMon: ; 3c7d8 (f:47d8) call GBPalWhiteOut call LoadHudTilePatterns call LoadScreenTilesFromBuffer1 - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call GBPalNormal call SendOutMon ld hl, wEnemyMonHP @@ -1228,8 +1228,8 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) cp OAKS_LAB ret z ; starter battle in oak's lab: don't black out .notSony1Battle - ld b, $0 - call GoPAL_SET + ld b, SET_PAL_BATTLE_BLACK + call RunPaletteCommand ld hl, PlayerBlackedOutText2 ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -1494,8 +1494,8 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) coord hl, 0, 0 lb bc, 4, 11 call ClearScreenArea - ld b,1 - call GoPAL_SET + ld b, SET_PAL_BATTLE + call RunPaletteCommand call GBPalNormal ld hl,TrainerSentOutText call PrintText @@ -1829,8 +1829,8 @@ SendOutMon: ; 3cc91 (f:4c91) ld [W_PLAYERDISABLEDMOVE], a ld [wPlayerDisabledMoveNumber], a ld [wPlayerMonMinimized], a - ld b, $1 - call GoPAL_SET + ld b, SET_PAL_BATTLE + call RunPaletteCommand ld hl, W_ENEMYBATTSTATUS1 res UsingTrappingMove, [hl] ld a, $1 @@ -1926,7 +1926,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) predef DrawHP ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a - ld hl, wcf1d + ld hl, wPlayerHPBarColor call GetBattleHealthBarColor ld hl, wBattleMonHP ld a, [hli] @@ -1935,8 +1935,8 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) ld a, [wccf6] and a ret nz - ld a, [wcf1d] - cp $2 + ld a, [wPlayerHPBarColor] + cp HP_BAR_RED jr z, .asm_3cde6 .asm_3cdd9 ld hl, wLowHealthAlarm @@ -2039,7 +2039,7 @@ DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) call DrawHPBar ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a - ld hl, wcf1e + ld hl, wEnemyHPBarColor GetBattleHealthBarColor: ; 3ce90 (f:4e90) ld b, [hl] @@ -2047,8 +2047,8 @@ GetBattleHealthBarColor: ; 3ce90 (f:4e90) ld a, [hl] cp b ret z - ld b, $1 - jp GoPAL_SET + ld b, SET_PAL_BATTLE + jp RunPaletteCommand ; center's mon's name on the battle screen ; if the name is 1 or 2 letters long, it is printed 2 spaces more to the right than usual @@ -2397,7 +2397,7 @@ PartyMenuOrRockOrRun: call GBPalWhiteOut call LoadHudTilePatterns call LoadScreenTilesFromBuffer2 - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call GBPalNormal jp DisplayBattleMenu .partyMonDeselected @@ -2486,7 +2486,7 @@ PartyMenuOrRockOrRun: call ClearSprites call LoadHudTilePatterns call LoadScreenTilesFromBuffer1 - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call GBPalNormal ; fall through to SwitchPlayerMon @@ -6932,8 +6932,8 @@ InitWildBattle: ; 3ef8b (f:6f8b) ; common code that executes after init battle code specific to trainer or wild battles InitBattle_Common: ; 3efeb (f:6feb) - ld b, $0 - call GoPAL_SET + ld b, SET_PAL_BATTLE_BLACK + call RunPaletteCommand call SlidePlayerAndEnemySilhouettesOnScreen xor a ld [H_AUTOBGTRANSFERENABLED], a diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 3c926858..071e5c67 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -16,9 +16,9 @@ InitBattleVariables: ; 525af (14:65af) ld [wPlayerMonNumber], a ld [wEscapedFromBattle], a ld [wMapPalOffset], a - ld hl, wcf1d - ld [hli], a - ld [hl], a + ld hl, wPlayerHPBarColor + ld [hli], a ; wPlayerHPBarColor + ld [hl], a ; wEnemyHPBarColor ld hl, wCanEvolveFlags ld b, $3c .loop diff --git a/engine/battle/scroll_draw_trainer_pic.asm b/engine/battle/scroll_draw_trainer_pic.asm index b32650e3..5949208c 100644 --- a/engine/battle/scroll_draw_trainer_pic.asm +++ b/engine/battle/scroll_draw_trainer_pic.asm @@ -3,8 +3,8 @@ _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3) ; the screen from the right. xor a ld [wEnemyMonSpecies2], a - ld b, $1 - call GoPAL_SET + ld b, SET_PAL_BATTLE + call RunPaletteCommand callab _LoadTrainerPic coord hl, 19, 0 ld c, $0 diff --git a/engine/clear_save.asm b/engine/clear_save.asm index d4f05071..adbef1a4 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -1,6 +1,6 @@ DoClearSaveDialogue: ; 1c98a (7:498a) call ClearScreen - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call LoadFontTilePatterns call LoadTextBoxTilePatterns ld hl, ClearSaveDataText diff --git a/engine/evolution.asm b/engine/evolution.asm index 8fbf568a..c65cc293 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -21,8 +21,8 @@ EvolveMon: ; 7bde9 (1e:7de9) ld [H_AUTOBGTRANSFERENABLED], a ld [hTilesetType], a ld a, [wEvoOldSpecies] - ld [wcf1d], a - ld c, $0 + ld [wWholeScreenPaletteMonSpecies], a + ld c, 0 call EvolutionSetWholeScreenPalette ld a, [wEvoNewSpecies] ld [wcf91], a @@ -46,7 +46,7 @@ EvolveMon: ; 7bde9 (1e:7de9) call PlayMusic ld c, 80 call DelayFrames - ld c, $1 + ld c, 1 ; set PAL_BLACK instead of mon palette call EvolutionSetWholeScreenPalette lb bc, $1, $10 .animLoop @@ -66,13 +66,13 @@ EvolveMon: ; 7bde9 (1e:7de9) call Evolution_ChangeMonPic ; show the new species pic ld a, [wEvoNewSpecies] .done - ld [wcf1d], a + ld [wWholeScreenPaletteMonSpecies], a ld a, $ff ld [wNewSoundID], a call PlaySound - ld a, [wcf1d] + ld a, [wWholeScreenPaletteMonSpecies] call PlayCry - ld c, $0 + ld c, 0 call EvolutionSetWholeScreenPalette pop af ld [wd0b5], a @@ -94,8 +94,8 @@ EvolveMon: ; 7bde9 (1e:7de9) jr .done EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) - ld b, $b - jp GoPAL_SET + ld b, SET_PAL_POKEMON_WHOLE_SCREEN + jp RunPaletteCommand Evolution_LoadPic: ; 7beb9 (1e:7eb9) call GetMonHeader diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 062950cf..c329c1a9 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -104,7 +104,7 @@ HoFShowMonOrPlayer: ; 70278 (1c:4278) ld [wcf91], a ld [wd0b5], a ld [wBattleMonSpecies2], a - ld [wcf1d], a + ld [wWholeScreenPaletteMonSpecies], a ld a, [wHoFMonOrPlayer] and a jr z, .showMon @@ -117,9 +117,9 @@ HoFShowMonOrPlayer: ; 70278 (1c:4278) call LoadFrontSpriteByMonIndex predef LoadMonBackPic .next1 - ld b, $b - ld c, $0 - call GoPAL_SET + ld b, SET_PAL_POKEMON_WHOLE_SCREEN + ld c, 0 + call RunPaletteCommand ld a, %11100100 ld [rBGP], a ld c, $31 ; back pic diff --git a/engine/intro.asm b/engine/intro.asm index 175baa63..29aa4ef4 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -18,8 +18,8 @@ PlayIntro: ; 41682 (10:5682) ret PlayIntroScene: ; 4169d (10:569d) - ld b, $7 - call GoPAL_SET + ld b, SET_PAL_NIDORINO_INTRO + call RunPaletteCommand ld a, %11100100 ld [rBGP], a ld [rOBP0], a @@ -302,8 +302,8 @@ LoadIntroGraphics: ; 41852 (10:5852) jp FarCopyData2 PlayShootingStar: ; 4188a (10:588a) - ld b, $c - call GoPAL_SET + ld b, SET_PAL_GAME_FREAK_INTRO + call RunPaletteCommand callba LoadCopyrightAndTextBoxTiles ld a, $e4 ld [rBGP], a diff --git a/engine/items/items.asm b/engine/items/items.asm index 4ba3c706..418b21da 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -127,7 +127,7 @@ ItemUseBall: ; d687 (3:5687) ld hl,W_NUMSAFARIBALLS dec [hl] .skipSafariZoneCode - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand ld a,$43 ld [wd11e],a call LoadScreenTilesFromBuffer1 ;restore screenBuffer from Backup @@ -1111,7 +1111,7 @@ ItemUseMedicine: ; dabb (3:5abb) and a ; using Softboiled? ret nz ; if so, return call GBPalWhiteOut - call z,GoPAL_SET_CF1C + call z,RunDefaultPaletteCommand ld a,[W_ISINBATTLE] and a ret nz @@ -1928,7 +1928,7 @@ ItemUsePPRestore: ; e31e (3:631e) pop af ld [wWhichPokemon],a call GBPalWhiteOut - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand jp RemoveUsedItem .afterRestoringPP ; after using a (Max) Ether/Elixir ld a,[wWhichPokemon] @@ -2032,7 +2032,7 @@ ItemUsePPRestore: ; e31e (3:631e) call ItemUseNoEffect .itemNotUsed call GBPalWhiteOut - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand pop af xor a ld [wActionResultOrTookBattleTurn],a ; item use failed @@ -2125,7 +2125,7 @@ ItemUseTMHM: ; e479 (3:6479) pop af call GBPalWhiteOutWithDelay3 call ClearSprites - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand jp LoadScreenTilesFromBuffer1 ; restore saved screen .checkIfAbleToLearnMove predef CanLearnTM ; check if the pokemon can learn the move @@ -2201,7 +2201,7 @@ ItemUseNotYoursToUse: ; e586 (3:6586) jr ItemUseFailed ThrowBallAtTrainerMon: ; e58b (3:658b) - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call LoadScreenTilesFromBuffer1 ; restore saved screen call Delay3 ld a,TOSS_ANIM diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 072a19d3..e8e48b79 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -450,7 +450,7 @@ DisplayDepositWithdrawMenu: ; 2174b (8:574b) predef StatusScreen2 call LoadScreenTilesFromBuffer1 call ReloadTilesetTilePatterns - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call LoadGBPal jr .loop diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 3e28bc93..630c6c23 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -55,8 +55,8 @@ DisplayDiploma: ; 566e2 (15:66e2) call EnableLCD callba LoadTrainerInfoTextBoxTiles - ld b, $8 - call GoPAL_SET + ld b, SET_PAL_GENERIC + call RunPaletteCommand call Delay3 call GBPalNormal ld a, $90 diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index e2dce785..5b8ae7f0 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -47,7 +47,7 @@ PKMNLeaguePC: ; 0x7657e res 6, [hl] call GBPalWhiteOutWithDelay3 call ClearScreen - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand jp GBPalNormal LeaguePCShowTeam: ; 765e5 (1d:65e5) @@ -86,15 +86,15 @@ LeaguePCShowMon: ; 76610 (1d:6610) ld [wcf91], a ld [wd0b5], a ld [wBattleMonSpecies2], a - ld [wcf1d], a + ld [wWholeScreenPaletteMonSpecies], a ld a, [hli] ld [wHoFMonLevel], a ld de, wcd6d ld bc, NAME_LENGTH call CopyData - ld b, $0B + ld b, SET_PAL_POKEMON_WHOLE_SCREEN ld c, 0 - call GoPAL_SET + call RunPaletteCommand coord hl, 12, 5 call GetMonHeader call LoadFrontSpriteByMonIndex diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 24302c46..bff0fbe7 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -24,7 +24,7 @@ MainMenu: ; 5af2 (1:5af2) ld hl,wd72e res 6,[hl] call ClearScreen - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call LoadTextBoxTilePatterns call LoadFontTilePatterns ld hl,wd730 diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 85111cd6..978216c8 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -88,8 +88,8 @@ DisplayNamingScreen: ; 6596 (1:6596) call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites - ld b, $8 - call GoPAL_SET + ld b, SET_PAL_GENERIC + call RunPaletteCommand call LoadHpBarAndStatusTilePatterns call LoadEDTile callba LoadMonPartySpriteGfx @@ -163,7 +163,7 @@ DisplayNamingScreen: ; 6596 (1:6596) call GBPalWhiteOutWithDelay3 call ClearScreen call ClearSprites - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call GBPalNormal xor a ld [W_SUBANIMTRANSFORM], a diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index d83c4fbe..f3e1a138 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -29,13 +29,13 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) cp a,SWAP_MONS_PARTY_MENU jp z,.printMessage call ErasePartyMenuCursors - callba SendBlkPacket_PartyMenu + callba InitPartyMenuBlkPacket coord hl, 3, 0 ld de,wPartySpecies xor a ld c,a ld [hPartyMonIndex],a - ld [wcf2d],a + ld [wWhichPartyMenuHPBar],a .loop ld a,[de] cp a,$FF ; reached the terminator? @@ -96,7 +96,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) ld a,[hFlags_0xFFF6] res 0,a ld [hFlags_0xFFF6],a - call SetPartyMenuHealthBarColor ; color the HP bar (on SGB) + call SetPartyMenuHPBarColor ; color the HP bar (on SGB) pop hl jr .printLevel .teachMoveMenu @@ -188,8 +188,8 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) .notAbleToEvolveText db "NOT ABLE@" .afterDrawingMonEntries - ld b,$0A - call GoPAL_SET + ld b, SET_PAL_PARTY_MENU + call RunPaletteCommand .printMessage ld hl,wd730 ld a,[hl] @@ -311,15 +311,15 @@ RareCandyText: ; 12ec0 (4:6ec0) db $06 db "@" -SetPartyMenuHealthBarColor: ; 12ec7 (4:6ec7) - ld hl, wcf1f - ld a, [wcf2d] +SetPartyMenuHPBarColor: ; 12ec7 (4:6ec7) + ld hl, wPartyMenuHPBarColors + ld a, [wWhichPartyMenuHPBar] ld c, a - ld b, $0 + ld b, 0 add hl, bc call GetHealthBarColor - ld b, $fc - call GoPAL_SET - ld hl, wcf2d + ld b, UPDATE_PARTY_MENU_BLK_PACKET + call RunPaletteCommand + ld hl, wWhichPartyMenuHPBar inc [hl] ret diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 8e69329a..a58523e8 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -12,8 +12,8 @@ ShowPokedexMenu: ; 40000 (10:4000) ld [wd11e],a ld [hJoy7],a .setUpGraphics - ld b,$08 - call GoPAL_SET + ld b, SET_PAL_GENERIC + call RunPaletteCommand callab LoadPokedexTilePatterns .doPokemonListMenu ld hl,wTopMenuItemY @@ -41,7 +41,7 @@ ShowPokedexMenu: ; 40000 (10:4000) pop af ld [wListScrollOffset],a call GBPalWhiteOutWithDelay3 - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand jp ReloadMapData .goToSideMenu call HandlePokedexSideMenu @@ -404,8 +404,8 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld a,[wd11e] ; pokemon ID ld [wcf91],a push af - ld b,04 - call GoPAL_SET + ld b, SET_PAL_POKEDEX + call RunPaletteCommand pop af ld [wd11e],a ld a,[hTilesetType] @@ -561,7 +561,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld [hTilesetType],a call GBPalWhiteOut call ClearScreen - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call LoadTextBoxTilePatterns call GBPalNormal ld hl,wd72c diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index f726f128..ab8c8756 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -297,7 +297,7 @@ ErasePartyMenuCursors: ; 132ed (4:72ed) ItemMenuLoop: ; 132fc (4:72fc) call LoadScreenTilesFromBuffer2DisableBGTransfer ; restore saved screen - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand StartMenu_Item: ; 13302 (4:7302) ld a,[wLinkState] @@ -506,14 +506,14 @@ StartMenu_TrainerInfo: ; 13460 (4:7460) ld [hTilesetType],a call DrawTrainerInfo predef DrawBadges ; draw badges - ld b,$0d - call GoPAL_SET + ld b, SET_PAL_TRAINER_CARD + call RunPaletteCommand call GBPalNormal call WaitForTextScrollButtonPress ; wait for button press call GBPalWhiteOut call LoadFontTilePatterns call LoadScreenTilesFromBuffer2 ; restore saved screen - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call ReloadMapData call LoadGBPal pop af diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index fb4a0dfc..c91d5eda 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -121,10 +121,10 @@ StatusScreen: ; 12953 (4:6953) call PlaceString ; "TYPE1/" coord hl, 11, 3 predef DrawHP - ld hl, wcf25 + ld hl, wStatusScreenHPBarColor call GetHealthBarColor - ld b, $3 - call GoPAL_SET ; SGB palette + ld b, SET_PAL_STATUS_SCREEN + call RunPaletteCommand coord hl, 16, 6 ld de, wLoadedMonStatus call PrintStatusCondition diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index e7f9d2df..c0163b1e 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -5,12 +5,12 @@ AnimatePartyMon_ForceSpeed1: ; 716f7 (1c:56f7) inc a jr GetAnimationSpeed -; wcf1f contains the party mon's health bar colors +; wPartyMenuHPBarColors contains the party mon's health bar colors ; 0: green ; 1: yellow ; 2: red AnimatePartyMon: ; 716ff (1c:56ff) - ld hl, wcf1f + ld hl, wPartyMenuHPBarColors ld a, [wCurrentMenuItem] ld c, a ld b, $0 diff --git a/engine/palettes.asm b/engine/palettes.asm index a325e0a3..55d488aa 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -1,33 +1,33 @@ -Func_71ddf: ; 71ddf (1c:5ddf) +_RunPaletteCommand: ; 71ddf (1c:5ddf) call GetPredefRegisters ld a, b cp $ff - jr nz, .asm_71dea - ld a, [wcf1c] -.asm_71dea - cp $fc - jp z, Func_71fc2 + jr nz, .next + ld a, [wDefaultPaletteCommand] ; use default command if command ID is $ff +.next + cp UPDATE_PARTY_MENU_BLK_PACKET + jp z, UpdatePartyMenuBlkPacket ld l, a - ld h, $0 + ld h, 0 add hl, hl - ld de, PointerTable_71f73 + ld de, SetPalFunctions add hl, de ld a, [hli] ld h, [hl] ld l, a - ld de, Func_72156 + ld de, SendSGBPackets push de jp [hl] -SendPalPacket_Black: ; 71dff (1c:5dff) +SetPal_BattleBlack: ; 71dff (1c:5dff) ld hl, PalPacket_Black ld de, BlkPacket_Battle ret ; uses PalPacket_Empty to build a packet based on mon IDs and health color -BuildBattlePalPacket: ; 71e06 (1c:5e06) +SetPal_Battle: ; 71e06 (1c:5e06) ld hl, PalPacket_Empty - ld de, wcf2d + ld de, wPalPacket ld bc, $10 call CopyData ld a, [W_PLAYERBATTSTATUS3] @@ -38,12 +38,12 @@ BuildBattlePalPacket: ; 71e06 (1c:5e06) ld hl, wEnemyMonSpecies2 call DeterminePaletteID ld c, a - ld hl, wcf2e - ld a, [wcf1d] + ld hl, wPalPacket + 1 + ld a, [wPlayerHPBarColor] add PAL_GREENBAR ld [hli], a inc hl - ld a, [wcf1e] + ld a, [wEnemyHPBarColor] add PAL_GREENBAR ld [hli], a inc hl @@ -52,21 +52,21 @@ BuildBattlePalPacket: ; 71e06 (1c:5e06) inc hl ld a, c ld [hl], a - ld hl, wcf2d + ld hl, wPalPacket ld de, BlkPacket_Battle - ld a, $1 - ld [wcf1c], a + ld a, SET_PAL_BATTLE + ld [wDefaultPaletteCommand], a ret -SendPalPacket_TownMap: ; 71e48 (1c:5e48) +SetPal_TownMap: ; 71e48 (1c:5e48) ld hl, PalPacket_TownMap ld de, BlkPacket_WholeScreen ret ; uses PalPacket_Empty to build a packet based the mon ID -BuildStatusScreenPalPacket: ; 71e4f (1c:5e4f) +SetPal_StatusScreen: ; 71e4f (1c:5e4f) ld hl, PalPacket_Empty - ld de, wcf2d + ld de, wPalPacket ld bc, $10 call CopyData ld a, [wcf91] @@ -76,67 +76,67 @@ BuildStatusScreenPalPacket: ; 71e4f (1c:5e4f) .pokemon call DeterminePaletteIDOutOfBattle push af - ld hl, wcf2e - ld a, [wcf25] + ld hl, wPalPacket + 1 + ld a, [wStatusScreenHPBarColor] add PAL_GREENBAR ld [hli], a inc hl pop af ld [hl], a - ld hl, wcf2d + ld hl, wPalPacket ld de, BlkPacket_StatusScreen ret -SendPalPacket_PartyMenu: ; 71e7b (1c:5e7b) +SetPal_PartyMenu: ; 71e7b (1c:5e7b) ld hl, PalPacket_PartyMenu - ld de, wcf2e + ld de, wPartyMenuBlkPacket ret -SendPalPacket_Pokedex: ; 71e82 (1c:5e82) +SetPal_Pokedex: ; 71e82 (1c:5e82) ld hl, PalPacket_Pokedex - ld de, wcf2d + ld de, wPalPacket ld bc, $10 call CopyData ld a, [wcf91] call DeterminePaletteIDOutOfBattle - ld hl, wcf30 + ld hl, wPalPacket + 3 ld [hl], a - ld hl, wcf2d + ld hl, wPalPacket ld de, BlkPacket_Pokedex ret -SendPalPacket_Slots: ; 71e9f (1c:5e9f) +SetPal_Slots: ; 71e9f (1c:5e9f) ld hl, PalPacket_Slots ld de, BlkPacket_Slots ret -SendPalPacket_Titlescreen: ; 71ea6 (1c:5ea6) +SetPal_TitleScreen: ; 71ea6 (1c:5ea6) ld hl, PalPacket_Titlescreen ld de, BlkPacket_Titlescreen ret ; used mostly for menus and the Oak intro -SendPalPacket_Generic: ; 71ead (1c:5ead) +SetPal_Generic: ; 71ead (1c:5ead) ld hl, PalPacket_Generic ld de, BlkPacket_WholeScreen ret -SendPalPacket_NidorinoIntro: ; 71eb4 (1c:5eb4) +SetPal_NidorinoIntro: ; 71eb4 (1c:5eb4) ld hl, PalPacket_NidorinoIntro ld de, BlkPacket_NidorinoIntro ret -SendPalPacket_GameFreakIntro: ; 71ebb (1c:5ebb) +SetPal_GameFreakIntro: ; 71ebb (1c:5ebb) ld hl, PalPacket_GameFreakIntro ld de, BlkPacket_GameFreakIntro - ld a, $8 - ld [wcf1c], a + ld a, SET_PAL_GENERIC + ld [wDefaultPaletteCommand], a ret ; uses PalPacket_Empty to build a packet based on the current map -BuildOverworldPalPacket: ; 71ec7 (1c:5ec7) +SetPal_Overworld: ; 71ec7 (1c:5ec7) ld hl, PalPacket_Empty - ld de, wcf2d + ld de, wPalPacket ld bc, $10 call CopyData ld a, [W_CURMAPTILESET] @@ -162,12 +162,12 @@ BuildOverworldPalPacket: ; 71ec7 (1c:5ec7) jr c, .town ld a, PAL_ROUTE - 1 .town - inc a ; a town's pallete ID is its map ID + 1 - ld hl, wcf2e + inc a ; a town's palette ID is its map ID + 1 + ld hl, wPalPacket + 1 ld [hld], a ld de, BlkPacket_WholeScreen - ld a, $9 - ld [wcf1c], a + ld a, SET_PAL_OVERWORLD + ld [wDefaultPaletteCommand], a ret .PokemonTowerOrAgatha ld a, PAL_GREYMON - 1 @@ -181,131 +181,143 @@ BuildOverworldPalPacket: ; 71ec7 (1c:5ec7) ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame -SendPokemonPalette_WholeScreen: ; 71f17 (1c:5f17) +SetPal_PokemonWholeScreen: ; 71f17 (1c:5f17) push bc ld hl, PalPacket_Empty - ld de, wcf2d + ld de, wPalPacket ld bc, $10 call CopyData pop bc ld a, c and a - ld a, $1e - jr nz, .asm_71f31 - ld a, [wcf1d] + ld a, PAL_BLACK + jr nz, .next + ld a, [wWholeScreenPaletteMonSpecies] call DeterminePaletteIDOutOfBattle -.asm_71f31 - ld [wcf2e], a - ld hl, wcf2d +.next + ld [wPalPacket + 1], a + ld hl, wPalPacket ld de, BlkPacket_WholeScreen ret -BuildTrainerCardPalPacket: ; 71f3b (1c:5f3b) +SetPal_TrainerCard: ; 71f3b (1c:5f3b) ld hl, BlkPacket_TrainerCard - ld de, wcc5b + ld de, wTrainerCardBlkPacket ld bc, $40 call CopyData - ld de, LoopCounts_71f8f - ld hl, wcc5d + ld de, BadgeBlkDataLengths + ld hl, wTrainerCardBlkPacket + 2 ld a, [W_OBTAINEDBADGES] - ld c, $8 -.asm_71f52 + ld c, 8 +.badgeLoop srl a push af - jr c, .asm_71f62 + jr c, .haveBadge +; The player doens't have the badge, so zero the badge's blk data. push bc ld a, [de] ld c, a xor a -.asm_71f5b +.zeroBadgeDataLoop ld [hli], a dec c - jr nz, .asm_71f5b + jr nz, .zeroBadgeDataLoop pop bc - jr .asm_71f67 -.asm_71f62 + jr .nextBadge +.haveBadge +; The player does have the badge, so skip past the badge's blk data. ld a, [de] -.asm_71f63 +.skipBadgeDataLoop inc hl dec a - jr nz, .asm_71f63 -.asm_71f67 + jr nz, .skipBadgeDataLoop +.nextBadge pop af inc de dec c - jr nz, .asm_71f52 + jr nz, .badgeLoop ld hl, PalPacket_TrainerCard - ld de, wcc5b + ld de, wTrainerCardBlkPacket ret -PointerTable_71f73: ; 71f73 (1c:5f73) - dw SendPalPacket_Black - dw BuildBattlePalPacket - dw SendPalPacket_TownMap - dw BuildStatusScreenPalPacket - dw SendPalPacket_Pokedex - dw SendPalPacket_Slots - dw SendPalPacket_Titlescreen - dw SendPalPacket_NidorinoIntro - dw SendPalPacket_Generic - dw BuildOverworldPalPacket - dw SendPalPacket_PartyMenu - dw SendPokemonPalette_WholeScreen - dw SendPalPacket_GameFreakIntro - dw BuildTrainerCardPalPacket - -; each byte is the number of loops to make in .asm_71f5b for each badge -LoopCounts_71f8f: ; 71f8f (1c:5f8f) - db $06,$06,$06,$12,$06,$06,$06,$06 +SetPalFunctions: ; 71f73 (1c:5f73) + dw SetPal_BattleBlack + dw SetPal_Battle + dw SetPal_TownMap + dw SetPal_StatusScreen + dw SetPal_Pokedex + dw SetPal_Slots + dw SetPal_TitleScreen + dw SetPal_NidorinoIntro + dw SetPal_Generic + dw SetPal_Overworld + dw SetPal_PartyMenu + dw SetPal_PokemonWholeScreen + dw SetPal_GameFreakIntro + dw SetPal_TrainerCard + +; The length of the blk data of each badge on the Trainer Card. +; The Rainbow Badge has 3 entries because of its many colors. +BadgeBlkDataLengths: ; 71f8f (1c:5f8f) + db 6 ; Boulder Badge + db 6 ; Cascade Badge + db 6 ; Thunder Badge + db 6 * 3 ; Rainbow Badge + db 6 ; Soul Badge + db 6 ; Marsh Badge + db 6 ; Volcano Badge + db 6 ; Earth Badge DeterminePaletteID: ; 71f97 (1c:5f97) - bit 3, a ; bit 3 of battle status 3, set if current Pokemon is transformed - ld a, PAL_GREYMON ; if yes, use Ditto's palette + bit Transformed, a ; a is battle status 3 + ld a, PAL_GREYMON ; if the mon has used Transform, use Ditto's palette ret nz ld a, [hl] DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d) ld [wd11e], a - and a - jr z, .idZero + and a ; is the mon index 0? + jr z, .skipDexNumConversion push bc - predef IndexToPokedex ; turn Pokemon ID number into Pokedex number + predef IndexToPokedex pop bc ld a, [wd11e] -.idZero +.skipDexNumConversion ld e, a - ld d, $00 - ld hl, MonsterPalettes ; not just for Pokemon, Trainers use it too + ld d, 0 + ld hl, MonsterPalettes ; not just for Pokemon, Trainers use it too add hl, de ld a, [hl] ret -SendBlkPacket_PartyMenu: ; 71fb6 (1c:5fb6) +InitPartyMenuBlkPacket: ; 71fb6 (1c:5fb6) ld hl, BlkPacket_PartyMenu - ld de, wcf2e + ld de, wPartyMenuBlkPacket ld bc, $30 jp CopyData -Func_71fc2: ; 71fc2 (1c:5fc2) - ld hl, wcf1f - ld a, [wcf2d] +UpdatePartyMenuBlkPacket: ; 71fc2 (1c:5fc2) +; Update the blk packet with the palette of the HP bar that is +; specified in [wWhichPartyMenuHPBar]. + ld hl, wPartyMenuHPBarColors + ld a, [wWhichPartyMenuHPBar] ld e, a - ld d, $0 + ld d, 0 add hl, de ld e, l ld d, h ld a, [de] and a - ld e, $5 - jr z, .asm_71fdb + ld e, (1 << 2) | 1 ; green + jr z, .next dec a - ld e, $a - jr z, .asm_71fdb - ld e, $f -.asm_71fdb + ld e, (2 << 2) | 2 ; yellow + jr z, .next + ld e, (3 << 2) | 3 ; red +.next push de - ld hl, wcf37 - ld bc, $6 - ld a, [wcf2d] + ld hl, wPartyMenuBlkPacket + 8 + 1 + ld bc, 6 + ld a, [wWhichPartyMenuHPBar] call AddNTimes pop de ld [hl], e @@ -321,11 +333,9 @@ SendSGBPacket: ; 71feb (1c:5feb) .loop2 ; save B for later use push bc -; load a non-zero value in $fff9 to disable the routine that checks actual -; joypad input (said routine, located at $15f, does nothing if $fff9 is not -; zero) - ld a,$01 - ld [$fff9],a +; disable ReadJoypad to prevent it from interfering with sending the packet + ld a, 1 + ld [hDisableJoypadPolling], a ; send RESET signal (P14=LOW, P15=LOW) xor a ld [rJOYP],a @@ -367,7 +377,7 @@ SendSGBPacket: ; 71feb (1c:5feb) ld a,$30 ld [rJOYP],a xor a - ld [$fff9],a + ld [hDisableJoypadPolling],a ; wait for about 70000 cycles call Wait7000 ; restore (previously pushed) number of packets @@ -383,39 +393,39 @@ LoadSGB: ; 7202b (1c:602b) ld [wOnSGB], a call CheckSGB ret nc - ld a, $1 + ld a, 1 ld [wOnSGB], a ld a, [wGBC] and a - jr z, .asm_7203f + jr z, .notGBC ret -.asm_7203f +.notGBC di - call Func_72075 + call PrepareSuperNintendoVRAMTransfer ei - ld a, $1 - ld [wcf2d], a + ld a, 1 + ld [wCopyingSGBTileData], a ld de, ChrTrnPacket ld hl, SGBBorderGraphics - call Func_7210b + call CopyGfxToSuperNintendoVRAM xor a - ld [wcf2d], a + ld [wCopyingSGBTileData], a ld de, PctTrnPacket ld hl, BorderPalettes - call Func_7210b + call CopyGfxToSuperNintendoVRAM xor a - ld [wcf2d], a + ld [wCopyingSGBTileData], a ld de, PalTrnPacket ld hl, SuperPalettes - call Func_7210b + call CopyGfxToSuperNintendoVRAM call ClearVram ld hl, MaskEnCancelPacket jp SendSGBPacket -Func_72075: ; 72075 (1c:6075) - ld hl, PointerTable_72089 - ld c, $9 -.asm_7207a +PrepareSuperNintendoVRAMTransfer: ; 72075 (1c:6075) + ld hl, .packetPointers + ld c, 9 +.loop push bc ld a, [hli] push hl @@ -426,10 +436,11 @@ Func_72075: ; 72075 (1c:6075) inc hl pop bc dec c - jr nz, .asm_7207a + jr nz, .loop ret -PointerTable_72089: ; 72089 (1c:6089) +.packetPointers +; Only the first packet is needed. dw MaskEnFreezePacket dw DataSnd_72548 dw DataSnd_72558 @@ -441,17 +452,18 @@ PointerTable_72089: ; 72089 (1c:6089) dw DataSnd_725b8 CheckSGB: ; 7209b (1c:609b) +; Returns whether the game is running on an SGB in carry. ld hl, MltReq2Packet di call SendSGBPacket - ld a, $1 - ld [$fff9], a + ld a, 1 + ld [hDisableJoypadPolling], a ei call Wait7000 ld a, [rJOYP] and $3 cp $3 - jr nz, .asm_720fd + jr nz, .isSGB ld a, $20 ld [rJOYP], a ld a, [rJOYP] @@ -482,50 +494,50 @@ CheckSGB: ; 7209b (1c:609b) ld a, [rJOYP] and $3 cp $3 - jr nz, .asm_720fd - call Func_72102 + jr nz, .isSGB + call SendMltReq1Packet and a ret -.asm_720fd - call Func_72102 +.isSGB + call SendMltReq1Packet scf ret -Func_72102: ; 72102 (1c:6102) +SendMltReq1Packet: ; 72102 (1c:6102) ld hl, MltReq1Packet call SendSGBPacket jp Wait7000 -Func_7210b: ; 7210b (1c:610b) +CopyGfxToSuperNintendoVRAM: ; 7210b (1c:610b) di push de call DisableLCD ld a, $e4 ld [rBGP], a ld de, vChars1 - ld a, [wcf2d] + ld a, [wCopyingSGBTileData] and a - jr z, .asm_72122 - call Func_72188 - jr .asm_72128 -.asm_72122 + jr z, .notCopyingTileData + call CopySGBBorderTiles + jr .next +.notCopyingTileData ld bc, $1000 call CopyData -.asm_72128 +.next ld hl, vBGMap0 ld de, $c ld a, $80 ld c, $d -.asm_72132 +.loop ld b, $14 -.asm_72134 +.innerLoop ld [hli], a inc a dec b - jr nz, .asm_72134 + jr nz, .innerLoop add hl, de dec c - jr nz, .asm_72132 + jr nz, .loop ld a, $e3 ld [rLCDC], a pop hl @@ -548,27 +560,27 @@ Wait7000: ; 7214a (1c:614a) jr nz, .loop ret -Func_72156: ; 72156 (1c:6156) +SendSGBPackets: ; 72156 (1c:6156) ld a, [wGBC] and a - jr z, .asm_72165 + jr z, .notGBC push de - call Func_7216d + call InitGBCPalettes pop hl - call Func_72187 + call EmptyFunc5 ret -.asm_72165 +.notGBC push de call SendSGBPacket pop hl jp SendSGBPacket -Func_7216d: ; 7216d (1c:616d) - ld a, $80 - ld [$ff68], a +InitGBCPalettes: ; 7216d (1c:616d) + ld a, $80 ; index 0 with auto-increment + ld [rBGPI], a inc hl ld c, $20 -.asm_72174 +.loop ld a, [hli] inc hl add a @@ -576,37 +588,48 @@ Func_7216d: ; 7216d (1c:616d) add a ld de, SuperPalettes add e - jr nc, .asm_72180 + jr nc, .noCarry inc d -.asm_72180 +.noCarry ld a, [de] - ld [$ff69], a + ld [rBGPD], a dec c - jr nz, .asm_72174 + jr nz, .loop ret -Func_72187: ; 72187 (1c:6187) +EmptyFunc5: ; 72187 (1c:6187) ret -Func_72188: ; 72188 (1c:6188) - ld b, $80 -.asm_7218a - ld c, $10 -.asm_7218c +CopySGBBorderTiles: ; 72188 (1c:6188) +; SGB tile data is stored in a 4BPP planar format. +; Each tile is 32 bytes. The first 16 bytes contain bit planes 1 and 2, while +; the second 16 bytes contain bit planes 3 and 4. +; This function converts 2BPP planar data into this format by mapping +; 2BPP colors 0-3 to 4BPP colors 0-3. 4BPP colors 4-15 are not used. + ld b, 128 + +.tileLoop + +; Copy bit planes 1 and 2 of the tile data. + ld c, 16 +.copyLoop ld a, [hli] ld [de], a inc de dec c - jr nz, .asm_7218c - ld c, $10 + jr nz, .copyLoop + +; Zero bit planes 3 and 4. + ld c, 16 xor a -.asm_72195 +.zeroLoop ld [de], a inc de dec c - jr nz, .asm_72195 + jr nz, .zeroLoop + dec b - jr nz, .asm_7218a + jr nz, .tileLoop ret INCLUDE "data/sgb_packets.asm" diff --git a/engine/predefs.asm b/engine/predefs.asm index d8cf030c..0abdb5b3 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -121,7 +121,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef SetPartyMonTypes add_predef CanLearnTM add_predef TMToMove - add_predef Func_71ddf + add_predef _RunPaletteCommand add_predef StarterDex ; 46 add_predef _AddPartyMon add_predef UpdateHPBar2 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index b68b9294..78ce35a2 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -21,8 +21,8 @@ PromptUserToPlaySlots: ; 3730e (d:730e) call GBPalWhiteOutWithDelay3 call LoadSlotMachineTiles call LoadFontTilePatterns - ld b, $5 - call GoPAL_SET + ld b, SET_PAL_SLOTS + call RunPaletteCommand call GBPalNormal ld a, $e4 ld [rOBP0], a @@ -41,7 +41,7 @@ PromptUserToPlaySlots: ; 3730e (d:730e) call GBPalWhiteOutWithDelay3 ld a, $1 ld [wUpdateSpritesEnabled], a - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call ReloadMapSpriteTilePatterns call ReloadTilesetTilePatterns .done diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 0dbe4a4c..a75d3dcf 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -134,8 +134,8 @@ ENDC call LoadScreenTilesFromBuffer2 ld a, vBGMap0 / $100 call TitleScreenCopyTileMapToVRAM - ld b, $6 - call GoPAL_SET + ld b, SET_PAL_TITLE_SCREEN + call RunPaletteCommand call GBPalNormal ld a, %11100100 ld [rOBP0], a diff --git a/engine/town_map.asm b/engine/town_map.asm index 414b6509..225de2b8 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -314,8 +314,8 @@ LoadTownMap: ; 7109b (1c:509b) jr .nextTile .done call EnableLCD - ld b, $2 - call GoPAL_SET + ld b, SET_PAL_TOWN_MAP + call RunPaletteCommand call Delay3 call GBPalNormal xor a @@ -338,7 +338,7 @@ ExitTownMap: ; 711ab (1c:51ab) call LoadPlayerSpriteGraphics call LoadFontTilePatterns call UpdateSprites - jp GoPAL_SET_CF1C + jp RunDefaultPaletteCommand DrawPlayerOrBirdSprite: ; 711c4 (1c:51c4) ; a = map number diff --git a/engine/trade.asm b/engine/trade.asm index b7c72520..16a3d6a9 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -268,8 +268,8 @@ Trade_DrawOpenEndOfLinkCable: ; 41298 (10:5298) call Trade_ClearTileMap ld b, vBGMap0 / $100 call CopyScreenTileBufferToVRAM - ld b, $8 - call GoPAL_SET + ld b, SET_PAL_GENERIC + call RunPaletteCommand ; This function call is pointless. It just copies blank tiles to VRAM that was ; already filled with blank tiles. @@ -727,10 +727,10 @@ Trade_CircleOAM3: ; 4159c (10:559c) Trade_LoadMonSprite: ; 415a4 (10:55a4) ld [wcf91], a ld [wd0b5], a - ld [wcf1d], a - ld b, $b - ld c, $0 - call GoPAL_SET + ld [wWholeScreenPaletteMonSpecies], a + ld b, SET_PAL_POKEMON_WHOLE_SCREEN + ld c, 0 + call RunPaletteCommand ld a, [H_AUTOBGTRANSFERENABLED] xor $1 ld [H_AUTOBGTRANSFERENABLED], a diff --git a/home.asm b/home.asm index e1fbc0f2..3206a7ad 100644 --- a/home.asm +++ b/home.asm @@ -4469,7 +4469,7 @@ RestoreScreenTilesAndReloadTilePatterns:: ; 3dbe (0:3dbe) call ReloadMapSpriteTilePatterns call LoadScreenTilesFromBuffer2 call LoadTextBoxTilePatterns - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand jr Delay3 @@ -4499,13 +4499,13 @@ GBPalWhiteOut:: ret -GoPAL_SET_CF1C:: ; 3ded (0:3ded) +RunDefaultPaletteCommand:: ; 3ded (0:3ded) ld b,$ff -GoPAL_SET:: ; 3def (0:3def) +RunPaletteCommand:: ; 3def (0:3def) ld a,[wOnSGB] and a ret z - predef_jump Func_71ddf + predef_jump _RunPaletteCommand GetHealthBarColor:: ; Return at hl the palette of diff --git a/home/overworld.asm b/home/overworld.asm index eba47df2..6b3a75c6 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -659,8 +659,8 @@ CheckMapConnections:: ; 07ba (0:07ba) .loadNewMap ; load the connected map that was entered call LoadMapHeader call PlayDefaultMusicFadeOutCurrent - ld b,$09 - call GoPAL_SET + ld b, SET_PAL_OVERWORLD + call RunPaletteCommand ; Since the sprite set shouldn't change, this will just update VRAM slots at ; $C2XE without loading any tile patterns. callba InitMapSprites @@ -2343,8 +2343,8 @@ LoadMapData:: ; 1241 (0:1241) ld a,$01 ld [wUpdateSpritesEnabled],a call EnableLCD - ld b,$09 - call GoPAL_SET + ld b, SET_PAL_OVERWORLD + call RunPaletteCommand call LoadPlayerSpriteGraphics ld a,[wd732] and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp diff --git a/home/vblank.asm b/home/vblank.asm index 3bdbe7cb..8ffae9f1 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -74,7 +74,7 @@ VBlank:: callba TrackPlayTime ; keep track of time played - ld a, [$fff9] + ld a, [hDisableJoypadPolling] and a call z, ReadJoypad diff --git a/hram.asm b/hram.asm index 3f331cfb..77fb7c1e 100644 --- a/hram.asm +++ b/hram.asm @@ -317,5 +317,7 @@ hFlags_0xFFF6 EQU $FFF6 hFieldMoveMonMenuTopMenuItemX EQU $FFF7 +hDisableJoypadPolling EQU $FFF9 + hJoyInput EQU $FFF8 diff --git a/main.asm b/main.asm index 8e41af64..a61c433b 100755 --- a/main.asm +++ b/main.asm @@ -3156,7 +3156,7 @@ RedrawMapView: ; eedc (3:6edc) ld [H_AUTOBGTRANSFERENABLED], a ld [hTilesetType], a ; no flower/water BG tile animations call LoadCurrentMapView - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand ld hl, wMapViewVRAMPointer ld a, [hli] ld h, [hl] diff --git a/wram.asm b/wram.asm index 47074b55..67cdd5fa 100755 --- a/wram.asm +++ b/wram.asm @@ -477,6 +477,9 @@ wNPCMovementScriptBank:: ; cc58 ds 2 +wTrainerCardBlkPacket:: ; cc5b +; $40 bytes + wSlotMachineSevenAndBarModeChance:: ; cc5b ; If a random number greater than this value is generated, then the player is ; allowed to have three 7 symbols or bar symbols line up. @@ -1283,15 +1286,40 @@ wOnSGB:: ; cf1b ; if running on SGB, it's 1, else it's 0 ds 1 -wcf1c:: ds 1 ; used with sgb palettes -wcf1d:: ds 1 ; used when displaying palettes for Pokemon -wcf1e:: ds 1 ; used to display palettes for HP bar -wcf1f:: ds 6 ; used to display HP bars in Pokemon Menu (probably palettes) -wcf25:: ds 8 ; used to display HP bar for Pokemon Status Screen (probably palettes too) -wcf2d:: ds 1 ; also used to display HP bar for Pokemon Menu (something about HP colour) -wcf2e:: ds 2 ; more HP bar palette stuff. -wcf30:: ds 7 ; used with palettes (apparently for Pokedex) -wcf37:: ds 20 ; used with palletes too (used for Party Menu) +wDefaultPaletteCommand:: ; cf1c + ds 1 + +wPlayerHPBarColor:: ; cf1d + +wWholeScreenPaletteMonSpecies:: ; cf1d +; species of the mon whose palette is used for the whole screen + ds 1 + +wEnemyHPBarColor:: ; cf1e + ds 1 + +; 0: green +; 1: yellow +; 2: red +wPartyMenuHPBarColors:: ; cf1f + ds 6 + +wStatusScreenHPBarColor:: ; cf25 + ds 1 + + ds 7 + +wCopyingSGBTileData:: ; c2fd + +wWhichPartyMenuHPBar:: ; cf2d + +wPalPacket:: ; cf2d + ds 1 + +wPartyMenuBlkPacket:: ; cf2e +; $30 bytes + ds 29 + wcf4b:: ds 1 ; storage buffer for various strings wcf4c:: ds 1 ; used with displaying EXP value, probably also overflowed with wcf4b wGainBoostedExp:: ; cf4d -- cgit v1.3.1-sl0p